Merge pull request #3707 from inception-project/refactoring/3706-Upda…

…te-dependencies #3706 - Update dependencies (26.6)
inception-project · Jan 10, 2023 · 4dceb23 · 4dceb23
2 parents 1c5e7f0 + 2c0ffb3
commit 4dceb23
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 6 deletions.
diff --git a/inception/inception-io-lif/pom.xml b/inception/inception-io-lif/pom.xml
@@ -33,7 +33,6 @@
       <groupId>de.tudarmstadt.ukp.inception.app</groupId>
       <artifactId>inception-model</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
@@ -42,7 +41,6 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-autoconfigure</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.apache.uima</groupId>
       <artifactId>uimaj-core</artifactId>
@@ -51,10 +49,44 @@
       <groupId>org.apache.uima</groupId>
       <artifactId>uimafit-core</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.dkpro.core</groupId>
       <artifactId>dkpro-core-io-lif-asl</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.groovy</groupId>
+          <artifactId>groovy</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.codehaus.groovy</groupId>
+          <artifactId>groovy-xml</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.groovy</groupId>
+      <artifactId>groovy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.groovy</groupId>
+      <artifactId>groovy-xml</artifactId>
     </dependency>
   </dependencies>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <configuration>
+            <ignoredDependencies>
+              <ignoredDependency>org.apache.groovy:groovy</ignoredDependency>
+              <ignoredDependency>org.apache.groovy:groovy-xml</ignoredDependency>
+            </ignoredDependencies>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 </project>
diff --git a/inception/pom.xml b/inception/pom.xml
@@ -86,7 +86,7 @@
     <log4j2.version>2.18.0</log4j2.version>
     <jboss.logging.version>3.5.0.Final</jboss.logging.version>
 
-    <groovy.version>3.0.14</groovy.version>
+    <groovy.version>4.0.7</groovy.version>
 
     <tomcat.version>9.0.70</tomcat.version>
     <servlet-api.version>4.0.1</servlet-api.version>
@@ -1699,7 +1699,7 @@
 
       <!-- GROOVY -->
       <dependency>
-        <groupId>org.codehaus.groovy</groupId>
+        <groupId>org.apache.groovy</groupId>
         <artifactId>groovy-bom</artifactId>
         <version>${groovy.version}</version>
         <type>pom</type>
@@ -2615,6 +2615,14 @@
           <groupId>org.codehaus.gmaven</groupId>
           <artifactId>groovy-maven-plugin</artifactId>
           <version>2.1.1</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.groovy</groupId>
+              <artifactId>groovy-all</artifactId>
+              <version>${groovy.version}</version>
+              <type>pom</type>
+            </dependency>
+          </dependencies>
         </plugin>
         <plugin>
           <groupId>com.github.eirslett</groupId>

diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.dkpro</groupId>
     <artifactId>dkpro-parent-pom</artifactId>
-    <version>27</version>
+    <version>28</version>
   </parent>
 
   <groupId>de.tudarmstadt.ukp.inception.app</groupId>