Skip to content

Commit

Permalink
#1539 - Upgrade dependencies
Browse files Browse the repository at this point in the history
- Remove managed version for xalan - it is a banned dependency now anyway
- Remove managed version for xml-apis and make it a banned dependency
- versions-maven-plugin 2.8.1 -> 2.14.2
- spdx-maven-plugin 0.2.5 -> 0.6.3
  • Loading branch information
reckart committed Dec 31, 2022
1 parent 6f98fcd commit 8c68f0f
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 50 deletions.
11 changes: 0 additions & 11 deletions dkpro-core-corenlp-gpl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,6 @@
<groupId>eu.openminted.share.annotations</groupId>
<artifactId>omtd-share-annotations-api</artifactId>
</dependency>
<dependency>
<!--
- Xerces 2.12.0 no longer draws in the XML APIs causing ClassNotFoundExceptions on JREs
- not including the XML APIs either. However, there is no direct code dependency on the
- artifact in this module.
-->
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -597,7 +587,6 @@
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<usedDependencies>
<usedDependency>xml-apis:xml-apis</usedDependency>
<!-- Models not detected by byte-code analysis -->
<usedDependency>de.tudarmstadt.ukp.dkpro.core:de.tudarmstadt.ukp.dkpro.core.stanfordnlp-model-coref-en-default</usedDependency>
<usedDependency>de.tudarmstadt.ukp.dkpro.core:de.tudarmstadt.ukp.dkpro.core.stanfordnlp-model-ner-en-all.3class.distsim.crf</usedDependency>
Expand Down
11 changes: 0 additions & 11 deletions dkpro-core-gate-asl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,6 @@
<groupId>eu.openminted.share.annotations</groupId>
<artifactId>omtd-share-annotations-api</artifactId>
</dependency>
<dependency>
<!--
- Xerces 2.12.0 no longer draws in the XML APIs causing ClassNotFoundExceptions on JREs
- not including the XML APIs either. However, there is no direct code dependency on the
- artifact in this module.
-->
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -134,7 +124,6 @@
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<usedDependencies>
<usedDependency>xml-apis:xml-apis</usedDependency>
<!-- Models not detected by byte-code analysis -->
<usedDependency>de.tudarmstadt.ukp.dkpro.core:de.tudarmstadt.ukp.dkpro.core.gate-model-lemmatizer-en-default</usedDependency>
<usedDependency>de.tudarmstadt.ukp.dkpro.core:de.tudarmstadt.ukp.dkpro.core.gate-model-tagger-en-annie</usedDependency>
Expand Down
11 changes: 0 additions & 11 deletions dkpro-core-io-tgrep-gpl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,6 @@
<groupId>eu.openminted.share.annotations</groupId>
<artifactId>omtd-share-annotations-api</artifactId>
</dependency>
<dependency>
<!--
- Xerces 2.12.0 no longer draws in the XML APIs causing ClassNotFoundExceptions on JREs
- not including the XML APIs either. However, there is no direct code dependency on the
- artifact in this module.
-->
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -117,7 +107,6 @@
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<usedDependencies>
<usedDependency>xml-apis:xml-apis</usedDependency>
<!-- Models not detected by byte-code analysis -->
<usedDependency>de.tudarmstadt.ukp.dkpro.core:de.tudarmstadt.ukp.dkpro.core.stanfordnlp-model-parser-en-pcfg</usedDependency>
</usedDependencies>
Expand Down
27 changes: 10 additions & 17 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -243,21 +243,12 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.2</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.2</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>serializer</artifactId>
<version>2.7.2</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.4.01</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>stax</groupId>
Expand Down Expand Up @@ -527,7 +518,9 @@
<excludes>
<!-- <exclude>xerces:*</exclude> -->
<exclude>xalan:*</exclude>
<exclude>xml-apis:*</exclude>
<!-- <exclude>commons-lang:commons-lang</exclude> -->
<!-- <exclude>org.apache.commons:commons-math</exclude> matetools still uses this -->
<exclude>commons-math:commons-math</exclude>
<!-- <exclude>commons-collections:commons-collections</exclude> -->
</excludes>
Expand Down Expand Up @@ -755,7 +748,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.8.1</version>
<version>2.14.2</version>
<configuration>
<rulesUri>file:${session.executionRootDirectory}/dkpro-core-build/src/main/resources/dkpro-core/version-rules.xml</rulesUri>
</configuration>
Expand All @@ -778,7 +771,7 @@
<plugin>
<groupId>org.spdx</groupId>
<artifactId>spdx-maven-plugin</artifactId>
<version>0.2.5</version>
<version>0.6.3</version>
<executions>
<execution>
<id>build-spdx</id>
Expand Down

0 comments on commit 8c68f0f

Please sign in to comment.