#1500 - Upgrade dependencies

- DKPro Parent POM 25 -> 26 - SLF4J 1.7.30 -> 1.7.36 - Snakeyaml 1.27 -> 1.30 - Groovy 3.0.7 -> 3.0.10 - Jackson 2.12.1 -> 2.13.2 - Fix a couple of type system dependencies - Fix two version variables - Switch some external repository URLs from http to https - Bit of formatting
dkpro · Apr 26, 2022 · bb18177 · bb18177
1 parent dfdf898
commit bb18177
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 48 deletions.
diff --git a/dkpro-core-api-parameter-asl/src/main/java/org/dkpro/core/api/parameter/Messages.java b/dkpro-core-api-parameter-asl/src/main/java/org/dkpro/core/api/parameter/Messages.java
@@ -17,8 +17,6 @@
  */
 package org.dkpro.core.api.parameter;
 
-import org.dkpro.core.api.parameter.Messages;
-
 public final class Messages
 {
     public static final String BUNDLE = Messages.class.getName();

diff --git a/dkpro-core-asl/pom.xml b/dkpro-core-asl/pom.xml
@@ -702,7 +702,7 @@
       <repositories>
         <repository>
           <id>ukp-oss-ext-releases</id>
-          <url>http://zoidberg.ukp.informatik.tu-darmstadt.de/artifactory/public-ext-releases-local</url>
+          <url>https://zoidberg.ukp.informatik.tu-darmstadt.de/artifactory/public-ext-releases-local</url>
           <releases>
             <enabled>true</enabled>
           </releases>
@@ -712,7 +712,7 @@
         </repository>
         <repository>
           <id>ukp-oss-ext-snapshots</id>
-          <url>http://zoidberg.ukp.informatik.tu-darmstadt.de/artifactory/public-ext-snapshots-local/</url>
+          <url>https://zoidberg.ukp.informatik.tu-darmstadt.de/artifactory/public-ext-snapshots-local/</url>
           <releases>
             <enabled>false</enabled>
           </releases>
@@ -722,7 +722,7 @@
         </repository>
         <repository>
           <id>cogcomp.cs.uiuc.edu-releases</id>
-          <url>http://cogcomp.org/m2repo/</url>
+          <url>https://cogcomp.org/m2repo/</url>
           <releases>
             <enabled>true</enabled>
           </releases>

diff --git a/dkpro-core-dictionaryannotator-asl/pom.xml b/dkpro-core-dictionaryannotator-asl/pom.xml
@@ -65,6 +65,10 @@
       <groupId>org.dkpro.core</groupId>
       <artifactId>dkpro-core-api-parameter-asl</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.dkpro.core</groupId>
+      <artifactId>dkpro-core-api-lexmorph-asl</artifactId>
+    </dependency>
     <dependency>
       <groupId>eu.openminted.share.annotations</groupId>
       <artifactId>omtd-share-annotations-api</artifactId>
@@ -84,11 +88,6 @@
       <artifactId>dkpro-core-api-ner-asl</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.dkpro.core</groupId>
-      <artifactId>dkpro-core-api-lexmorph-asl</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
       <plugins>

diff --git a/dkpro-core-illinoisnlp-asl/src/main/java/org/dkpro/core/illinoisnlp/IllinoisPosTagger.java b/dkpro-core-illinoisnlp-asl/src/main/java/org/dkpro/core/illinoisnlp/IllinoisPosTagger.java
@@ -67,10 +67,10 @@
 @LanguageCapability("en")
 @TypeCapability(
         inputs = {
-                "de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence",
-                "de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token"},
+            "de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence",
+            "de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token"},
        outputs = {
-                "de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.pos.POS"})
+           "de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.pos.POS"})
 public class IllinoisPosTagger
     extends JCasAnnotator_ImplBase
 {

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
@@ -109,8 +109,7 @@ public class BratReader
     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}" 
