Merge pull request #411 from jGauravGupta/jakarta-ns

Jakarta namespace transition
eclipse-ee4j · May 27, 2020 · 1bc7142 · 1bc7142
2 parents df01512 + 363f260
commit 1bc7142
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -34,8 +34,9 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jakarta.json.version>2.0.0-RC1</jakarta.json.version>
+        <jakarta.json.version>2.0.0-RC2</jakarta.json.version>
         <jakarta.json.bind.version>2.0.0-RC1</jakarta.json.bind.version>
+        <jakarta.enterprise.cdi-api.version>3.0.0-M2</jakarta.enterprise.cdi-api.version>
         <netbeans.hint.jdkPlatform>JDK_9</netbeans.hint.jdkPlatform>
     </properties>
 
@@ -46,30 +47,23 @@
             <artifactId>jakarta.json.bind-api</artifactId>
             <version>${jakarta.json.bind.version}</version>
         </dependency>
-        <dependency>
-            <groupId>jakarta.json</groupId>
-            <artifactId>jakarta.json-api</artifactId>
-            <version>${jakarta.json.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>jakarta.json</artifactId>
             <version>${jakarta.json.version}</version>
-            <classifier>module</classifier>
-            <scope>compile</scope>
         </dependency>
         <!-- Test/Provided dependencies -->
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
-            <version>3.0.0-M2</version>
+            <version>${jakarta.enterprise.cdi-api.version}</version>
             <optional>true</optional>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.weld.se</groupId>
             <artifactId>weld-se-core</artifactId>
-            <version>4.0.0.Alpha1</version>
+            <version>4.0.0.Alpha2</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/yasson-jmh/src/main/java/org/eclipse/yasson/jmh/CollectionsTest.java b/yasson-jmh/src/main/java/org/eclipse/yasson/jmh/CollectionsTest.java
@@ -4,8 +4,8 @@
 import org.eclipse.yasson.jmh.model.ScalarData;
 import org.openjdk.jmh.annotations.*;
 
-import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.concurrent.TimeUnit;

diff --git a/yasson-jmh/src/main/java/org/eclipse/yasson/jmh/ScalarDataTest.java b/yasson-jmh/src/main/java/org/eclipse/yasson/jmh/ScalarDataTest.java
@@ -3,8 +3,8 @@
 import org.eclipse.yasson.jmh.model.ScalarData;
 import org.openjdk.jmh.annotations.*;
 
-import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
 import java.util.concurrent.TimeUnit;
 
 

diff --git a/yasson-jmh/src/main/java/org/eclipse/yasson/jmh/TenPropertySerializationTest.java b/yasson-jmh/src/main/java/org/eclipse/yasson/jmh/TenPropertySerializationTest.java
@@ -3,7 +3,7 @@
 import org.eclipse.yasson.jmh.model.TenPropertyData;
 import org.openjdk.jmh.annotations.*;
 
-import javax.json.bind.*;
+import jakarta.json.bind.*;
 import java.util.List;
 import java.util.concurrent.TimeUnit;