From cec202b1c449fe6bb5a4650e3901cffd01369732 Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Tue, 3 Sep 2019 14:20:42 +0200 Subject: [PATCH] Jakarta APIs version upgrade Signed-off-by: Maxim Nesen --- bundles/jaxrs-ri/pom.xml | 4 +-- core-server/pom.xml | 4 +-- etc/travis/travis.sh | 2 +- examples/extended-wadl-webapp/pom.xml | 4 +-- .../ExtendedWadlWebappOsgiTest.java | 2 +- .../helloworld/test/AbstractWebAppTest.java | 2 +- .../test/AbstractHttpServiceTest.java | 2 +- ext/bean-validation/pom.xml | 4 +-- pom.xml | 28 +++++++++---------- tests/integration/j-376/pom.xml | 5 ++-- tests/integration/j-59/war/pom.xml | 2 +- tests/integration/jersey-3670/pom.xml | 4 +-- tests/osgi/functional/pom.xml | 4 +-- 13 files changed, 33 insertions(+), 34 deletions(-) diff --git a/bundles/jaxrs-ri/pom.xml b/bundles/jaxrs-ri/pom.xml index 14bb6b6f12..97a06c6383 100644 --- a/bundles/jaxrs-ri/pom.xml +++ b/bundles/jaxrs-ri/pom.xml @@ -175,8 +175,8 @@ provided - javax.validation - validation-api + jakarta.validation + jakarta.validation-api provided diff --git a/core-server/pom.xml b/core-server/pom.xml index 18bdfe3855..78c0569eb8 100644 --- a/core-server/pom.xml +++ b/core-server/pom.xml @@ -189,8 +189,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api diff --git a/etc/travis/travis.sh b/etc/travis/travis.sh index 4c6030ca39..2bb5d80e47 100644 --- a/etc/travis/travis.sh +++ b/etc/travis/travis.sh @@ -28,7 +28,7 @@ PING_LOOP_PID=$! if [ "$1" = "glassfish-copyright:copyright" ]; then mvn glassfish-copyright:copyright else - mvn -e -U -B clean install $1 >> $BUILD_OUTPUT 2>&1 + mvn -e -U -B clean install -Pstaging $1 >> $BUILD_OUTPUT 2>&1 fi # The build finished without returning an error so dump a tail of the output diff --git a/examples/extended-wadl-webapp/pom.xml b/examples/extended-wadl-webapp/pom.xml index c8c74f4f56..d25b5f153e 100644 --- a/examples/extended-wadl-webapp/pom.xml +++ b/examples/extended-wadl-webapp/pom.xml @@ -43,8 +43,8 @@ jersey-hk2 - javax.validation - validation-api + jakarta.validation + jakarta.validation-api diff --git a/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java b/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java index ff1a2f5b82..23e693b0f7 100644 --- a/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java +++ b/examples/extended-wadl-webapp/src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java @@ -115,7 +115,7 @@ public static Option[] configuration() { mavenBundle().groupId("org.javassist").artifactId("javassist").versionAsInProject(), // validation - mavenBundle().groupId("javax.validation").artifactId("validation-api").versionAsInProject(), + mavenBundle().groupId("jakarta.validation").artifactId("jakarta.validation-api").versionAsInProject(), // Grizzly systemPackage("sun.misc"), // required by grizzly-framework diff --git a/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java b/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java index 199fcfb535..597f4f81e3 100644 --- a/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java +++ b/examples/osgi-helloworld-webapp/functional-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java @@ -151,7 +151,7 @@ public List - javax.validation - validation-api + jakarta.validation + jakarta.validation-api org.hibernate.validator diff --git a/pom.xml b/pom.xml index 338b40c022..e303b6bfd8 100644 --- a/pom.xml +++ b/pom.xml @@ -1866,8 +1866,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${javax.validation.api.version} @@ -2083,17 +2083,17 @@ 1.2.1 3.25.0-GA javax.annotation.*;version="[1.2,3)" - 1.3.4 - 3.0.2 + 1.3.5 + 3.0.3 3.0.2 - 1.2.4 - 2.2.2 - 2.0.1.Final - 2.3.2 + 1.2.5 + 2.2.3 + 2.0.2 + 2.3.3 2.3.2 - 1.0.1 + 1.0.2 2.1 - 2.1.5 + 2.1.6 3.3.0.Final 1.19.3 ${jersey1.version} @@ -2105,9 +2105,9 @@ 1.44 1.1.5 1.1.5 - 2.3.5 - 1.2.4 - 1.3.2 + 2.3.6 + 1.2.7 + 1.3.3 4.0.1 1.9.11 1.10.19 @@ -2125,7 +2125,7 @@ 2.0.4 2.4 3.0.1 - 4.0.2 + 4.0.3 6.0.1 1.7.21 4.3.20.RELEASE diff --git a/tests/integration/j-376/pom.xml b/tests/integration/j-376/pom.xml index 95cba96a22..0dad7dcc95 100644 --- a/tests/integration/j-376/pom.xml +++ b/tests/integration/j-376/pom.xml @@ -55,10 +55,9 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api compile - 1.1.0.Final diff --git a/tests/integration/j-59/war/pom.xml b/tests/integration/j-59/war/pom.xml index 81cb607efd..a41164bd93 100644 --- a/tests/integration/j-59/war/pom.xml +++ b/tests/integration/j-59/war/pom.xml @@ -106,7 +106,7 @@ jakarta.jws jakarta.jws-api - 1.1.1 + 2.1.0 diff --git a/tests/integration/jersey-3670/pom.xml b/tests/integration/jersey-3670/pom.xml index a6c2ccd7a4..8a61c090e1 100644 --- a/tests/integration/jersey-3670/pom.xml +++ b/tests/integration/jersey-3670/pom.xml @@ -39,8 +39,8 @@ test - javax.validation - validation-api + jakarta.validation + jakarta.validation-api org.glassfish.jersey.connectors diff --git a/tests/osgi/functional/pom.xml b/tests/osgi/functional/pom.xml index 921efe33f3..83b9b08c25 100644 --- a/tests/osgi/functional/pom.xml +++ b/tests/osgi/functional/pom.xml @@ -269,8 +269,8 @@ test - javax.validation - validation-api + jakarta.validation + jakarta.validation-api test