Skip to content

Commit

Permalink
Merge pull request #4286 from inception-project/refactoring/4285-Upgr…
Browse files Browse the repository at this point in the history 
…ade-dependencies

#4285 - Upgrade dependencies
  • Loading branch information
@reckart
reckart authored Nov 22, 2023
2 parents b7aca06 + 03ef3d4 commit 017b557
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 58 deletions.
94 changes: 45 additions & 49 deletions inception/inception-dependencies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,49 @@
<version>${json.version}</version>
</dependency>

<!-- JAXB DEPENDENCIES -->
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-bom</artifactId>
<version>2.3.9</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0.1</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.2.0</version>
<exclusions>
<exclusion>
<artifactId>dom4j</artifactId>
<groupId>dom4j</groupId>
</exclusion>
<exclusion>
<artifactId>xom</artifactId>
<groupId>xom</groupId>
</exclusion>
<exclusion>
<artifactId>jdom</artifactId>
<groupId>jdom</groupId>
</exclusion>
</exclusions>
</dependency>

<!-- Testing -->
<dependency>
<groupId>org.junit</groupId>
Expand Down Expand Up @@ -587,7 +630,7 @@
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
<version>4.2.1</version>
<version>4.2.2</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -974,53 +1017,6 @@
<version>1.1.10.5</version>
</dependency>

<!-- JAXB DEPENDENCIES -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.8</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.8</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<version>1.2.0</version>
</dependency>

<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.2.0</version>
<exclusions>
<exclusion>
<artifactId>dom4j</artifactId>
<groupId>dom4j</groupId>
</exclusion>
<exclusion>
<artifactId>xom</artifactId>
<groupId>xom</groupId>
</exclusion>
<exclusion>
<artifactId>jdom</artifactId>
<groupId>jdom</groupId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.dkpro.core</groupId>
<artifactId>dkpro-core-testing-asl</artifactId>
Expand Down Expand Up @@ -1081,7 +1077,7 @@
<dependency>
<groupId>com.github.jsonld-java</groupId>
<artifactId>jsonld-java</artifactId>
<version>0.13.4</version>
<version>0.13.6</version>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
Expand Down
18 changes: 9 additions & 9 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
</distributionManagement>

<properties>
<junit-jupiter.version>5.10.0</junit-jupiter.version>
<junit-platform.version>1.10.0</junit-platform.version>
<junit-jupiter.version>5.10.1</junit-jupiter.version>
<junit-platform.version>1.10.1</junit-platform.version>
<mockito.version>5.5.0</mockito.version>
<assertj.version>3.24.2</assertj.version>
<xmlunit.version>2.9.1</xmlunit.version>
Expand All @@ -83,9 +83,9 @@
<pdfbox.version>2.0.29</pdfbox.version>

<spring.version>5.3.30</spring.version>
<spring.boot.version>2.7.16</spring.boot.version>
<spring.data.version>2.7.16</spring.data.version>
<spring.security.version>5.8.7</spring.security.version>
<spring.boot.version>2.7.17</spring.boot.version>
<spring.data.version>2.7.17</spring.data.version>
<spring.security.version>5.8.8</spring.security.version>
<springdoc.version>1.7.0</springdoc.version>
<swagger.version>2.2.16</swagger.version>
<jjwt.version>0.11.5</jjwt.version>
Expand All @@ -95,7 +95,7 @@
<jboss.logging.version>3.5.3.Final</jboss.logging.version>
<sentry.version>6.30.0</sentry.version>

<tomcat.version>9.0.80</tomcat.version>
<tomcat.version>9.0.82</tomcat.version>
<servlet-api.version>4.0.1</servlet-api.version>

<mariadb.driver.version>2.7.10</mariadb.driver.version>
Expand All @@ -121,7 +121,7 @@
<!-- * 8.11.1.0 depends on Lucene 8.11.1 -->
<!-- no mtas depends on Lucene 9.x -->

<elasticsearch.version>7.17.13</elasticsearch.version>
<elasticsearch.version>7.17.14</elasticsearch.version>
<!-- 7.10.x depends on Lucene 8.7.0 - last ASL 2.0 version! -->
<!-- * 7.17.x depends on Lucene 8.11.1 -->
<!-- 8.1.x depends on Lucene 9.0.0 -->
Expand All @@ -130,7 +130,7 @@
<!-- * 1.3.5 depends on Lucene 8.10.1 -->
<!-- 2.x depends on Lucene 9.x -->

<rdf4j.version>4.3.7</rdf4j.version>
<rdf4j.version>4.3.8</rdf4j.version>
<!-- * 4.3.x depends on Lucene 8.9.x -->

<jena.version>4.6.1</jena.version>
Expand All @@ -143,7 +143,7 @@

<json.version>20230227</json.version>
<pf4j.version>2.6.0</pf4j.version>
<jackson.version>2.15.2</jackson.version>
<jackson.version>2.15.3</jackson.version>
<snakeyaml.version>1.33</snakeyaml.version>
<okhttp.version>4.11.0</okhttp.version>
<okio.version>3.5.0</okio.version>
Expand Down

0 comments on commit 017b557

Please sign in to comment.