Merge pull request #1562 from dkpro/refactoring/1561-Upgrade-dependen…

…cies #1561 - Upgrade dependencies
dkpro · Apr 10, 2023 · 2ccda80 · 2ccda80
2 parents 2bab7b0 + feaf0aa
commit 2ccda80
Show file tree

Hide file tree

Showing 84 changed files with 334 additions and 220 deletions.
diff --git a/dkpro-core-api-xml-asl/pom.xml b/dkpro-core-api-xml-asl/pom.xml
@@ -44,5 +44,16 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/dkpro-core-berkeleyparser-gpl/pom.xml b/dkpro-core-berkeleyparser-gpl/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright 2007-2019
+    Copyright 2007-2023
     Ubiquitous Knowledge Processing (UKP) Lab
     Technische Universität Darmstadt
 

diff --git a/...o-core-berkeleyparser-gpl/src/main/java/org/dkpro/core/berkeleyparser/BerkeleyParser.java b/...o-core-berkeleyparser-gpl/src/main/java/org/dkpro/core/berkeleyparser/BerkeleyParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/dkpro-core-berkeleyparser-gpl/src/main/java/org/dkpro/core/berkeleyparser/package-info.java b/dkpro-core-berkeleyparser-gpl/src/main/java/org/dkpro/core/berkeleyparser/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/dkpro-core-berkeleyparser-gpl/src/scripts/build.xml b/dkpro-core-berkeleyparser-gpl/src/scripts/build.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright 2007-2019
+    Copyright 2007-2023
     Ubiquitous Knowledge Processing (UKP) Lab
     Technische Universität Darmstadt
 

diff --git a/...re-berkeleyparser-gpl/src/test/java/org/dkpro/core/berkeleyparser/BerkeleyParserTest.java b/...re-berkeleyparser-gpl/src/test/java/org/dkpro/core/berkeleyparser/BerkeleyParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/dkpro-core-corenlp-gpl/pom.xml b/dkpro-core-corenlp-gpl/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright 2007-2019
+    Copyright 2007-2023
     Ubiquitous Knowledge Processing (UKP) Lab
     Technische Universität Darmstadt
 

diff --git a/dkpro-core-corenlp-gpl/src/main/java/org/dkpro/core/corenlp/CoreNlpCoreferenceResolver.java b/dkpro-core-corenlp-gpl/src/main/java/org/dkpro/core/corenlp/CoreNlpCoreferenceResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/dkpro-core-corenlp-gpl/src/main/java/org/dkpro/core/corenlp/CoreNlpDependencyParser.java b/dkpro-core-corenlp-gpl/src/main/java/org/dkpro/core/corenlp/CoreNlpDependencyParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/dkpro-core-corenlp-gpl/src/main/java/org/dkpro/core/corenlp/CoreNlpLemmatizer.java b/dkpro-core-corenlp-gpl/src/main/java/org/dkpro/core/corenlp/CoreNlpLemmatizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/...o-core-corenlp-gpl/src/main/java/org/dkpro/core/corenlp/CoreNlpNamedEntityRecognizer.java b/...o-core-corenlp-gpl/src/main/java/org/dkpro/core/corenlp/CoreNlpNamedEntityRecognizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/dkpro-core-corenlp-gpl/src/main/java/org/dkpro/core/corenlp/CoreNlpParser.java b/dkpro-core-corenlp-gpl/src/main/java/org/dkpro/core/corenlp/CoreNlpParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/dkpro-core-corenlp-gpl/src/main/java/org/dkpro/core/corenlp/CoreNlpPosTagger.java b/dkpro-core-corenlp-gpl/src/main/java/org/dkpro/core/corenlp/CoreNlpPosTagger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/dkpro-core-corenlp-gpl/src/main/java/org/dkpro/core/corenlp/CoreNlpSegmenter.java b/dkpro-core-corenlp-gpl/src/main/java/org/dkpro/core/corenlp/CoreNlpSegmenter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/dkpro-core-corenlp-gpl/src/main/java/org/dkpro/core/corenlp/internal/CoreNlp2DKPro.java b/dkpro-core-corenlp-gpl/src/main/java/org/dkpro/core/corenlp/internal/CoreNlp2DKPro.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/dkpro-core-corenlp-gpl/src/main/java/org/dkpro/core/corenlp/internal/DKPro2CoreNlp.java b/dkpro-core-corenlp-gpl/src/main/java/org/dkpro/core/corenlp/internal/DKPro2CoreNlp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/dkpro-core-corenlp-gpl/src/main/java/org/dkpro/core/corenlp/internal/TokenKey.java b/dkpro-core-corenlp-gpl/src/main/java/org/dkpro/core/corenlp/internal/TokenKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/dkpro-core-corenlp-gpl/src/scripts/build.xml b/dkpro-core-corenlp-gpl/src/scripts/build.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright 2007-2019
+    Copyright 2007-2023
     Ubiquitous Knowledge Processing (UKP) Lab
     Technische Universität Darmstadt
 

