#4909 - Upgrade dependencies

- dkpro-core 2.4.0 -> 2.5.0
inception-project · Aug 4, 2024 · 37f2d24 · 37f2d24
1 parent af2a6f9
commit 37f2d24
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 84 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,4 @@ dependency-reduced-pom.xml
 **/src/main/ts/package.json
 **/src/main/ts/package-lock.json
 local/
+.asciidoctorconfig.adoc
diff --git a/inception/inception-dependencies/pom.xml b/inception/inception-dependencies/pom.xml
@@ -33,30 +33,31 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.apache.uima</groupId>
-        <artifactId>uimaj-bom</artifactId>
-        <version>${uima.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.uima</groupId>
-        <artifactId>uimafit-bom</artifactId>
-        <version>${uimafit.version}</version>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-framework-bom</artifactId>
+        <version>${spring.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>org.apache.uima</groupId>
         <artifactId>uimaj-io-json</artifactId>
         <version>${uima-json.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.json</groupId>
         <artifactId>json</artifactId>
         <version>${json.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.apache.ivy</groupId>
+        <artifactId>ivy</artifactId>
+        <version>2.5.2</version>
+      </dependency>
+
       <!-- JAXB DEPENDENCIES -->
       <dependency>
         <groupId>org.glassfish.jaxb</groupId>
@@ -489,6 +490,11 @@
         <artifactId>commons-collections4</artifactId>
         <version>${commons-collections4.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-math3</artifactId>
+        <version>${commons-math3.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-csv</artifactId>
@@ -519,6 +525,18 @@
         <artifactId>jsr305</artifactId>
         <version>3.0.2</version>
       </dependency>
+
+      <dependency>
+        <groupId>com.ibm.icu</groupId>
+        <artifactId>icu4j</artifactId>
+        <version>75.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>eu.openminted.share.annotations</groupId>
+        <artifactId>omtd-share-annotations-api</artifactId>
+        <version>3.0.2.7</version>
+      </dependency>
 
       <dependency>
         <groupId>org.pf4j</groupId>
@@ -549,6 +567,13 @@
       </dependency>
 
       <!-- Jena -->
+      <dependency>
+        <groupId>org.apache.jena</groupId>
+        <artifactId>jena-bom</artifactId>
+        <version>${jena.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>org.apache.jena</groupId>
         <artifactId>jena-fuseki-main</artifactId>
@@ -560,11 +585,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-      <dependency>
-        <groupId>org.apache.jena</groupId>
-        <artifactId>jena-text</artifactId>
-        <version>${jena.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.jena</groupId>
         <artifactId>jena-arq</artifactId>
@@ -584,16 +604,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-      <dependency>
-        <groupId>org.apache.jena</groupId>
-        <artifactId>jena-tdb</artifactId>
-        <version>${jena.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.jena</groupId>
-        <artifactId>jena-core</artifactId>
-        <version>${jena.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.thrift</groupId>
         <artifactId>libthrift</artifactId>
@@ -615,14 +625,6 @@
         <version>${jboss.logging.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>io.sentry</groupId>
-        <artifactId>sentry-bom</artifactId>
-        <version>${sentry.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-
       <dependency>
         <groupId>jakarta.servlet</groupId>
         <artifactId>jakarta.servlet-api</artifactId>
@@ -709,15 +711,6 @@
         <version>${wicketstuff.version}</version>
       </dependency>
 
-      <!-- SPRING -->
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-framework-bom</artifactId>
-        <version>${spring.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-
       <!-- SPRING DATA -->
       <dependency>
         <groupId>org.springframework.data</groupId>
@@ -1419,51 +1412,38 @@
       </dependency>
 
       <dependency>
-        <!-- Import dependency management from LOG4J -->
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-bom</artifactId>
-        <version>${log4j2.version}</version>
+        <groupId>io.sentry</groupId>
+        <artifactId>sentry-bom</artifactId>
+        <version>${sentry.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-core</artifactId>
-        <version>${log4j2.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-api</artifactId>
-        <version>${log4j2.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-jmx-gui</artifactId>
-        <version>${log4j2.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-layout-template-json</artifactId>
-        <version>${log4j2.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-slf4j2-impl</artifactId>
-        <version>${log4j2.version}</version>
+        <groupId>org.apache.uima</groupId>
+        <artifactId>uimaj-bom</artifactId>
+        <version>${uima.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
+
       <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-spring-boot</artifactId>
-        <version>${log4j2.version}</version>
+        <groupId>org.apache.uima</groupId>
+        <artifactId>uimafit-bom</artifactId>
+        <version>${uimafit.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-to-slf4j</artifactId>
+        <artifactId>log4j-bom</artifactId>
         <version>${log4j2.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
 
       <dependency>
-        <!-- Import dependency management from Spring Boot -->
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
         <version>${spring.boot.version}</version>
@@ -1472,7 +1452,6 @@
       </dependency>
 
       <dependency>
-        <!-- Import dependency management from Wicket -->
         <groupId>org.apache.wicket</groupId>
         <artifactId>wicket-parent</artifactId>
         <version>${wicket.version}</version>
@@ -1481,18 +1460,12 @@
       </dependency>
 
       <dependency>
-        <!-- Import dependency management from DKPro Core -->
         <groupId>org.dkpro.core</groupId>
-        <artifactId>dkpro-core-asl</artifactId>
+        <artifactId>dkpro-core-bom-asl</artifactId>
         <version>${dkpro.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>org.apache.ivy</groupId>
-        <artifactId>ivy</artifactId>
-        <version>2.5.2</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>
diff --git a/inception/inception-security/pom.xml b/inception/inception-security/pom.xml
@@ -22,9 +22,10 @@
     <artifactId>inception-app</artifactId>
     <version>34.0-SNAPSHOT</version>
   </parent>
+
   <artifactId>inception-security</artifactId>
   <name>INCEpTION - Core - Security</name>
-  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.commons</groupId>

diff --git a/pom.xml b/pom.xml
@@ -79,7 +79,7 @@
 
     <awaitility.version>4.2.1</awaitility.version>
 
-    <dkpro.version>2.4.0</dkpro.version>
+    <dkpro.version>2.5.0</dkpro.version>
     <uima.version>3.5.0</uima.version>
     <uimafit.version>3.5.0</uimafit.version>
     <uima-json.version>0.5.0</uima-json.version>
@@ -150,6 +150,7 @@
     <commons-dbcp2.version>2.12.0</commons-dbcp2.version>
     <commons-codec.version>1.17.1</commons-codec.version>
     <commons-compress.version>1.26.2</commons-compress.version>
+    <commons-math3.version>3.6.1</commons-math3.version>
     <commons-text.version>1.12.0</commons-text.version>
     <commons-validator.version>1.9.0</commons-validator.version>
     <commons-io.version>2.16.1</commons-io.version>