Jakarta APIs version upgrade (#4240)

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
eclipse-ee4j · Sep 5, 2019 · a065740 · a065740
1 parent 8e01ccc
commit a065740
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 34 deletions.
diff --git a/bundles/jaxrs-ri/pom.xml b/bundles/jaxrs-ri/pom.xml
@@ -175,8 +175,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/core-server/pom.xml b/core-server/pom.xml
@@ -189,8 +189,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>

diff --git 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
@@ -43,8 +43,8 @@
             <artifactId>jersey-hk2</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>

diff --git a/.../src/test/java/org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java b/.../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/...-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java b/...-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java
@@ -151,7 +151,7 @@ public List<Option> genericOsgiOptions() {
                 systemPackage("com.sun.source.util"),
 
                 // validation - required by jersey-container-servlet-core
-                mavenBundle().groupId("javax.validation").artifactId("validation-api").versionAsInProject(),
+                mavenBundle().groupId("jakarta.validation").artifactId("jakarta.validation-api").versionAsInProject(),
                 // Jersey bundles
                 mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-common").versionAsInProject(),
                 mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-server").versionAsInProject(),

diff --git a/...test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java b/...test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java
@@ -115,7 +115,7 @@ public List<Option> genericOsgiOptions() {
                 systemPackage("com.sun.source.util"),
 
                 // validation
-                mavenBundle().groupId("javax.validation").artifactId("validation-api").versionAsInProject(),
+                mavenBundle().groupId("jakarta.validation").artifactId("jakarta.validation-api").versionAsInProject(),
 
                 // Jersey bundles
                 mavenBundle().groupId("org.glassfish.jersey.core").artifactId("jersey-common").versionAsInProject(),

diff --git a/ext/bean-validation/pom.xml b/ext/bean-validation/pom.xml
@@ -83,8 +83,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hibernate.validator</groupId>

diff --git a/pom.xml b/pom.xml
@@ -1866,8 +1866,8 @@
             </dependency>
 
             <dependency>
-                <groupId>javax.validation</groupId>
-                <artifactId>validation-api</artifactId>
+                <groupId>jakarta.validation</groupId>
+                <artifactId>jakarta.validation-api</artifactId>
                 <version>${javax.validation.api.version}</version>
             </dependency>
 
@@ -2083,17 +2083,17 @@
         <jakarta.activation.version>1.2.1</jakarta.activation.version>
         <javassist.version>3.25.0-GA</javassist.version>
         <javax.annotation.osgi.version>javax.annotation.*;version="[1.2,3)"</javax.annotation.osgi.version>
-        <javax.annotation.version>1.3.4</javax.annotation.version>
-        <javax.el.version>3.0.2</javax.el.version>
+        <javax.annotation.version>1.3.5</javax.annotation.version>
+        <javax.el.version>3.0.3</javax.el.version>
         <javax.el.impl.version>3.0.2</javax.el.impl.version>
-        <javax.interceptor.version>1.2.4</javax.interceptor.version>
-        <javax.persistence.version>2.2.2</javax.persistence.version>
-        <javax.validation.api.version>2.0.1.Final</javax.validation.api.version>
-        <jaxb.api.version>2.3.2</jaxb.api.version>
+        <javax.interceptor.version>1.2.5</javax.interceptor.version>
+        <javax.persistence.version>2.2.3</javax.persistence.version>
+        <javax.validation.api.version>2.0.2</javax.validation.api.version>
+        <jaxb.api.version>2.3.3</jaxb.api.version>
         <jaxb.ri.version>2.3.2</jaxb.ri.version>
-        <jsonb.api.version>1.0.1</jsonb.api.version>
+        <jsonb.api.version>1.0.2</jsonb.api.version>
         <jaxrs.api.spec.version>2.1</jaxrs.api.spec.version>
-        <jaxrs.api.impl.version>2.1.5</jaxrs.api.impl.version>
+        <jaxrs.api.impl.version>2.1.6</jaxrs.api.impl.version>
         <jboss.logging.version>3.3.0.Final</jboss.logging.version>
         <jersey1.version>1.19.3</jersey1.version>
         <jersey1.last.final.version>${jersey1.version}</jersey1.last.final.version>
@@ -2105,9 +2105,9 @@
         <jmockit.version>1.44</jmockit.version>
         <jsonp.ri.version>1.1.5</jsonp.ri.version>
         <jsonp.jaxrs.version>1.1.5</jsonp.jaxrs.version>
-        <jsp.version>2.3.5</jsp.version>
-        <jstl.version>1.2.4</jstl.version>
-        <jta.api.version>1.3.2</jta.api.version>
+        <jsp.version>2.3.6</jsp.version>
+        <jstl.version>1.2.7</jstl.version>
+        <jta.api.version>1.3.3</jta.api.version>
         <kryo.version>4.0.1</kryo.version>
         <mimepull.version>1.9.11</mimepull.version>
         <mockito.version>1.10.19</mockito.version>
@@ -2125,7 +2125,7 @@
         <rxjava2.version>2.0.4</rxjava2.version>
         <servlet2.version>2.4</servlet2.version>
         <servlet3.version>3.0.1</servlet3.version>
-        <servlet4.version>4.0.2</servlet4.version>
+        <servlet4.version>4.0.3</servlet4.version>
         <simple.version>6.0.1</simple.version>
         <slf4j.version>1.7.21</slf4j.version>
         <spring4.version>4.3.20.RELEASE</spring4.version>

diff --git a/tests/integration/j-376/pom.xml b/tests/integration/j-376/pom.xml
@@ -55,10 +55,9 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
             <scope>compile</scope>
-            <version>1.1.0.Final</version>
         </dependency>
 
         <dependency>

diff --git a/tests/integration/j-59/war/pom.xml b/tests/integration/j-59/war/pom.xml
@@ -106,7 +106,7 @@
               <dependency>
                   <groupId>jakarta.jws</groupId>
                   <artifactId>jakarta.jws-api</artifactId>
-                  <version>1.1.1</version>
+                  <version>2.1.0</version>
               </dependency>
             </dependencies>
         </profile>

diff --git a/tests/integration/jersey-3670/pom.xml b/tests/integration/jersey-3670/pom.xml
@@ -39,8 +39,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.connectors</groupId>

diff --git a/tests/osgi/functional/pom.xml b/tests/osgi/functional/pom.xml
@@ -269,8 +269,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>