EE4J-8 release prepare (#653)

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
eclipse-ee4j · Nov 16, 2018 · 440adda · 440adda
1 parent 88ce39a
commit 440adda
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -106,7 +106,7 @@
         <javax.ejb-api.version>3.2.3</javax.ejb-api.version>
         <cdi-api.version>1.2</cdi-api.version>
         <json-api.version>1.1.5</json-api.version>
-        <json-impl.version>1.0.4</json-impl.version>
+        <json-impl.version>1.1.5</json-impl.version>
 
         <api_package>javax.websocket</api_package>
         <impl_namespace>org.glassfish</impl_namespace>
@@ -498,13 +498,13 @@
                 <version>${cdi-api.version}</version>
             </dependency>
             <dependency>
-                <groupId>jakarta.json</groupId>           <!-- TODO -->
+                <groupId>jakarta.json</groupId>
                 <artifactId>jakarta.json-api</artifactId>
                 <version>${json-api.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.glassfish</groupId>
-                <artifactId>javax.json</artifactId>
+                <artifactId>jakarta.json</artifactId>
                 <version>${json-impl.version}</version>
             </dependency>
             <dependency>

diff --git a/samples/shared-collection/pom.xml b/samples/shared-collection/pom.xml
@@ -32,16 +32,15 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.json</groupId>
-            <artifactId>javax.json-api</artifactId>
-            <version>1.0</version>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
-            <version>2.0.1</version>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <version>2.1.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -89,8 +88,8 @@
 
         <dependency>
             <groupId>org.glassfish</groupId>
-            <artifactId>javax.json</artifactId>
-            <version>1.0.4</version>
+            <artifactId>jakarta.json</artifactId>
+            <version>1.1.5</version>
         </dependency>
 
     </dependencies>

diff --git a/tests/e2e/standard-config/pom.xml b/tests/e2e/standard-config/pom.xml
@@ -50,7 +50,7 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
-            <artifactId>javax.json</artifactId>
+            <artifactId>jakarta.json</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>