Merge remote-tracking branch 'origin/branch_1x' into branch_1x

# Conflicts: # tika-parent/pom.xml
apache · May 23, 2022 · fb721d6 · fb721d6
2 parents 9e70418 + 9a5afd2
commit fb721d6
Show file tree

Hide file tree

Showing 4 changed files with 734 additions and 728 deletions.
diff --git a/tika-bundle/pom.xml b/tika-bundle/pom.xml
@@ -116,7 +116,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>7.0.1</version>
+      <version>7.0.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
@@ -260,16 +260,16 @@
     <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
     <project.build.outputTimestamp>1</project.build.outputTimestamp>
     <!-- plugin versions -->
-    <forbiddenapis.version>3.1</forbiddenapis.version>
+    <forbiddenapis.version>3.3</forbiddenapis.version>
     <groovy.maven.version>2.1.1</groovy.maven.version>
     <maven.antrun.version>1.8</maven.antrun.version>
     <maven.assembly.version>3.3.0</maven.assembly.version>
-    <maven.bundle.version>5.1.1</maven.bundle.version>
+    <maven.bundle.version>5.1.6</maven.bundle.version>
     <maven.failsafe.version>2.22.2</maven.failsafe.version>
-    <maven.javadoc.version>3.1.1</maven.javadoc.version>
+    <maven.javadoc.version>3.3.1</maven.javadoc.version>
     <maven.scr.version>1.26.4</maven.scr.version>
-    <maven.surefire.version>3.0.0-M4</maven.surefire.version>
-    <maven.shade.version>3.2.4</maven.shade.version>
+    <maven.surefire.version>3.0.0-M6</maven.surefire.version>
+    <maven.shade.version>3.3.0</maven.shade.version>
     <rat.version>0.13</rat.version>
     <!-- NOTE: sync tukaani version with commons-compress in tika-parsers -->
     <poi.version>5.2.2</poi.version>
@@ -291,8 +291,8 @@
     <jaxb.version>2.3.5</jaxb.version>
     <cli.version>1.5.0</cli.version>
     <lucene.version>8.11.1</lucene.version>
-    <mockito.version>3.11.2</mockito.version>
-    <lombok.version>1.18.22</lombok.version>
+    <mockito.version>4.5.1</mockito.version>
+    <lombok.version>1.18.24</lombok.version>
     <opennlp.version>1.9.4</opennlp.version>
     <xerces.version>2.12.2</xerces.version>
   </properties>
@@ -375,6 +375,7 @@
         <artifactId>commons-io</artifactId>
         <version>${commons.io.version}</version>
       </dependency>
+      <!-- java.lang.NoClassDefFoundError: javax/annotation/Resource if updated to 2.1.0 on jdk11+ -->
       <dependency>
         <groupId>jakarta.annotation</groupId>
         <artifactId>jakarta.annotation-api</artifactId>
@@ -403,7 +404,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
+        <version>3.10.1</version>
         <configuration>
           <source>${maven.compiler.source}</source>
           <target>${maven.compiler.target}</target>
@@ -416,15 +417,25 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>versions-maven-plugin</artifactId>
-        <version>2.7</version>
+        <version>2.10.0</version>
         <configuration>
           <generateBackupPoms>false</generateBackupPoms>
         </configuration>
+        <executions>
+            <execution>
+                <phase>install</phase>
+                <goals>
+                    <goal>display-plugin-updates</goal>
+                    <goal>display-dependency-updates</goal>
+                    <goal>display-property-updates</goal>
+                </goals>
+            </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.sonatype.ossindex.maven</groupId>
         <artifactId>ossindex-maven-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
         <configuration>
           <fail>false</fail>
         </configuration>

diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
@@ -45,7 +45,7 @@
     <tukaani.version>1.9</tukaani.version>
     <!-- NOTE: sync brotli version with commons-compress in tika-parent-->
     <brotli.version>0.1.2</brotli.version>
-    <mime4j.version>0.8.4</mime4j.version>
+    <mime4j.version>0.8.4</mime4j.version> <!-- 0.8.5 and higher fail with ByteBuffer.flip() -->
     <vorbis.version>0.8</vorbis.version>
     <pdfbox.version>2.0.26</pdfbox.version>
     <jempbox.version>1.8.16</jempbox.version>
@@ -100,11 +100,6 @@
       <artifactId>commons-lang3</artifactId>
       <version>${commons.lang3.version}</version>
     </dependency>
-    <dependency>
-      <groupId>jakarta.annotation</groupId>
-      <artifactId>jakarta.annotation-api</artifactId>
-      <version>1.3.5</version>
-    </dependency>
 
     <!-- Externally Maintained Parsers -->
     <dependency>