diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml b/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml index c4cd000516..3c5fa5ec6c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml @@ -65,7 +65,7 @@ com.sun.mail - javax.mail + jakarta.mail true @@ -97,6 +97,12 @@ io.micrometer micrometer-jersey2 true + + + javax.annotation + javax.annotation-api + + io.micrometer @@ -194,18 +200,28 @@ true - javax.cache - cache-api + jakarta.jms + jakarta.jms-api + true + + + jakarta.servlet + jakarta.servlet-api + true + + + jakarta.persistence + jakarta.persistence-api true - javax.jms - javax.jms-api + jakarta.ws.rs + jakarta.ws.rs-api true - javax.servlet - javax.servlet-api + javax.cache + cache-api true @@ -258,6 +274,12 @@ org.eclipse.jetty jetty-server true + + + javax.servlet + javax.servlet-api + + org.elasticsearch @@ -278,21 +300,61 @@ org.glassfish.jersey.core jersey-server true + + + javax.annotation + javax.annotation-api + + + javax.ws.rs + javax.ws.rs-api + + + javax.validation + validation-api + + org.glassfish.jersey.containers jersey-container-servlet-core true + + + javax.ws.rs + javax.ws.rs-api + + org.hibernate hibernate-core true + + + javax.activation + javax.activation-api + + + javax.xml.bind + jaxb-api + + + javax.persistence + javax.persistence-api + + org.hibernate.validator hibernate-validator true + + + javax.validation + validation-api + + org.influxdb @@ -477,8 +539,13 @@ - javax.xml.bind - jaxb-api + jakarta.validation + jakarta.validation-api + test + + + jakarta.xml.bind + jakarta.xml.bind-api test @@ -505,11 +572,31 @@ org.glassfish.jersey.ext jersey-spring4 test + + + javax.annotation + javax.annotation-api + + + javax.ws.rs + javax.ws.rs-api + + + javax.validation + validation-api + + org.glassfish.jersey.media jersey-media-json-jackson test + + + javax.ws.rs + javax.ws.rs-api + + org.skyscreamer @@ -540,6 +627,12 @@ org.springframework.restdocs spring-restdocs-mockmvc test + + + javax.servlet + javax.servlet-api + + org.springframework.restdocs diff --git a/spring-boot-project/spring-boot-actuator/pom.xml b/spring-boot-project/spring-boot-actuator/pom.xml index 2e7a6ac1af..24abe53f87 100644 --- a/spring-boot-project/spring-boot-actuator/pom.xml +++ b/spring-boot-project/spring-boot-actuator/pom.xml @@ -39,7 +39,7 @@ com.sun.mail - javax.mail + jakarta.mail true @@ -99,8 +99,13 @@ true - javax.jms - javax.jms-api + jakarta.jms + jakarta.jms-api + true + + + jakarta.ws.rs + jakarta.ws.rs-api true @@ -122,6 +127,12 @@ org.eclipse.jetty jetty-server true + + + javax.servlet + javax.servlet-api + + org.elasticsearch @@ -137,16 +148,42 @@ org.glassfish.jersey.core jersey-server true + + + javax.annotation + javax.annotation-api + + + javax.ws.rs + javax.ws.rs-api + + + javax.validation + validation-api + + org.glassfish.jersey.containers jersey-container-servlet-core true + + + javax.ws.rs + javax.ws.rs-api + + org.hibernate.validator hibernate-validator true + + + javax.validation + validation-api + + org.infinispan @@ -299,8 +336,13 @@ test - javax.xml.bind - jaxb-api + jakarta.validation + jakarta.validation-api + test + + + jakarta.xml.bind + jakarta.xml.bind-api test @@ -312,6 +354,12 @@ org.glassfish.jersey.media jersey-media-json-jackson test + + + javax.ws.rs + javax.ws.rs-api + + com.jayway.jsonpath @@ -337,6 +385,20 @@ org.glassfish.jersey.ext jersey-spring4 test + + + javax.annotation + javax.annotation-api + + + javax.ws.rs + javax.ws.rs-api + + + javax.validation + validation-api + + org.skyscreamer diff --git a/spring-boot-project/spring-boot-autoconfigure/pom.xml b/spring-boot-project/spring-boot-autoconfigure/pom.xml index b81e317cc7..9c4e39d386 100755 --- a/spring-boot-project/spring-boot-autoconfigure/pom.xml +++ b/spring-boot-project/spring-boot-autoconfigure/pom.xml @@ -94,7 +94,7 @@ com.sun.mail - javax.mail + jakarta.mail true @@ -113,13 +113,13 @@ true - javax.cache - cache-api + jakarta.json.bind + jakarta.json.bind-api true - javax.json.bind - javax.json.bind-api + javax.cache + cache-api true @@ -136,6 +136,12 @@ org.apache.kafka kafka-streams true + + + javax.ws.rs + javax.ws.rs-api + + org.flywaydb @@ -146,16 +152,42 @@ org.glassfish.jersey.core jersey-server true + + + javax.annotation + javax.annotation-api + + + javax.ws.rs + javax.ws.rs-api + + + javax.validation + validation-api + + org.glassfish.jersey.containers jersey-container-servlet-core true + + + javax.ws.rs + javax.ws.rs-api + + org.glassfish.jersey.containers jersey-container-servlet true + + + javax.ws.rs + javax.ws.rs-api + + org.glassfish.jersey.ext @@ -170,12 +202,26 @@ org.hibernate hibernate-validator + + javax.annotation + javax.annotation-api + + + javax.ws.rs + javax.ws.rs-api + org.glassfish.jersey.media jersey-media-json-jackson true + + + javax.ws.rs + javax.ws.rs-api + + org.apache.activemq @@ -254,6 +300,12 @@ org.codehaus.btm btm true + + + javax.transaction + jta + + org.codehaus.groovy @@ -279,6 +331,12 @@ org.eclipse.jetty jetty-webapp true + + + javax.servlet + javax.servlet-api + + org.eclipse.jetty @@ -289,6 +347,24 @@ org.eclipse.jetty.websocket javax-websocket-server-impl true + + + javax.annotation + javax.annotation-api + + + javax.servlet + javax.servlet-api + + + javax.websocket + javax.websocket-api + + + javax.websocket + javax.websocket-client-api + + io.undertow @@ -300,6 +376,21 @@ undertow-websockets-jsr true + + jakarta.persistence + jakarta.persistence-api + true + + + jakarta.validation + jakarta.validation-api + true + + + jakarta.ws.rs + jakarta.ws.rs-api + true + org.ehcache ehcache @@ -324,6 +415,20 @@ org.hibernate hibernate-core true + + + javax.activation + javax.activation-api + + + javax.persistence + javax.persistence-api + + + javax.xml.bind + jaxb-api + + org.hibernate @@ -334,6 +439,12 @@ org.hibernate.validator hibernate-validator true + + + javax.validation + validation-api + + org.infinispan @@ -557,11 +668,23 @@ org.springframework.security spring-security-data true + + + javax.xml.bind + jaxb-api + + org.springframework.security spring-security-oauth2-client true + + + com.sun.mail + javax.mail + + org.springframework.security @@ -597,6 +720,12 @@ org.springframework.session spring-session-hazelcast true + + + javax.annotation + javax.annotation-api + + org.springframework.session @@ -659,13 +788,13 @@ true - javax.jms - javax.jms-api + jakarta.jms + jakarta.jms-api true - javax.mail - javax.mail-api + jakarta.mail + jakarta.mail-api true @@ -687,6 +816,12 @@ org.jooq jooq true + + + javax.xml.bind + jaxb-api + + org.quartz-scheduler @@ -746,13 +881,13 @@ test - javax.json - javax.json-api + jakarta.json + jakarta.json-api test - javax.xml.ws - jaxws-api + jakarta.xml.ws + jakarta.xml.ws-api test @@ -819,6 +954,16 @@ org.testcontainers testcontainers test + + + javax.annotation + javax.annotation-api + + + javax.xml.bind + jaxb-api + + org.yaml diff --git a/spring-boot-project/spring-boot-cli/pom.xml b/spring-boot-project/spring-boot-cli/pom.xml index 37b67de351..d7b5774263 100644 --- a/spring-boot-project/spring-boot-cli/pom.xml +++ b/spring-boot-project/spring-boot-cli/pom.xml @@ -52,6 +52,10 @@ org.sonatype.sisu sisu-inject-bean + + javax.enterprise + cdi-api + @@ -130,8 +134,8 @@ provided - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index b254750eb4..2d9db34f6b 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -61,8 +61,8 @@ 5.2.4 2.3.28 6.5.4 - 3.0.0 - 2.3.1 + 3.0.2 + 2.3.2 2.5.6 2.8.5 1.4.197 @@ -80,6 +80,22 @@ 9.4.6.Final 2.14 2.9.8 + 1.2.1 + 1.3.4 + 2.0.2 + 1.1.5 + 1.0.1 + 1.6.3 + 2.2.2 + 4.0.2 + 2.3.5 + 1.2.4 + 1.3.2 + 2.0.1 + 1.1.1 + 2.1.5 + 2.3.2 + 2.3.2 3.0.12 1.2.0 1.3.2 @@ -179,8 +195,8 @@ 3.0.6.RELEASE 3.25.2 3.1.0 - ${javax-mail.version} - 1.5.0 + ${jakarta-mail.version} + 1.5.1 3.0.11.RELEASE 3.0.4.RELEASE 2.3.0 @@ -749,7 +765,7 @@ com.sun.mail - javax.mail + jakarta.mail ${sun-mail.version} @@ -1066,6 +1082,81 @@ undertow-websockets-jsr ${undertow.version} + + jakarta.activation + jakarta.activation-api + ${jakarta-activation.version} + + + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation.version} + + + jakarta.jms + jakarta.jms-api + ${jakarta-jms.version} + + + jakarta.json + jakarta.json-api + ${jakarta-json.version} + + + jakarta.json.bind + jakarta.json.bind-api + ${jakarta-json-bind.version} + + + jakarta.mail + jakarta.mail-api + ${jakarta-mail.version} + + + jakarta.persistence + jakarta.persistence-api + ${jakarta-persistence.version} + + + jakarta.servlet + jakarta.servlet-api + ${jakarta-servlet.version} + + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + ${jakarta-servlet-jsp-jstl.version} + + + jakarta.transaction + jakarta.transaction-api + ${jakarta-transaction.version} + + + jakarta.validation + jakarta.validation-api + ${jakarta-validation.version} + + + jakarta.websocket + jakarta.websocket-api + ${jakarta-websocket.version} + + + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta-ws-rs.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta-xml-bind.version} + + + jakarta.xml.ws + jakarta.xml.ws-api + ${jakarta-xml-ws.version} + javax.activation javax.activation-api @@ -2007,7 +2098,7 @@ org.glassfish - javax.el + jakarta.el ${glassfish-el.version} diff --git a/spring-boot-project/spring-boot-devtools/pom.xml b/spring-boot-project/spring-boot-devtools/pom.xml index ead29219ec..5ffb06c553 100644 --- a/spring-boot-project/spring-boot-devtools/pom.xml +++ b/spring-boot-project/spring-boot-devtools/pom.xml @@ -25,8 +25,13 @@ - javax.servlet - javax.servlet-api + jakarta.persistence + jakarta.persistence-api + true + + + jakarta.servlet + jakarta.servlet-api true @@ -43,6 +48,20 @@ org.hibernate hibernate-core true + + + javax.activation + javax.activation-api + + + javax.xml.bind + jaxb-api + + + javax.persistence + javax.persistence-api + + org.springframework diff --git a/spring-boot-project/spring-boot-docs/pom.xml b/spring-boot-project/spring-boot-docs/pom.xml index c9a22a76a4..5457efd8cd 100644 --- a/spring-boot-project/spring-boot-docs/pom.xml +++ b/spring-boot-project/spring-boot-docs/pom.xml @@ -68,9 +68,27 @@ org.springframework.boot spring-boot-test-autoconfigure + + jakarta.persistence + jakarta.persistence-api + + + jakarta.ws.rs + jakarta.ws.rs-api + io.rest-assured rest-assured + + + javax.xml.bind + jaxb-api + + + javax.activation + activation + + org.springframework.restdocs @@ -211,6 +229,12 @@ io.micrometer micrometer-jersey2 true + + + javax.annotation + javax.annotation-api + + io.micrometer @@ -335,28 +359,33 @@ - javax.cache - cache-api + jakarta.jms + jakarta.jms-api + true + + + jakarta.json.bind + jakarta.json.bind-api true - javax.jms - javax.jms-api + jakarta.mail + jakarta.mail-api true - javax.json.bind - javax.json.bind-api + jakarta.servlet + jakarta.servlet-api true - javax.mail - javax.mail-api + jakarta.validation + jakarta.validation-api true - javax.servlet - javax.servlet-api + javax.cache + cache-api true @@ -447,6 +476,12 @@ org.apache.kafka kafka-streams true + + + javax.ws.rs + javax.ws.rs-api + + org.apache.logging.log4j @@ -497,6 +532,12 @@ org.codehaus.btm btm true + + + javax.transaction + jta + + org.codehaus.groovy @@ -532,6 +573,24 @@ org.eclipse.jetty.websocket javax-websocket-server-impl true + + + javax.annotation + javax.annotation-api + + + javax.servlet + javax.servlet-api + + + javax.websocket + javax.websocket-api + + + javax.websocket + javax.websocket-client-api + + org.eclipse.jetty @@ -547,6 +606,12 @@ org.eclipse.jetty.http2 http2-server true + + + javax.servlet + javax.servlet-api + + org.elasticsearch.client @@ -567,16 +632,50 @@ org.glassfish.jersey.containers jersey-container-servlet-core true + + + javax.annotation + javax.annotation-api + + + javax.ws.rs + javax.ws.rs-api + + + javax.validation + validation-api + + org.glassfish.jersey.ext jersey-spring4 true + + + javax.annotation + javax.annotation-api + + + javax.ws.rs + javax.ws.rs-api + + + javax.validation + validation-api + + org.glassfish.jersey.media jersey-media-json-jackson true + + + javax.ws.rs + javax.ws.rs-api + + org.hamcrest @@ -597,11 +696,35 @@ org.jooq jooq true + + + javax.activation + javax.activation-api + + + javax.xml.bind + jaxb-api + + org.hibernate hibernate-core true + + + javax.activation + javax.activation-api + + + javax.persistence + javax.persistence-api + + + javax.xml.bind + jaxb-api + + org.hibernate @@ -612,6 +735,12 @@ org.hibernate.validator hibernate-validator true + + + javax.validation + validation-api + + org.infinispan @@ -782,6 +911,16 @@ org.springframework.security spring-security-oauth2-client true + + + javax.activation + activation + + + com.sun.mail + javax.mail + + org.springframework.security @@ -807,6 +946,12 @@ org.springframework.session spring-session-hazelcast true + + + javax.annotation + javax.annotation-api + + org.springframework.session @@ -892,6 +1037,12 @@ org.springframework.restdocs spring-restdocs-mockmvc true + + + javax.servlet + javax.servlet-api + + org.springframework.restdocs @@ -902,6 +1053,12 @@ org.springframework.security spring-security-data true + + + javax.xml.bind + jaxb-api + + org.springframework.security diff --git a/spring-boot-project/spring-boot-parent/pom.xml b/spring-boot-project/spring-boot-parent/pom.xml index 097887b6b6..702a7ecde2 100644 --- a/spring-boot-project/spring-boot-parent/pom.xml +++ b/spring-boot-project/spring-boot-parent/pom.xml @@ -575,6 +575,18 @@ + + + javax.*:*:* + + + javax.batch:*:* + javax.cache:*:* + javax.inject:*:* + javax.money:*:* + + true + [1.8,) diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/pom.xml index 251633f105..3338ca834a 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/pom.xml @@ -33,8 +33,8 @@ - javax.jms - javax.jms-api + jakarta.jms + jakarta.jms-api diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-artemis/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-artemis/pom.xml index 8e834afe94..c1e8c1bc43 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-artemis/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-artemis/pom.xml @@ -33,12 +33,12 @@ - javax.jms - javax.jms-api + jakarta.jms + jakarta.jms-api - javax.json - javax.json-api + jakarta.json + jakarta.json-api diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml index b266604281..cf05cc9f3d 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml @@ -23,12 +23,16 @@ spring-boot-starter-jdbc - javax.transaction - javax.transaction-api + jakarta.activation + jakarta.activation-api - javax.xml.bind - jaxb-api + jakarta.persistence + jakarta.persistence-api + + + jakarta.transaction + jakarta.transaction-api org.hibernate @@ -38,6 +42,18 @@ org.jboss.spec.javax.transaction jboss-transaction-api_1.2_spec + + javax.activation + javax.activation-api + + + javax.persistence + javax.persistence-api + + + javax.xml.bind + jaxb-api + diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/pom.xml index f3adf2ac4a..78cf6ff734 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/pom.xml @@ -27,6 +27,14 @@ org.springframework.boot spring-boot-starter-validation + + jakarta.annotation + jakarta.annotation-api + + + jakarta.ws.rs + jakarta.ws.rs-api + org.springframework spring-web @@ -35,6 +43,18 @@ org.glassfish.jersey.core jersey-server + + javax.annotation + javax.annotation-api + + + javax.validation + validation-api + + + javax.ws.rs + javax.ws.rs-api + org.glassfish.hk2.external javax.inject @@ -49,11 +69,21 @@ org.glassfish.hk2.external javax.inject + + javax.ws.rs + javax.ws.rs-api + org.glassfish.jersey.containers jersey-container-servlet + + + javax.ws.rs + javax.ws.rs-api + + org.glassfish.jersey.ext @@ -63,6 +93,14 @@ javax.el javax.el-api + + javax.ws.rs + javax.ws.rs-api + + + javax.validation + validation-api + org.glassfish.web javax.el @@ -81,6 +119,14 @@ org.glassfish.jersey.ext jersey-spring4 + + javax.annotation + javax.annotation-api + + + javax.ws.rs + javax.ws.rs-api + org.jvnet tiger-types @@ -102,6 +148,12 @@ org.glassfish.jersey.media jersey-media-json-jackson + + + javax.ws.rs + javax.ws.rs-api + + diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/pom.xml index 86e7283596..2f861485dd 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/pom.xml @@ -16,6 +16,14 @@ 3.1.0 + + jakarta.servlet + jakarta.servlet-api + + + jakarta.websocket + jakarta.websocket-api + org.eclipse.jetty jetty-servlets @@ -23,23 +31,43 @@ org.eclipse.jetty jetty-webapp + + + javax.servlet + javax.servlet-api + + org.eclipse.jetty.websocket websocket-server + + + javax.servlet + javax.servlet-api + + org.eclipse.jetty.websocket javax-websocket-server-impl - org.eclipse.jetty - jetty-jndi + javax.annotation + javax.annotation-api javax.websocket javax.websocket-client-api + + javax.websocket + javax.websocket-api + + + org.eclipse.jetty + jetty-jndi + diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jooq/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-jooq/pom.xml index c8b7324bcc..11b0a61e5f 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jooq/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jooq/pom.xml @@ -19,6 +19,14 @@ org.springframework.boot spring-boot-starter-jdbc + + jakarta.activation + jakarta.activation-api + + + jakarta.xml.bind + jakarta.xml.bind-api + org.springframework spring-tx @@ -26,6 +34,16 @@ org.jooq jooq + + + javax.activation + javax.activation-api + + + javax.xml.bind + jaxb-api + + diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-atomikos/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-atomikos/pom.xml index 783612a809..35daf28c07 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-atomikos/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-atomikos/pom.xml @@ -37,8 +37,8 @@ transactions-jdbc - javax.transaction - javax.transaction-api + jakarta.transaction + jakarta.transaction-api diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-bitronix/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-bitronix/pom.xml index 4aad29f9b5..3937de15bb 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-bitronix/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-bitronix/pom.xml @@ -19,12 +19,12 @@ spring-boot-starter - javax.jms - javax.jms-api + jakarta.jms + jakarta.jms-api - javax.transaction - javax.transaction-api + jakarta.transaction + jakarta.transaction-api org.codehaus.btm diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-mail/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-mail/pom.xml index 8a2428020e..4361f7be9e 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-mail/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-mail/pom.xml @@ -25,7 +25,7 @@ com.sun.mail - javax.mail + jakarta.mail diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-client/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-client/pom.xml index 9a411c50b1..fcb2ffb188 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-client/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-client/pom.xml @@ -18,6 +18,10 @@ org.springframework.boot spring-boot-starter + + com.sun.mail + jakarta.mail + org.springframework.security spring-security-config @@ -29,6 +33,12 @@ org.springframework.security spring-security-oauth2-client + + + com.sun.mail + javax.mail + + org.springframework.security diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-test/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-test/pom.xml index c81ff67db0..e6e4b84bcf 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-test/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-test/pom.xml @@ -31,6 +31,14 @@ com.jayway.jsonpath json-path + + jakarta.xml.bind + jakarta.xml.bind-api + + + junit + junit + org.assertj assertj-core @@ -43,10 +51,6 @@ org.hamcrest hamcrest-library - - junit - junit - org.mockito mockito-core @@ -66,6 +70,12 @@ org.xmlunit xmlunit-core + + + javax.xml.bind + jaxb-api + + diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/pom.xml index e6d8090b2e..a9f313e0ad 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/pom.xml @@ -16,8 +16,8 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api org.apache.tomcat.embed diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-undertow/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-undertow/pom.xml index 7c1162b5cf..d61efc2ef3 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-undertow/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-undertow/pom.xml @@ -34,12 +34,12 @@ undertow-websockets-jsr - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api org.glassfish - javax.el + jakarta.el diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-validation/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-validation/pom.xml index a4247b59dc..7bfc9f8f13 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-validation/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-validation/pom.xml @@ -19,6 +19,10 @@ org.springframework.boot spring-boot-starter + + jakarta.validation + jakarta.validation-api + org.apache.tomcat.embed tomcat-embed-el @@ -26,6 +30,12 @@ org.hibernate.validator hibernate-validator + + + javax.validation + validation-api + + diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-web-services/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-web-services/pom.xml index d223ef8515..ee9ea67f17 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-web-services/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-web-services/pom.xml @@ -29,8 +29,8 @@ - javax.xml.ws - jaxws-api + jakarta.xml.ws + jakarta.xml.ws-api org.springframework diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-web/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-web/pom.xml index 86318fe01d..fe7a2eb7c4 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-web/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-web/pom.xml @@ -27,9 +27,19 @@ org.springframework.boot spring-boot-starter-tomcat + + jakarta.validation + jakarta.validation-api + org.hibernate.validator hibernate-validator + + + javax.validation + validation-api + + org.springframework diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-webflux/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-webflux/pom.xml index 947b4dac0f..1f382be10c 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-webflux/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-webflux/pom.xml @@ -27,9 +27,19 @@ org.springframework.boot spring-boot-starter-reactor-netty + + jakarta.validation + jakarta.validation-api + org.hibernate.validator hibernate-validator + + + javax.validation + validation-api + + org.springframework diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter/pom.xml index 732fb70678..e749c56b4a 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter/pom.xml @@ -27,8 +27,8 @@ spring-boot-starter-logging - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api org.springframework diff --git a/spring-boot-project/spring-boot-test-autoconfigure/pom.xml b/spring-boot-project/spring-boot-test-autoconfigure/pom.xml index 435141c790..c2c4af0319 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/pom.xml +++ b/spring-boot-project/spring-boot-test-autoconfigure/pom.xml @@ -26,38 +26,53 @@ - javax.json.bind - javax.json.bind-api + com.fasterxml.jackson.core + jackson-databind true - javax.servlet - javax.servlet-api + com.google.code.gson + gson true - javax.transaction - javax.transaction-api + com.jayway.jsonpath + json-path true - com.fasterxml.jackson.core - jackson-databind + io.rest-assured + rest-assured + true + + + javax.xml.bind + jaxb-api + + + javax.activation + activation + + + + + jakarta.json.bind + jakarta.json.bind-api true - com.google.code.gson - gson + jakarta.persistence + jakarta.persistence-api true - com.jayway.jsonpath - json-path + jakarta.servlet + jakarta.servlet-api true - io.rest-assured - rest-assured + jakarta.transaction + jakarta.transaction-api true @@ -73,6 +88,18 @@ org.jboss.spec.javax.transaction jboss-transaction-api_1.2_spec + + javax.activation + javax.activation-api + + + javax.persistence + javax.persistence-api + + + javax.xml.bind + jaxb-api + true @@ -156,6 +183,12 @@ org.springframework.restdocs spring-restdocs-mockmvc true + + + javax.servlet + javax.servlet-api + + org.springframework.restdocs @@ -220,8 +253,13 @@ test - javax.json - javax.json-api + jakarta.json + jakarta.json-api + test + + + jakarta.validation + jakarta.validation-api test @@ -258,6 +296,12 @@ org.hibernate.validator hibernate-validator test + + + javax.validation + validation-api + + org.hsqldb @@ -268,6 +312,12 @@ org.jooq jooq test + + + javax.xml.bind + jaxb-api + + org.mongodb @@ -303,6 +353,16 @@ org.testcontainers testcontainers test + + + javax.annotation + javax.annotation-api + + + javax.xml.bind + jaxb-api + + diff --git a/spring-boot-project/spring-boot-test/pom.xml b/spring-boot-project/spring-boot-test/pom.xml index 1dfad81e61..8f34798aec 100644 --- a/spring-boot-project/spring-boot-test/pom.xml +++ b/spring-boot-project/spring-boot-test/pom.xml @@ -41,13 +41,13 @@ true - javax.json.bind - javax.json.bind-api + jakarta.json.bind + jakarta.json.bind-api true - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api true @@ -131,11 +131,6 @@ true - - javax.json - javax.json-api - test - org.springframework.boot spring-boot-test-support @@ -151,6 +146,11 @@ mockk test + + jakarta.json + jakarta.json-api + test + org.apache.tomcat.embed tomcat-embed-core diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/pom.xml index 81791707f9..330f723bde 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/pom.xml @@ -21,8 +21,8 @@ test - javax.validation - validation-api + jakarta.validation + jakarta.validation-api test diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml index e67fd8328a..fd48bfec46 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml @@ -77,15 +77,6 @@ - - - - javax.annotation - javax.annotation-api - @javax-annotation.version@ - - - org.eclipse.jetty diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml index c4f6460cf2..acb85955c6 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml @@ -91,15 +91,6 @@ - - - - javax.annotation - javax.annotation-api - @javax-annotation.version@ - - - org.eclipse.jetty diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml index 7cd3bf8621..2c5c0c55ce 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml @@ -65,15 +65,6 @@ - - - - javax.annotation - javax.annotation-api - @javax-annotation.version@ - - - org.eclipse.jetty diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml index 5649df482c..4a7040a541 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml @@ -32,6 +32,12 @@ org.apache.maven maven-core + + + javax.enterprise + cdi-api + + org.apache.maven @@ -48,6 +54,12 @@ org.apache.maven.shared maven-common-artifact-filters + + + javax.enterprise + cdi-api + + org.codehaus.plexus diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/build-info-additional-properties/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/build-info-additional-properties/pom.xml index 93170da8fd..74d856557a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/build-info-additional-properties/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/build-info-additional-properties/pom.xml @@ -41,9 +41,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/build-info-custom-file/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/build-info-custom-file/pom.xml index 4fd2a2a472..fe232daf39 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/build-info-custom-file/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/build-info-custom-file/pom.xml @@ -37,9 +37,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/build-info/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/build-info/pom.xml index 39c7489687..0c256461e0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/build-info/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/build-info/pom.xml @@ -34,9 +34,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-attach-disabled/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-attach-disabled/pom.xml index cc0273bff4..a5ab7ebf6f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-attach-disabled/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-attach-disabled/pom.xml @@ -51,9 +51,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-classifier-main-attach-disabled/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-classifier-main-attach-disabled/pom.xml index 2156ea2070..f1b2403be5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-classifier-main-attach-disabled/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-classifier-main-attach-disabled/pom.xml @@ -49,9 +49,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-classifier-main/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-classifier-main/pom.xml index 6dd361c02b..191c408a44 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-classifier-main/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-classifier-main/pom.xml @@ -48,9 +48,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-classifier-source-attach-disabled/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-classifier-source-attach-disabled/pom.xml index f52abcf1e1..c86de91179 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-classifier-source-attach-disabled/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-classifier-source-attach-disabled/pom.xml @@ -58,9 +58,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-classifier-source/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-classifier-source/pom.xml index ad8143b793..835a7f3fd4 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-classifier-source/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-classifier-source/pom.xml @@ -57,9 +57,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-create-dir/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-create-dir/pom.xml index 2b4780ef99..448882bc01 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-create-dir/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-create-dir/pom.xml @@ -52,9 +52,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-custom-dir/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-custom-dir/pom.xml index 29034371a0..d7ee767e3c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-custom-dir/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-custom-dir/pom.xml @@ -51,9 +51,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-custom-launcher/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-custom-launcher/pom.xml index ab01954599..3b160db44a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-custom-launcher/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-custom-launcher/pom.xml @@ -54,9 +54,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-artifact/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-artifact/pom.xml index 68115363a4..33fdb27e93 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-artifact/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-artifact/pom.xml @@ -48,9 +48,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-entry/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-entry/pom.xml index a9a71ad997..280b12dfb2 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-entry/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-entry/pom.xml @@ -53,9 +53,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-group/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-group/pom.xml index 9e842b798f..b1f22702d2 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-group/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-group/pom.xml @@ -48,9 +48,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-executable/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-executable/pom.xml index c2c2625381..2911578302 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-executable/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-executable/pom.xml @@ -53,9 +53,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-lib-name-conflict/test-project/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-lib-name-conflict/test-project/pom.xml index 8403443543..83f2740a3a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-lib-name-conflict/test-project/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-lib-name-conflict/test-project/pom.xml @@ -51,9 +51,9 @@ 0.0.1.BUILD-SNAPSHOT - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-non-executable/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-non-executable/pom.xml index 2403c2c450..f7e760f1a9 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-non-executable/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-non-executable/pom.xml @@ -51,9 +51,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-pom/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-pom/pom.xml index a8242ceb28..00c4ea45ed 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-pom/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-pom/pom.xml @@ -32,9 +32,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-system-scope-default/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-system-scope-default/pom.xml index 26d4ce5f1c..b44ffa8ebe 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-system-scope-default/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-system-scope-default/pom.xml @@ -45,9 +45,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-system-scope/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-system-scope/pom.xml index fce31c80e8..eeb1b7c10c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-system-scope/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-system-scope/pom.xml @@ -48,9 +48,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-test-scope/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-test-scope/pom.xml index 77d6a2d5c0..243a21b4bf 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-test-scope/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-test-scope/pom.xml @@ -48,9 +48,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-kotlin-module/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-kotlin-module/pom.xml index 1ce66c36bf..c59065f103 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-kotlin-module/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-kotlin-module/pom.xml @@ -76,9 +76,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-unpack/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-unpack/pom.xml index 53d77b60dd..a2ed819157 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-unpack/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-unpack/pom.xml @@ -53,9 +53,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar/pom.xml index 9d9f4f4f0a..cdfcc6b6cb 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar/pom.xml @@ -48,9 +48,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/prop/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/prop/pom.xml index 0bf4849502..0f44e400bc 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/prop/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/prop/pom.xml @@ -48,9 +48,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/run-exclude/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/run-exclude/pom.xml index 434e62875f..0eb1624258 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/run-exclude/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/run-exclude/pom.xml @@ -29,7 +29,7 @@ log4j-api - javax.servlet + jakarta.servlet,javax.servlet @@ -43,9 +43,9 @@ @log4j2.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/war-reactor/war/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/war-reactor/war/pom.xml index 845d73c68b..8155ef86e3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/war-reactor/war/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/war-reactor/war/pom.xml @@ -50,9 +50,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/war-with-unpack/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/war-with-unpack/pom.xml index 9eb8ec6099..9786f3b948 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/war-with-unpack/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/war-with-unpack/pom.xml @@ -54,9 +54,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml index 14d4fc6408..17c68e7e98 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml @@ -46,9 +46,9 @@ @spring.version@ - javax.servlet - javax.servlet-api - @servlet-api.version@ + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ provided diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java index 2d7d7a3837..108805fb67 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java @@ -230,7 +230,7 @@ public final class Verify { super.verifyZipEntries(verifier); verifier.assertHasEntryNameStartingWith("BOOT-INF/lib/spring-context"); verifier.assertHasEntryNameStartingWith("BOOT-INF/lib/spring-core"); - verifier.assertHasEntryNameStartingWith("BOOT-INF/lib/javax.servlet-api-4"); + verifier.assertHasEntryNameStartingWith("BOOT-INF/lib/jakarta.servlet-api-4"); assertThat(verifier .hasEntry("org/springframework/boot/loader/JarLauncher.class")) .as("Unpacked launcher classes").isTrue(); @@ -263,7 +263,7 @@ public final class Verify { verifier.assertHasEntryNameStartingWith("WEB-INF/lib/spring-context"); verifier.assertHasEntryNameStartingWith("WEB-INF/lib/spring-core"); verifier.assertHasEntryNameStartingWith( - "WEB-INF/lib-provided/javax.servlet-api-4"); + "WEB-INF/lib-provided/jakarta.servlet-api-4"); assertThat(verifier .hasEntry("org/" + "springframework/boot/loader/JarLauncher.class")) .as("Unpacked launcher classes").isTrue(); @@ -314,7 +314,7 @@ public final class Verify { super.verifyZipEntries(verifier); verifier.assertHasEntryNameStartingWith("lib/spring-context"); verifier.assertHasEntryNameStartingWith("lib/spring-core"); - verifier.assertHasNoEntryNameStartingWith("lib/javax.servlet-api"); + verifier.assertHasNoEntryNameStartingWith("lib/jakarta.servlet-api"); assertThat(verifier .hasEntry("org/" + "springframework/boot/loader/JarLauncher.class")) .as("Unpacked launcher classes").isFalse(); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-test-support/pom.xml index 0f5c2c6e2b..c462429ccf 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/pom.xml @@ -66,18 +66,18 @@ true - org.neo4j - neo4j-ogm-core + jakarta.servlet + jakarta.servlet-api true - javax.servlet - javax.servlet-api + org.mockito + mockito-core true - org.mockito - mockito-core + org.neo4j + neo4j-ogm-core true @@ -94,6 +94,20 @@ org.testcontainers testcontainers true + + + javax.activation + javax.activation-api + + + javax.annotation + javax.annotation-api + + + javax.xml.bind + jaxb-api + + @@ -106,6 +120,17 @@ org.hibernate.validator hibernate-validator test + + + javax.validation + validation-api + + + + + jakarta.validation + jakarta.validation-api + test diff --git a/spring-boot-project/spring-boot/pom.xml b/spring-boot-project/spring-boot/pom.xml index 933cd542d9..7d0bba41f2 100644 --- a/spring-boot-project/spring-boot/pom.xml +++ b/spring-boot-project/spring-boot/pom.xml @@ -87,13 +87,18 @@ true - javax.jms - javax.jms-api + jakarta.jms + jakarta.jms-api true - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api + true + + + jakarta.validation + jakarta.validation-api true @@ -145,6 +150,12 @@ org.codehaus.btm btm true + + + javax.transaction + jta + + org.codehaus.groovy @@ -180,6 +191,12 @@ org.eclipse.jetty.http2 http2-server true + + + javax.servlet + javax.servlet-api + + org.hamcrest @@ -190,11 +207,31 @@ org.hibernate hibernate-core true + + + javax.activation + javax.activation-api + + + javax.persistence + javax.persistence-api + + + javax.xml.bind + jaxb-api + + org.hibernate.validator hibernate-validator true + + + javax.validation + validation-api + + org.jboss @@ -324,8 +361,13 @@ test - javax.xml.ws - jaxws-api + jakarta.persistence + jakarta.persistence-api + test + + + jakarta.xml.ws + jakarta.xml.ws-api test @@ -352,6 +394,12 @@ org.firebirdsql.jdbc jaybird-jdk18 test + + + javax.resource + connector-api + + org.hsqldb diff --git a/spring-boot-samples/spring-boot-sample-data-rest/pom.xml b/spring-boot-samples/spring-boot-sample-data-rest/pom.xml index 4a5043123a..a10cf5dfa5 100644 --- a/spring-boot-samples/spring-boot-sample-data-rest/pom.xml +++ b/spring-boot-samples/spring-boot-sample-data-rest/pom.xml @@ -72,8 +72,8 @@ - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api diff --git a/spring-boot-samples/spring-boot-sample-flyway/pom.xml b/spring-boot-samples/spring-boot-sample-flyway/pom.xml index af85a4e84c..9a60471c06 100644 --- a/spring-boot-samples/spring-boot-sample-flyway/pom.xml +++ b/spring-boot-samples/spring-boot-sample-flyway/pom.xml @@ -61,8 +61,8 @@ - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api diff --git a/spring-boot-samples/spring-boot-sample-jersey/pom.xml b/spring-boot-samples/spring-boot-sample-jersey/pom.xml index 568e4de04f..2347b73905 100644 --- a/spring-boot-samples/spring-boot-sample-jersey/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jersey/pom.xml @@ -62,8 +62,8 @@ - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api diff --git a/spring-boot-samples/spring-boot-sample-jetty-jsp/pom.xml b/spring-boot-samples/spring-boot-sample-jetty-jsp/pom.xml index bcea810c92..1d585e709d 100644 --- a/spring-boot-samples/spring-boot-sample-jetty-jsp/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jetty-jsp/pom.xml @@ -38,11 +38,23 @@ org.springframework.boot spring-boot-starter-jetty provided + + + jakarta.servlet + jakarta.servlet-api + + org.eclipse.jetty apache-jsp provided + + + javax.annotation + javax.annotation-api + + @@ -60,6 +72,29 @@ true + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-rules + + enforce + + + + + + javax.servlet:javax.servlet-api:* + + true + + + true + + + + org.apache.maven.plugins maven-surefire-plugin diff --git a/spring-boot-samples/spring-boot-sample-jpa/pom.xml b/spring-boot-samples/spring-boot-sample-jpa/pom.xml index e0257afe18..51dac0c0f9 100644 --- a/spring-boot-samples/spring-boot-sample-jpa/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jpa/pom.xml @@ -16,6 +16,10 @@ + + jakarta.persistence + jakarta.persistence-api + org.springframework.boot spring-boot-starter-web @@ -31,6 +35,20 @@ org.hibernate hibernate-core + + + javax.xml.bind + jaxb-api + + + javax.persistence + javax.persistence-api + + + javax.activation + javax.activation-api + + @@ -61,8 +79,8 @@ - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api diff --git a/spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml b/spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml index f2e39803b6..58a6944232 100644 --- a/spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml @@ -69,8 +69,8 @@ - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api diff --git a/spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml b/spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml index fe5e57e9b4..fa37633b3e 100644 --- a/spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml @@ -69,8 +69,8 @@ - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api diff --git a/spring-boot-samples/spring-boot-sample-jta-jndi/pom.xml b/spring-boot-samples/spring-boot-sample-jta-jndi/pom.xml index 7677895fd8..059f41edba 100644 --- a/spring-boot-samples/spring-boot-sample-jta-jndi/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jta-jndi/pom.xml @@ -37,13 +37,13 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided - javax.jms - javax.jms-api + jakarta.jms + jakarta.jms-api provided diff --git a/spring-boot-samples/spring-boot-sample-simple/pom.xml b/spring-boot-samples/spring-boot-sample-simple/pom.xml index b81abbdbd7..73f5ca8bdf 100644 --- a/spring-boot-samples/spring-boot-sample-simple/pom.xml +++ b/spring-boot-samples/spring-boot-sample-simple/pom.xml @@ -16,6 +16,10 @@ + + jakarta.validation + jakarta.validation-api + org.springframework.boot spring-boot-starter @@ -23,6 +27,12 @@ org.hibernate.validator hibernate-validator + + + javax.validation + validation-api + + diff --git a/spring-boot-samples/spring-boot-sample-test/pom.xml b/spring-boot-samples/spring-boot-sample-test/pom.xml index 99158d3a57..fae0eef600 100644 --- a/spring-boot-samples/spring-boot-sample-test/pom.xml +++ b/spring-boot-samples/spring-boot-sample-test/pom.xml @@ -69,8 +69,8 @@ - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api diff --git a/spring-boot-samples/spring-boot-sample-war/pom.xml b/spring-boot-samples/spring-boot-sample-war/pom.xml index 65276f61ce..4da7817991 100644 --- a/spring-boot-samples/spring-boot-sample-war/pom.xml +++ b/spring-boot-samples/spring-boot-sample-war/pom.xml @@ -24,8 +24,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml b/spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml index 73fdeee38a..3b9073d7c7 100755 --- a/spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml +++ b/spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml @@ -43,8 +43,8 @@ - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api diff --git a/spring-boot-samples/spring-boot-sample-webservices/pom.xml b/spring-boot-samples/spring-boot-sample-webservices/pom.xml index 4d865b0c7b..0e9386cec5 100644 --- a/spring-boot-samples/spring-boot-sample-webservices/pom.xml +++ b/spring-boot-samples/spring-boot-sample-webservices/pom.xml @@ -55,8 +55,8 @@ - javax.activation - javax.activation-api + jakarta.activation + jakarta.activation-api org.glassfish.jaxb diff --git a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml index 28c896abb0..5784024a5b 100644 --- a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml +++ b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml @@ -36,8 +36,8 @@ spring-boot-starter-actuator - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml index 23e6e8750c..b1cd0fb025 100644 --- a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml +++ b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml @@ -33,8 +33,8 @@ spring-boot-starter-actuator - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml index 0d1eca846b..3f1cf78bce 100644 --- a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml +++ b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml @@ -38,8 +38,8 @@ spring-boot-starter-actuator - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml index fa65949863..bf30a3702d 100644 --- a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml +++ b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml @@ -33,8 +33,8 @@ spring-boot-starter-actuator - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml index 69147b1683..657be40639 100644 --- a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml +++ b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml @@ -32,8 +32,8 @@ spring-boot-starter-actuator - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-configuration-processor-tests/pom.xml b/spring-boot-tests/spring-boot-integration-tests/spring-boot-configuration-processor-tests/pom.xml index 571f6d7500..6da6c73617 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-configuration-processor-tests/pom.xml +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-configuration-processor-tests/pom.xml @@ -23,8 +23,8 @@ spring-boot-configuration-metadata - javax.validation - validation-api + jakarta.validation + jakarta.validation-api org.springframework.boot diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml index e95d03aeb5..6ea13bb019 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/pom.xml @@ -39,8 +39,20 @@ org.slf4j jcl-over-slf4j + + javax.ws.rs + javax.ws.rs-api + + + javax.annotation + javax.annotation-api + + + jakarta.ws.rs + jakarta.ws.rs-api + org.springframework.boot spring-boot-starter-test diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/pom.xml b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/pom.xml index 4791a0d0f3..56d532a141 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/pom.xml +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/pom.xml @@ -35,8 +35,8 @@ test - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api test