Skip to content

Commit

Permalink
#4909 - Upgrade dependencies
Browse files Browse the repository at this point in the history 
- junit 5.10.2 -> 5.10.3
- junit-platform 1.10.2 -> 1.10.3
- spring 6.1.8 -> 6.1.11
- spring-boot 3.3.0 -> 3.3.2
- spring-data 3.2.4 -> 3.3.2
- spring-security 6.3.0 -> 6.3.1
- springdoc 1.8.0 -> 2.6.0
- jjwt 0.12.5 -> 0.12.6
- jboss-logging 3.5.3 -> 3.6.0
- assertj 3.26.0 -> 3.26.3
- testcontainers 1.19.8 -> 1.20.0
- tomcat 10.1.24 -> 10.1.26
- jetty 12.0.11 -> 12.0.12
- mysql-driver 8.0.27 -> 8.0.33
- hibernate-validator
- lucene 9.10.0 -> 9.11.1
- opensearch 2.14.0 -> 2.15.0
- asciidoctor 2.5.12 -> 2.5.13
- asciidoctor-diagram 2.3.0 -> 2.3.1
- asciidoctor-pdf 2.3.15 -> 2.3.17
- jackson 2.17.1 -> 2.17.2
- byte-buddy 1.14.17 -> 1.14.8
- commons-lang3 3.14.0 -> 3.15.0
- commons-codec 1.17.0 -> 1.17.1
- commons-dbcp2 2.11.0 -> 2.12.0
- jgit 6.9.0.202403050737-r -> 6.10.0.202406032230-r
- json-schema-validator 1.4.0 -> 1.5.1
- fastutil 8.5.13 -> 8.5.14
- woodstox-core 6.6.2 -> 6.7.0
- nimbus-jose-jwt 9.39.3 -> 9.40
  • Loading branch information