diff --git a/...core-corenlp-gpl/src/test/java/org/dkpro/core/corenlp/CoreNlpCoreferenceResolverTest.java b/...core-corenlp-gpl/src/test/java/org/dkpro/core/corenlp/CoreNlpCoreferenceResolverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/dkpro-core-corenlp-gpl/src/test/java/org/dkpro/core/corenlp/CoreNlpDependencyParserTest.java b/dkpro-core-corenlp-gpl/src/test/java/org/dkpro/core/corenlp/CoreNlpDependencyParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/dkpro-core-corenlp-gpl/src/test/java/org/dkpro/core/corenlp/CoreNlpLemmatizerTest.java b/dkpro-core-corenlp-gpl/src/test/java/org/dkpro/core/corenlp/CoreNlpLemmatizerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/...re-corenlp-gpl/src/test/java/org/dkpro/core/corenlp/CoreNlpNamedEntityRecognizerTest.java b/...re-corenlp-gpl/src/test/java/org/dkpro/core/corenlp/CoreNlpNamedEntityRecognizerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/dkpro-core-corenlp-gpl/src/test/java/org/dkpro/core/corenlp/CoreNlpParserTest.java b/dkpro-core-corenlp-gpl/src/test/java/org/dkpro/core/corenlp/CoreNlpParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/...pl/src/test/java/org/dkpro/core/corenlp/CoreNlpPosTaggerAndNamedEntityRecognizerTest.java b/...pl/src/test/java/org/dkpro/core/corenlp/CoreNlpPosTaggerAndNamedEntityRecognizerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/dkpro-core-corenlp-gpl/src/test/java/org/dkpro/core/corenlp/CoreNlpPosTaggerTest.java b/dkpro-core-corenlp-gpl/src/test/java/org/dkpro/core/corenlp/CoreNlpPosTaggerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/dkpro-core-corenlp-gpl/src/test/java/org/dkpro/core/corenlp/CoreNlpSegmenterTest.java b/dkpro-core-corenlp-gpl/src/test/java/org/dkpro/core/corenlp/CoreNlpSegmenterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/dkpro-core-dictionaryannotator-asl/pom.xml b/dkpro-core-dictionaryannotator-asl/pom.xml
@@ -36,10 +36,6 @@
       <groupId>org.apache.uima</groupId>
       <artifactId>uimafit-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
@@ -70,6 +66,11 @@
       <artifactId>dkpro-core-api-ner-asl</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
       <plugins>

diff --git a/dkpro-core-doc/pom.xml b/dkpro-core-doc/pom.xml
@@ -32,15 +32,15 @@
   </properties>
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy-xml</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy-templates</artifactId>
     </dependency>
     <dependency>
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>org.dkpro.meta</groupId>
       <artifactId>dkpro-meta-core</artifactId>
-      <version>0.3.0</version>
+      <version>0.4.0</version>
     </dependency>
   </dependencies>
   <build>
@@ -348,7 +348,7 @@
           <plugin>
             <groupId>org.codehaus.gmavenplus</groupId>
             <artifactId>gmavenplus-plugin</artifactId>
-            <version>1.6.3</version>
+            <version>2.1.0</version>
             <executions>
               <execution>
                 <id>build</id>

diff --git a/dkpro-core-doc/src/main/groovy/org/dkpro/core/doc/DocumentationBuilder.groovy b/dkpro-core-doc/src/main/groovy/org/dkpro/core/doc/DocumentationBuilder.groovy
@@ -21,7 +21,7 @@ import static groovy.io.FileType.FILES;
 import groovy.json.*;
 import groovy.text.XmlTemplateEngine;
 import groovy.transform.Field;
