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