[tika] branch main updated: TIKA-3751: update junit5; use variable for osgi compendium version

[ti...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tilman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/main by this push:
     new 481adfca7 TIKA-3751: update junit5; use variable for osgi compendium version
481adfca7 is described below

commit 481adfca79312fd9b0173c9fbd7a339126d61536
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Sat May 21 05:27:57 2022 +0200

    TIKA-3751: update junit5; use variable for osgi compendium version
---
 tika-bundles/pom.xml | 2 +-
 tika-core/pom.xml    | 2 +-
 tika-example/pom.xml | 2 +-
 tika-parent/pom.xml  | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tika-bundles/pom.xml b/tika-bundles/pom.xml
index c04672752..fa893be24 100644
--- a/tika-bundles/pom.xml
+++ b/tika-bundles/pom.xml
@@ -40,7 +40,7 @@
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.compendium</artifactId>
-        <version>5.0.0</version>
+        <version>${osgi.compendium.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/tika-core/pom.xml b/tika-core/pom.xml
index 3f6adfa4e..4b35ff045 100644
--- a/tika-core/pom.xml
+++ b/tika-core/pom.xml
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>5.0.0</version>
+      <version>${osgi.compendium.version}</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
diff --git a/tika-example/pom.xml b/tika-example/pom.xml
index ff5c7569a..9bc9a42ff 100644
--- a/tika-example/pom.xml
+++ b/tika-example/pom.xml
@@ -38,7 +38,7 @@
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.compendium</artifactId>
-        <version>5.0.0</version>
+        <version>${osgi.compendium.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 9e6abf4f2..7808792a0 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -335,7 +335,7 @@
     <joda.time.version>2.10.10</joda.time.version>
     <json.simple.version>1.1.1</json.simple.version>
     <junit4.version>4.13.2</junit4.version>
-    <junit5.version>5.8.2</junit5.version>
+    <junit5.version>5.9.0-M1</junit5.version>
     <juniversalchardet.version>1.0.3</juniversalchardet.version>
     <junrar.version>7.5.1</junrar.version>
     <libpst.version>0.9.3</libpst.version>
@@ -356,6 +356,7 @@
     <ops4j.version>1.5.1</ops4j.version>
     <optimaize.version>0.6</optimaize.version>
     <osgi.core.version>6.0.0</osgi.core.version>
+    <osgi.compendium.version>5.0.0</osgi.compendium.version>
     <parso.version>2.0.14</parso.version>
     <!-- some conflict with slf4j with >= 4.12.0
           causes failure in testForkParser -->