From 922054f06f982890a0b3304d474cc21f326e4663 Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Tue, 30 Jul 2024 14:33:39 -0300 Subject: [PATCH 1/2] #4909 - Upgrade dependencies - 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 --- .../src/main/resources/inception/rules.xml | 1 + inception/inception-dependencies/pom.xml | 28 +++++------ inception/inception-remote/pom.xml | 6 +-- .../config/RemoteApiAutoConfiguration.java | 8 +-- inception/pom.xml | 2 +- pom.xml | 50 +++++++++++-------- 6 files changed, 53 insertions(+), 42 deletions(-) diff --git a/inception/inception-build/src/main/resources/inception/rules.xml b/inception/inception-build/src/main/resources/inception/rules.xml index 76948f2cf09..99e19ee6a57 100644 --- a/inception/inception-build/src/main/resources/inception/rules.xml +++ b/inception/inception-build/src/main/resources/inception/rules.xml @@ -23,6 +23,7 @@ (?i).*[-_\.]b[0-9\.]* (?i).*[-_\.]M[0-9\.]* (?i).*[-_\.]rc[0-9\.-]* + (?i).*[-_\.]Dev[0-9\.-]* (?i).*[-_\.]alpha[0-9\.-]* (?i).*[-_\.]beta[0-9\.-]* diff --git a/inception/inception-dependencies/pom.xml b/inception/inception-dependencies/pom.xml index 888d0ad5d67..069e013d4b1 100644 --- a/inception/inception-dependencies/pom.xml +++ b/inception/inception-dependencies/pom.xml @@ -202,7 +202,7 @@ com.nimbusds nimbus-jose-jwt - 9.39.3 + ${nimbus-jose-jwt.version} org.awaitility @@ -507,7 +507,7 @@ org.apache.commons commons-dbcp2 - 2.11.0 + ${commons-dbcp2.version} org.dom4j @@ -632,7 +632,7 @@ com.fasterxml.woodstox woodstox-core - 6.6.2 + ${woodstox-core.version} org.codehaus.woodstox @@ -649,7 +649,7 @@ it.unimi.dsi fastutil - 8.5.13 + ${fastutil.version} @@ -696,12 +696,12 @@ net.bytebuddy byte-buddy - 1.14.17 + ${byte-buddy.version} net.bytebuddy byte-buddy-agent - 1.14.17 + ${byte-buddy.version} org.wicketstuff @@ -747,7 +747,7 @@ com.networknt json-schema-validator - 1.4.0 + ${json-schema-validator.version} @@ -789,12 +789,12 @@ org.springdoc - springdoc-openapi-ui + springdoc-openapi-starter-common ${springdoc.version} org.springdoc - springdoc-openapi-common + springdoc-openapi-starter-webmvc-ui ${springdoc.version} @@ -1040,7 +1040,7 @@ org.apache.commons commons-lang3 - 3.14.0 + ${commons-lang3.version} org.apache.commons @@ -1050,7 +1050,7 @@ commons-codec commons-codec - 1.17.0 + ${commons-codec.version} commons-validator @@ -1328,7 +1328,7 @@ org.eclipse.jgit org.eclipse.jgit - 6.9.0.202403050737-r + ${jgit.version} @@ -1417,12 +1417,12 @@ info.picocli picocli - 4.7.6 + ${picocli.version} info.picocli picocli-spring-boot-starter - 4.7.5 + ${picocli.version} diff --git a/inception/inception-remote/pom.xml b/inception/inception-remote/pom.xml index 649d8af29f8..911d6653850 100644 --- a/inception/inception-remote/pom.xml +++ b/inception/inception-remote/pom.xml @@ -186,11 +186,11 @@ org.springdoc - springdoc-openapi-ui + springdoc-openapi-starter-webmvc-ui org.springdoc - springdoc-openapi-common + springdoc-openapi-starter-common io.swagger.core.v3 @@ -361,7 +361,7 @@ - org.springdoc:springdoc-openapi-ui + org.springdoc:springdoc-openapi-starter-webmvc-ui diff --git a/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/config/RemoteApiAutoConfiguration.java b/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/config/RemoteApiAutoConfiguration.java index 0de6bacdb76..4d4dce64d47 100644 --- a/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/config/RemoteApiAutoConfiguration.java +++ b/inception/inception-remote/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/remoteapi/config/RemoteApiAutoConfiguration.java @@ -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; @@ -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.")); @@ -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")); @@ -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") diff --git a/inception/pom.xml b/inception/pom.xml index 53d6396a419..be37bd6e809 100644 --- a/inception/pom.xml +++ b/inception/pom.xml @@ -868,7 +868,7 @@ com.puppycrawl.tools checkstyle - 10.14.2 + 10.17.0 diff --git a/pom.xml b/pom.xml index 5fbd35030b6..8c4320e7727 100644 --- a/pom.xml +++ b/pom.xml @@ -70,12 +70,12 @@ 1.10.14 4.0.21 - 5.10.2 - 1.10.2 + 5.10.3 + 1.10.3 5.12.0 - 3.26.0 + 3.26.3 2.10.0 - 1.19.8 + 1.20.0 4.2.1 @@ -86,26 +86,26 @@ 2.0.30 - 6.1.8 - 3.3.0 - 3.2.4 - 6.3.0 - 1.8.0 + 6.1.11 + 3.3.2 + 3.3.2 + 6.3.1 + 2.6.0 2.2.22 - 0.12.5 + 0.12.6 2.0.13 2.23.1 - 3.5.3.Final + 3.6.0.Final 6.34.0 - 10.1.24 - 12.0.11 + 10.1.26 + 12.0.12 6.0.0 2.7.12 12.6.3.jre11 - 8.0.27 + 8.0.33 42.7.3 6.5.2.Final 8.0.1.Final @@ -120,24 +120,34 @@ - 9.10.0 + 9.11.1 9.6.1 - 2.14.0 + 2.15.0 5.1.0 4.3.13 5.5.0 2.2.3 - 2.5.12 - 2.3.0 - 2.3.15 + 2.5.13 + 2.3.1 + 2.3.17 20230227 2.6.0 - 2.17.1 + 2.17.2 2.2 4.12.0 3.9.0 + 1.14.18 + 3.15.0 + 2.12.0 + 1.17.1 + 8.5.14 + 4.7.6 + 6.7.0 + 9.40 + 1.5.1 + 6.10.0.202406032230-r 20.12.2 0.2.0 From d92967fd9409b4df3a8bab9f8dc3a27eca175138 Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Tue, 30 Jul 2024 17:29:45 -0300 Subject: [PATCH 2/2] #4909 - Upgrade dependencies - groovy 4.0.21 -> 4.0.22 - sentry 6.34.0 -> 7.12.1 - mariadb-driver 2.7.12 -> 3.4.1 - mysql-driver 8.0.33 -> 9.0.0 - lucene 9.11.1 -> 9.10.0 - font-awesome 5.15.4 -> 6.5.2 - jaxb 2.3.9 -> 4.0.5 - jna 5.13.0 -> 5.14.0 --- inception/inception-app-webapp/pom.xml | 10 +-- inception/inception-dependencies/pom.xml | 83 ++++++++++------------ inception/inception-project-export/pom.xml | 2 +- inception/inception-remote/pom.xml | 4 +- pom.xml | 36 ++++++++-- 5 files changed, 77 insertions(+), 58 deletions(-) diff --git a/inception/inception-app-webapp/pom.xml b/inception/inception-app-webapp/pom.xml index 53cdd3dd743..bf8695e602f 100644 --- a/inception/inception-app-webapp/pom.xml +++ b/inception/inception-app-webapp/pom.xml @@ -561,7 +561,7 @@ io.sentry - sentry-spring-boot-starter + sentry-spring-boot-starter-jakarta io.sentry @@ -725,8 +725,8 @@ test - mysql - mysql-connector-java + com.mysql + mysql-connector-j test @@ -1044,8 +1044,8 @@ org.hsqldb:hsqldb org.mariadb.jdbc:mariadb-java-client com.microsoft.sqlserver:mssql-jdbc - mysql:mysql-connector-java org.postgresql:postgresql + com.mysql:mysql-connector-j com.mattbertolini:liquibase-slf4j org.slf4j:log4j-over-slf4j @@ -1053,7 +1053,7 @@ org.apache.logging.log4j:log4j-core org.apache.logging.log4j:log4j-layout-template-json - io.sentry:sentry-spring-boot-starter + io.sentry:sentry-spring-boot-starter-jakarta io.sentry:sentry-log4j2 org.wicketstuff:wicketstuff-kendo-ui-theme-bootstrap diff --git a/inception/inception-dependencies/pom.xml b/inception/inception-dependencies/pom.xml index 069e013d4b1..18329a14ec3 100644 --- a/inception/inception-dependencies/pom.xml +++ b/inception/inception-dependencies/pom.xml @@ -61,7 +61,7 @@ org.glassfish.jaxb jaxb-bom - 2.3.9 + ${jaxb.version} pom import @@ -88,7 +88,7 @@ org.glassfish.jaxb jaxb-runtime - 2.3.9 + ${jaxb.version} javax.activation @@ -400,7 +400,7 @@ org.webjars font-awesome - 5.15.4 + ${font-awesome.version} org.webjars.npm @@ -464,7 +464,7 @@ com.hubspot.jinjava jinjava - 2.7.2 + ${jinjava.version} @@ -476,7 +476,7 @@ commons-beanutils commons-beanutils - 1.9.4 + ${commons-beanutils.version} commons-logging @@ -487,22 +487,22 @@ org.apache.commons commons-collections4 - 4.4 + ${commons-collections4.version} org.apache.commons commons-csv - 1.11.0 + ${commons-csv.version} commons-fileupload commons-fileupload - 1.5 + ${commons-fileupload.version} org.apache.commons commons-pool2 - 2.12.0 + ${commons-pool2.version} org.apache.commons @@ -528,7 +528,7 @@ org.pf4j pf4j-spring - 0.5.0 + ${pf4j-spring.version} org.slf4j @@ -540,12 +540,12 @@ commons-logging commons-logging-api - 1.1 + ${commons-logging-api.version} commons-logging commons-logging - 1.3.2 + ${commons-logging.version} @@ -643,7 +643,7 @@ com.github.openjson openjson - 1.0.13 + ${openjson.version} @@ -691,7 +691,7 @@ org.javassist javassist - 3.30.2-GA + ${javassist.version} net.bytebuddy @@ -761,7 +761,7 @@ com.nimbusds oauth2-oidc-sdk - 9.43.4 + ${oauth2-oidc-sdk.version} io.jsonwebtoken @@ -781,7 +781,7 @@ org.opensaml opensaml-bom - 4.3.2 + ${opensaml.version} pom import @@ -799,12 +799,12 @@ io.swagger.core.v3 - swagger-annotations + swagger-annotations-jakarta ${swagger.version} io.swagger.core.v3 - swagger-models + swagger-models-jakarta ${swagger.version} @@ -857,7 +857,7 @@ org.hsqldb hsqldb - 2.7.3 + ${hsqldb.version} @@ -897,7 +897,7 @@ org.jsoup jsoup - 1.16.1 + ${jsoup.version} @@ -905,12 +905,12 @@ org.apache.james apache-mime4j-core - 0.8.10 + ${mime4j.version} org.apache.james apache-mime4j-dom - 0.8.10 + ${mime4j.version} @@ -1013,29 +1013,16 @@ ${solr.version} test - - org.textexploration.mtas - mtas - ${mtas.version} - - - - - org.apache.solr - solr-core - - - commons-io commons-io - 2.16.1 + ${commons-io.version} org.apache.commons commons-text - 1.12.0 + ${commons-text.version} org.apache.commons @@ -1045,7 +1032,7 @@ org.apache.commons commons-compress - 1.26.2 + ${commons-compress.version} commons-codec @@ -1055,7 +1042,7 @@ commons-validator commons-validator - 1.9.0 + ${commons-validator.version} commons-logging @@ -1066,12 +1053,12 @@ com.github.ben-manes.caffeine caffeine - 3.1.8 + ${caffeine.version} org.xerial.snappy snappy-java - 1.1.10.5 + ${snappy.version} @@ -1242,7 +1229,7 @@ com.github.jsonld-java jsonld-java - 0.13.6 + ${jsonld-java.version} org.apache.httpcomponents @@ -1322,7 +1309,7 @@ net.java.dev.jna jna - 5.13.0 + ${jna.version} @@ -1360,6 +1347,12 @@ org.mariadb.jdbc mariadb-java-client ${mariadb.driver.version} + + + org.slf4j + jcl-over-slf4j + + org.postgresql @@ -1372,8 +1365,8 @@ ${mssql.driver.version} - mysql - mysql-connector-java + com.mysql + mysql-connector-j ${mysql.driver.version} diff --git a/inception/inception-project-export/pom.xml b/inception/inception-project-export/pom.xml index 9e5132305f0..b946adccd3c 100644 --- a/inception/inception-project-export/pom.xml +++ b/inception/inception-project-export/pom.xml @@ -169,7 +169,7 @@ io.swagger.core.v3 - swagger-annotations + swagger-annotations-jakarta diff --git a/inception/inception-remote/pom.xml b/inception/inception-remote/pom.xml index 911d6653850..1d95c891ea0 100644 --- a/inception/inception-remote/pom.xml +++ b/inception/inception-remote/pom.xml @@ -194,11 +194,11 @@ io.swagger.core.v3 - swagger-annotations + swagger-models-jakarta io.swagger.core.v3 - swagger-models + swagger-annotations-jakarta com.fasterxml.jackson.core diff --git a/pom.xml b/pom.xml index 8c4320e7727..122a4806954 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 1.10.14 - 4.0.21 + 4.0.22 5.10.3 1.10.3 @@ -97,15 +97,15 @@ 2.0.13 2.23.1 3.6.0.Final - 6.34.0 + 7.12.1 10.1.26 12.0.12 6.0.0 - 2.7.12 + 3.4.1 12.6.3.jre11 - 8.0.33 + 9.0.0 42.7.3 6.5.2.Final 8.0.1.Final @@ -120,7 +120,7 @@ - 9.11.1 + 9.10.0 9.6.1 2.15.0 5.1.0 @@ -134,20 +134,45 @@ 20230227 2.6.0 + 0.5.0 2.17.2 2.2 4.12.0 3.9.0 1.14.18 + 3.1.8 + 1.9.4 + 4.4 + 1.11.0 + 1.5 + 2.12.0 3.15.0 2.12.0 1.17.1 + 1.26.2 + 1.12.0 + 1.9.0 + 2.16.1 + 1.3.3 + 1.1 + 2.7.2 8.5.14 4.7.6 6.7.0 9.40 1.5.1 6.10.0.202406032230-r + 4.0.5 + 1.1.10.5 + 0.13.6 + 5.14.0 + 1.16.1 + 0.8.10 + 2.7.3 + 4.3.2 + 9.43.4 + 3.30.2-GA + 1.0.13 20.12.2 0.2.0 @@ -166,6 +191,7 @@ ^2.37.0 ^3.3.0 ^3.1.1 + 6.5.2 ^11.2.0 ^20.0.0 ^3.0.2