Align with Jakarta EE 10 Core Profile (#52)

eclipse · Oct 4, 2022 · 09a4086 · 09a4086
1 parent 549d854
commit 09a4086
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 32 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11]
+        java: [11, 17]
     name: build with jdk ${{matrix.java}}
 
     steps:

diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 target/
+.vscode/
 *.DS_Store
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.eclipse.microprofile</groupId>
         <artifactId>microprofile-parent</artifactId>
-        <version>2.5</version>
+        <version>3.0</version>
     </parent>
 
     <groupId>org.eclipse.microprofile.telemetry</groupId>
@@ -33,6 +33,7 @@
         <inceptionYear>2022</inceptionYear>
         <opentelemetry.spec.version>1.11.0</opentelemetry.spec.version>
         <opentelemetry.java.version>1.14.0</opentelemetry.java.version>
+        <version.microprofile.tck.bom>3.0</version.microprofile.tck.bom>
     </properties>
 
     <issueManagement>

diff --git a/tracing/pom.xml b/tracing/pom.xml
@@ -53,24 +53,6 @@
                 <version>${version.mp.rest.client}</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>jakarta.enterprise</groupId>
-                <artifactId>jakarta.enterprise.cdi-api</artifactId>
-                <version>${version.jakarta.cdi}</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>jakarta.ws.rs</groupId>
-                <artifactId>jakarta.ws.rs-api</artifactId>
-                <version>${version.jakarta.ws-rs}</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>jakarta.json.bind</groupId>
-                <artifactId>jakarta.json.bind-api</artifactId>
-                <version>${version.jakarta.jsonb}</version>
-                <scope>provided</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/tracing/tck/pom.xml b/tracing/tck/pom.xml
@@ -23,26 +23,30 @@
     <artifactId>microprofile-telemetry-tracing-tck</artifactId>
     <name>MicroProfile Telemetry Tracing TCK</name>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.eclipse.microprofile</groupId>
+                <artifactId>microprofile-tck-bom</artifactId>
+                <version>3.0</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.eclipse.microprofile.config</groupId>
             <artifactId>microprofile-config-api</artifactId>
         </dependency>
-        <dependency>
+         <dependency>
             <groupId>org.eclipse.microprofile.rest.client</groupId>
             <artifactId>microprofile-rest-client-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.enterprise</groupId>
-            <artifactId>jakarta.enterprise.cdi-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.ws.rs</groupId>
-            <artifactId>jakarta.ws.rs-api</artifactId>
-        </dependency>
+        </dependency>     
         <dependency>
-            <groupId>jakarta.json.bind</groupId>
-            <artifactId>jakarta.json.bind-api</artifactId>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-core-api</artifactId>
         </dependency>
         <dependency>
             <groupId>io.opentelemetry</groupId>