-            })
+            "de.tudarmstadt.ukp.dkpro.core.api.syntax.type.dependency.Dependency:Governor:Dependent{A}" })
     private Set<String> relationTypes;
 
     /**

diff --git a/dkpro-core-io-brat-asl/src/main/java/org/dkpro/core/io/brat/BratWriter.java b/dkpro-core-io-brat-asl/src/main/java/org/dkpro/core/io/brat/BratWriter.java
@@ -105,7 +105,7 @@ public class BratWriter extends JCasFileWriter_ImplBase
 //            "de.tudarmstadt.ukp.dkpro.core.api.ner.type.NamedEntity",
 //            "de.tudarmstadt.ukp.dkpro.core.api.semantics.type.SemArg", 
 //            "de.tudarmstadt.ukp.dkpro.core.api.semantics.type.SemPred" 
-            })
+    })
     private Set<String> spanTypes;
 
     /**

diff --git a/dkpro-core-io-rdf-asl/pom.xml b/dkpro-core-io-rdf-asl/pom.xml
@@ -41,12 +41,12 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-core</artifactId>
-      <version>${jena.version>}</version>
+      <version>${jena.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>${jena.version>}</version>
+      <version>${jena.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

diff --git a/dkpro-core-morpha-asl/src/main/java/org/dkpro/core/morpha/MorphaLemmatizer.java b/dkpro-core-morpha-asl/src/main/java/org/dkpro/core/morpha/MorphaLemmatizer.java
@@ -54,8 +54,8 @@
 @LanguageCapability("en")
 @TypeCapability(
         inputs = { "de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence",
-                    "de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token",
-                    "de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.pos.POS" },
+                     "de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token",
+                     "de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.pos.POS" },
         outputs = { "de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Lemma" })
 public class MorphaLemmatizer
     extends JCasAnnotator_ImplBase

diff --git a/dkpro-core-nlp4j-asl/src/main/java/org/dkpro/core/nlp4j/Nlp4JDependencyParser.java b/dkpro-core-nlp4j-asl/src/main/java/org/dkpro/core/nlp4j/Nlp4JDependencyParser.java
@@ -209,22 +209,22 @@ protected OnlineComponent<NLPNode, DEPState<NLPNode>> produceResource(InputStrea
                     new OnlineComponentTagsetDescriptionProvider<NLPNode, DEPState<NLPNode>>(
                     getResourceMetaData().getProperty("dependency.tagset"), Dependency.class,
                     component)
-            {
-                @Override
-                public Set<String> listTags(String aLayer, String aTagsetName)
                 {
-                    Set<String> cleanTags = new TreeSet<String>();
-
-                    for (String tag : super.listTags(aLayer, aTagsetName)) {
-                        String t = StringUtils.substringAfterLast(tag, "_");
-                        if (t.length() > 0) {
-                            cleanTags.add(t);
+                    @Override
+                    public Set<String> listTags(String aLayer, String aTagsetName)
+                    {
+                        Set<String> cleanTags = new TreeSet<String>();
+
+                        for (String tag : super.listTags(aLayer, aTagsetName)) {
+                            String t = StringUtils.substringAfterLast(tag, "_");
+                            if (t.length() > 0) {
+                                cleanTags.add(t);
+                            }
                         }
+
+                        return cleanTags;
                     }
-
-                    return cleanTags;
-                }
-            };
+                };
             addTagset(tsdp);
 
             if (printTagSet) {

diff --git a/dkpro-core-smile-asl/pom.xml b/dkpro-core-smile-asl/pom.xml
@@ -65,6 +65,10 @@
       <groupId>org.dkpro.core</groupId>
       <artifactId>dkpro-core-api-parameter-asl</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.dkpro.core</groupId>
+      <artifactId>dkpro-core-api-lexmorph-asl</artifactId>
+    </dependency>
     <dependency>
       <groupId>eu.openminted.share.annotations</groupId>
       <artifactId>omtd-share-annotations-api</artifactId>
@@ -79,11 +83,6 @@
       <artifactId>dkpro-core-testing-asl</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.dkpro.core</groupId>
-      <artifactId>dkpro-core-api-lexmorph-asl</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.dkpro.core</groupId>
       <artifactId>dkpro-core-opennlp-asl</artifactId>

diff --git a/dkpro-core-snowball-asl/pom.xml b/dkpro-core-snowball-asl/pom.xml
@@ -53,6 +53,10 @@
       <groupId>org.dkpro.core</groupId>
       <artifactId>dkpro-core-api-segmentation-asl</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.dkpro.core</groupId>
+      <artifactId>dkpro-core-api-lexmorph-asl</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.dkpro.core</groupId>
       <artifactId>dkpro-core-api-parameter-asl</artifactId>
@@ -71,11 +75,6 @@
       <artifactId>dkpro-core-testing-asl</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.dkpro.core</groupId>
-      <artifactId>dkpro-core-api-lexmorph-asl</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.dkpro.core</groupId>
       <artifactId>dkpro-core-opennlp-asl</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.dkpro</groupId>
     <artifactId>dkpro-parent-pom</artifactId>
-    <version>25</version>
+    <version>26</version>
   </parent>
   <groupId>org.dkpro.core</groupId>
   <artifactId>dkpro-core</artifactId>
@@ -45,14 +45,14 @@
     <lucene.version>4.4.0</lucene.version>
     <!-- The Spring version should be at least whatever uimaFIT requires -->
     <spring.version>4.3.30.RELEASE</spring.version>
-    <slf4j.version>1.7.30</slf4j.version>
+    <slf4j.version>1.7.36</slf4j.version>
     <log4j.version>2.16.0</log4j.version>
     <maven.surefire.heap>6g</maven.surefire.heap>
     <activation.version>1.2.0</activation.version>
     <icu4j.version>68.2</icu4j.version>
-    <snakeyaml.version>1.27</snakeyaml.version>
-    <groovy.version>3.0.7</groovy.version>
-    <jackson.version>2.12.1</jackson.version>
+    <snakeyaml.version>1.30</snakeyaml.version>
+    <groovy.version>3.0.10</groovy.version>
+    <jackson.version>2.13.2</jackson.version>
     <jena.version>3.17.0</jena.version>
   </properties>
   <repositories>