@reckart
reckart committed Jul 30, 2024
1 parent 3d32225 commit 922054f
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 42 deletions.
1 change: 1 addition & 0 deletions inception/inception-build/src/main/resources/inception/rules.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<ignoreVersion type="regex">(?i).*[-_\.]b[0-9\.]*</ignoreVersion>
<ignoreVersion type="regex">(?i).*[-_\.]M[0-9\.]*</ignoreVersion>
<ignoreVersion type="regex">(?i).*[-_\.]rc[0-9\.-]*</ignoreVersion>
<ignoreVersion type="regex">(?i).*[-_\.]Dev[0-9\.-]*</ignoreVersion>
<ignoreVersion type="regex">(?i).*[-_\.]alpha[0-9\.-]*</ignoreVersion>
<ignoreVersion type="regex">(?i).*[-_\.]beta[0-9\.-]*</ignoreVersion>
<!-- e.g. commons-collections:commons-collections ... 3.2.1.redhat-7 -> 20040117.000000 -->
Expand Down
28 changes: 14 additions & 14 deletions inception/inception-dependencies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>9.39.3</version>
<version>${nimbus-jose-jwt.version}</version>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
Expand Down Expand Up @@ -507,7 +507,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>2.11.0</version>
<version>${commons-dbcp2.version}</version>
</dependency>
<dependency>
<groupId>org.dom4j</groupId>
Expand Down Expand Up @@ -632,7 +632,7 @@
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<version>6.6.2</version>
<version>${woodstox-core.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
Expand All @@ -649,7 +649,7 @@
<dependency>
<groupId>it.unimi.dsi</groupId>
<artifactId>fastutil</artifactId>
<version>8.5.13</version>
<version>${fastutil.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -696,12 +696,12 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.17</version>
<version>${byte-buddy.version}</version>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.17</version>
<version>${byte-buddy.version}</version>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
Expand Down Expand Up @@ -747,7 +747,7 @@
<dependency>
<groupId>com.networknt</groupId>
<artifactId>json-schema-validator</artifactId>
<version>1.4.0</version>
<version>${json-schema-validator.version}</version>
</dependency>

<!-- SPRING SECURITY -->
Expand Down Expand Up @@ -789,12 +789,12 @@
<!-- Springdoc -->
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<artifactId>springdoc-openapi-starter-common</artifactId>
<version>${springdoc.version}</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-common</artifactId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>${springdoc.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -1040,7 +1040,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
<version>${commons-lang3.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -1050,7 +1050,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.17.0</version>
<version>${commons-codec.version}</version>
</dependency>
<dependency>
<groupId>commons-validator</groupId>
Expand Down Expand Up @@ -1328,7 +1328,7 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
<version>6.9.0.202403050737-r</version>
<version>${jgit.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -1417,12 +1417,12 @@
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.7.6</version>
<version>${picocli.version}</version>
</dependency>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli-spring-boot-starter</artifactId>
<version>4.7.5</version>
<version>${picocli.version}</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions inception/inception-remote/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,11 @@
<!-- Swagger / Springdoc -->
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-common</artifactId>
<artifactId>springdoc-openapi-starter-common</artifactId>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
Expand Down Expand Up @@ -361,7 +361,7 @@
<!--
- Need this for auto-configuration
-->
<ignoredDependency>org.springdoc:springdoc-openapi-ui</ignoredDependency>
<ignoredDependency>org.springdoc:springdoc-openapi-starter-webmvc-ui</ignoredDependency>
<!--
- Test dependencies used via auto-configuration and reflection
-->
Expand Down
8 changes: 4 additions & 4 deletions ...de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/config/RemoteApiAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;

import org.springdoc.core.GroupedOpenApi;
import org.springdoc.core.models.GroupedOpenApi;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
Expand Down Expand Up @@ -67,7 +67,7 @@ public GroupedOpenApi defaultDocket()
{
return GroupedOpenApi.builder().group("disabled") //
.pathsToExclude("/**") //
.addOpenApiCustomiser(openApi -> { //
.addOpenApiCustomizer(openApi -> { //
openApi.info(new Info() //
.title("Remote API disabled") //
.description("The remote API is not enabled."));
Expand All @@ -81,7 +81,7 @@ public GroupedOpenApi legacyRemoteApiDocket()
{
return GroupedOpenApi.builder().group("legacy-v1")
.pathsToMatch(LegacyRemoteApiController.API_BASE + "/**") //
.addOpenApiCustomiser(openApi -> { //
.addOpenApiCustomizer(openApi -> { //
openApi.info(new Info() //
.title("Legacy API") //
.version("1"));
Expand All @@ -95,7 +95,7 @@ public GroupedOpenApi areoRemoteApiDocket()
{
return GroupedOpenApi.builder().group("aero-v1")
.pathsToMatch(AeroRemoteApiController.API_BASE + "/**")
.addOpenApiCustomiser(openApi -> { //
.addOpenApiCustomizer(openApi -> { //
openApi.info(new Info() //
.title("AERO") //
.version("1.0.0")
Expand Down
2 changes: 1 addition & 1 deletion inception/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.14.2</version>
<version>10.17.0</version>
</dependency>
</dependencies>
<configuration>
Expand Down
50 changes: 30 additions & 20 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@
<build-ant-version>1.10.14</build-ant-version>
<build-groovy-version>4.0.21</build-groovy-version>

<junit-jupiter.version>5.10.2</junit-jupiter.version>
<junit-platform.version>1.10.2</junit-platform.version>
<junit-jupiter.version>5.10.3</junit-jupiter.version>
<junit-platform.version>1.10.3</junit-platform.version>
<mockito.version>5.12.0</mockito.version>
<assertj.version>3.26.0</assertj.version>
<assertj.version>3.26.3</assertj.version>
<xmlunit.version>2.10.0</xmlunit.version>
<testcontainers.version>1.19.8</testcontainers.version>
<testcontainers.version>1.20.0</testcontainers.version>

<awaitility.version>4.2.1</awaitility.version>

Expand All @@ -86,26 +86,26 @@

<pdfbox.version>2.0.30</pdfbox.version>

<spring.version>6.1.8</spring.version>
<spring.boot.version>3.3.0</spring.boot.version>
<spring.data.version>3.2.4</spring.data.version>
<spring.security.version>6.3.0</spring.security.version>
<springdoc.version>1.8.0</springdoc.version>
<spring.version>6.1.11</spring.version>
<spring.boot.version>3.3.2</spring.boot.version>
<spring.data.version>3.3.2</spring.data.version>
<spring.security.version>6.3.1</spring.security.version>
<springdoc.version>2.6.0</springdoc.version>
<swagger.version>2.2.22</swagger.version>
<jjwt.version>0.12.5</jjwt.version>
<jjwt.version>0.12.6</jjwt.version>

<slf4j.version>2.0.13</slf4j.version>
<log4j2.version>2.23.1</log4j2.version>
<jboss.logging.version>3.5.3.Final</jboss.logging.version>
<jboss.logging.version>3.6.0.Final</jboss.logging.version>
<sentry.version>6.34.0</sentry.version>

<tomcat.version>10.1.24</tomcat.version>
<jetty.version>12.0.11</jetty.version>
<tomcat.version>10.1.26</tomcat.version>
<jetty.version>12.0.12</jetty.version>
<servlet-api.version>6.0.0</servlet-api.version>

<mariadb.driver.version>2.7.12</mariadb.driver.version>
<mssql.driver.version>12.6.3.jre11</mssql.driver.version>
<mysql.driver.version>8.0.27</mysql.driver.version>
<mysql.driver.version>8.0.33</mysql.driver.version>
<postgres.driver.version>42.7.3</postgres.driver.version>
<hibernate.version>6.5.2.Final</hibernate.version>
<hibernate.validator.version>8.0.1.Final</hibernate.validator.version>
Expand All @@ -120,24 +120,34 @@
<!--
- These are all interconnected - because they share the dependency on Lucene.
-->
<lucene.version>9.10.0</lucene.version>
<lucene.version>9.11.1</lucene.version>
<solr.version>9.6.1</solr.version>
<opensearch.version>2.14.0</opensearch.version>
<opensearch.version>2.15.0</opensearch.version>
<jena.version>5.1.0</jena.version>
<rdf4j.version>4.3.13</rdf4j.version>
<owlapi-version>5.5.0</owlapi-version>

<asciidoctor.plugin.version>2.2.3</asciidoctor.plugin.version>
<asciidoctor.version>2.5.12</asciidoctor.version>
<asciidoctor-diagram.version>2.3.0</asciidoctor-diagram.version>
<build-asciidoctorj-pdf-version>2.3.15</build-asciidoctorj-pdf-version>
<asciidoctor.version>2.5.13</asciidoctor.version>
<asciidoctor-diagram.version>2.3.1</asciidoctor-diagram.version>
<build-asciidoctorj-pdf-version>2.3.17</build-asciidoctorj-pdf-version>

<json.version>20230227</json.version>
<pf4j.version>2.6.0</pf4j.version>
<jackson.version>2.17.1</jackson.version>
<jackson.version>2.17.2</jackson.version>
<snakeyaml.version>2.2</snakeyaml.version>
<okhttp.version>4.12.0</okhttp.version>
<okio.version>3.9.0</okio.version>
<byte-buddy.version>1.14.18</byte-buddy.version>
<commons-lang3.version>3.15.0</commons-lang3.version>
<commons-dbcp2.version>2.12.0</commons-dbcp2.version>
<commons-codec.version>1.17.1</commons-codec.version>
<fastutil.version>8.5.14</fastutil.version>
<picocli.version>4.7.6</picocli.version>
<woodstox-core.version>6.7.0</woodstox-core.version>
<nimbus-jose-jwt.version>9.40</nimbus-jose-jwt.version>
<json-schema-validator.version>1.5.1</json-schema-validator.version>
<jgit.version>6.10.0.202406032230-r</jgit.version>

<node.version>20.12.2</node.version>
<apache-annotator.version>0.2.0</apache-annotator.version>
Expand Down

0 comments on commit 922054f

Please sign in to comment.