-import groovy.util.XmlParser;
+import groovy.xml.XmlParser;
 import org.dkpro.meta.core.MetadataAggregator;
 import org.dkpro.meta.core.maven.ContextHolder;
 import org.dkpro.meta.core.model.MetadataModel;

diff --git a/dkpro-core-doc/src/main/groovy/org/dkpro/core/doc/PomSanityCheck.groovy b/dkpro-core-doc/src/main/groovy/org/dkpro/core/doc/PomSanityCheck.groovy
@@ -20,6 +20,7 @@ package org.dkpro.core.doc
 import static groovy.io.FileType.FILES
 
 import org.dkpro.meta.core.maven.ContextHolder;
+import groovy.xml.XmlParser;
 
 class PomSanityCheck {
     public void run() {

diff --git a/dkpro-core-flextag-asl/src/main/java/org/dkpro/core/flextag/FlexTagPosTagger.java b/dkpro-core-flextag-asl/src/main/java/org/dkpro/core/flextag/FlexTagPosTagger.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/dkpro-core-flextag-asl/src/test/java/org/dkpro/core/flextag/FlexTagPosTaggerTest.java b/dkpro-core-flextag-asl/src/test/java/org/dkpro/core/flextag/FlexTagPosTaggerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2007-2019
+ * Copyright 2007-2023
  * Ubiquitous Knowledge Processing (UKP) Lab
  * Technische Universität Darmstadt
  *

diff --git a/dkpro-core-frequency-asl/pom.xml b/dkpro-core-frequency-asl/pom.xml
@@ -138,6 +138,15 @@
           </uimaDescriptorExcludes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <ignoredDependencies>
+            <ignoredDependency>org.dkpro.core:dkpro-core-api-metadata-asl</ignoredDependency>
+          </ignoredDependencies>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/dkpro-core-gpl/pom.xml b/dkpro-core-gpl/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright 2007-2019
+    Copyright 2007-2023
     Ubiquitous Knowledge Processing (UKP) Lab
     Technische Universität Darmstadt
 

diff --git a/dkpro-core-gpl/scripts/build.xml b/dkpro-core-gpl/scripts/build.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright 2007-2019
+    Copyright 2007-2023
     Ubiquitous Knowledge Processing (UKP) Lab
     Technische Universität Darmstadt
 

diff --git a/dkpro-core-io-brat-asl/pom.xml b/dkpro-core-io-brat-asl/pom.xml
@@ -56,6 +56,14 @@
       <groupId>org.dkpro.core</groupId>
       <artifactId>dkpro-core-api-segmentation-asl</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.dkpro.core</groupId>
+      <artifactId>dkpro-core-api-ner-asl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.dkpro.core</groupId>
+      <artifactId>dkpro-core-api-syntax-asl</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
@@ -104,10 +112,22 @@
       <artifactId>dkpro-core-io-conll-asl</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.dkpro.core</groupId>
-      <artifactId>dkpro-core-api-ner-asl</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <configuration>
+            <usedDependencies>
+              <usedDependency>org.dkpro.core:dkpro-core-api-segmentation-asl</usedDependency>
+              <usedDependency>org.dkpro.core:dkpro-core-api-ner-asl</usedDependency>
+              <usedDependency>org.dkpro.core:dkpro-core-api-syntax-asl</usedDependency>
+            </usedDependencies>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 </project>
diff --git a/dkpro-core-io-brat-asl/src/main/java/org/dkpro/core/io/brat/BratReader.java b/dkpro-core-io-brat-asl/src/main/java/org/dkpro/core/io/brat/BratReader.java
@@ -75,6 +75,7 @@
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.Dependency;
 import eu.openminted.share.annotations.api.DocumentationResource;
 
 /**
@@ -111,8 +112,9 @@ public class BratReader
     @Deprecated
     public static final String PARAM_RELATION_TYPES = "relationTypes";
     @Deprecated
-    @ConfigurationParameter(name = PARAM_RELATION_TYPES, mandatory = false, defaultValue = { 
-            "de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.Dependency:Governor:Dependent{A}" })
+    @ConfigurationParameter(name = PARAM_RELATION_TYPES, mandatory = false, defaultValue = {
+            Dependency._TypeName + ":" + Dependency._FeatName_Governor + ":"
+                    + Dependency._FeatName_Dependent + "{A}" })
     private Set<String> relationTypes;
 
     /**