Move to Jakarta

smallrye · Feb 13, 2023 · e50002c · e50002c
1 parent 2a365bf
commit e50002c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 207 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,35 +17,6 @@ jobs:
     runs-on: ubuntu-latest
     name: build
 
-    steps:
-      - uses: actions/checkout@v2
-        name: checkout
-
-      - uses: AdoptOpenJDK/install-jdk@v1
-        name: set up jdk 8
-        with:
-          version: 8
-
-      - name: Maven
-        run: mvn -B -ntp formatter:validate install
-
-      - uses: actions/checkout@v2
-        name: checkout smallrye-config
-        with:
-          repository: smallrye/smallrye-config
-          path: smallrye-config
-
-      - name: test with smallrye-config
-        run: |
-          cd smallrye-config
-          mvn -B -ntp versions:update-parent -DallowSnapshots=true -N
-          git diff pom.xml
-          mvn -B -ntp install
-
-  build-jakarta:
-    runs-on: ubuntu-latest
-    name: build with jakarta
-
     steps:
       - uses: actions/checkout@v2
         name: checkout
@@ -67,7 +38,7 @@ jobs:
       - name: test with smallrye-config
         run: |
           cd smallrye-config
-          mvn -B -ntp versions:update-parent -DallowSnapshots=true -N
+          mvn -B -ntp versions:update-parent -DallowSnapshots=true
           sh to-jakarta.sh
           git diff pom.xml
           mvn -B -ntp install -Dtck.skip.owb=true
diff --git a/full-parent-jakarta/pom.xml b/full-parent-jakarta/pom.xml
diff --git a/full-parent/pom.xml b/full-parent/pom.xml
@@ -15,21 +15,15 @@
     <description>SmallRye Parent POM</description>
 
     <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
-        <maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>
-
         <!-- Dependency versions -->
-        <version.jakarta.api>8.0.0</version.jakarta.api>
-        <version.jakarta.annotation.api>1.3.5</version.jakarta.annotation.api>
-        <version.jakarta.enterprise.cdi.api>2.0.2</version.jakarta.enterprise.cdi.api>
-        <version.jakarta.json-p.api>1.1.6</version.jakarta.json-p.api>
-        <version.jakarta.json-b.api>1.0.2</version.jakarta.json-b.api>
-        <version.jakarta.ws.rs.api>2.1.6</version.jakarta.ws.rs.api>
-        <version.jakarta.jms.api>2.0.3</version.jakarta.jms.api>
+        <version.jakarta.api>10.0.0</version.jakarta.api>
+        <version.jakarta.annotation.api>2.1.1</version.jakarta.annotation.api>
+        <version.jakarta.enterprise.cdi.api>4.0.1</version.jakarta.enterprise.cdi.api>
+        <version.jakarta.json-p.api>2.1.0</version.jakarta.json-p.api>
+        <version.jakarta.json-b.api>3.0.0</version.jakarta.json-b.api>
+        <version.jakarta.ws.rs.api>3.1.0</version.jakarta.ws.rs.api>
 
-        <version.org.jboss.logging>3.4.3.Final</version.org.jboss.logging>
+        <version.org.jboss.logging>3.5.0.Final</version.org.jboss.logging>
         <version.org.jboss.logging-processor>2.2.1.Final</version.org.jboss.logging-processor>
         <version.org.jboss.jandex>2.4.3.Final</version.org.jboss.jandex>
 
@@ -46,7 +40,7 @@
             <!-- Jakarta EE -->
             <dependency>
                 <groupId>jakarta.platform</groupId>
-                <artifactId>jakarta.jakartaee-api</artifactId>
+                <artifactId>jakarta.jakartaee-core-api</artifactId>
                 <version>${version.jakarta.api}</version>
             </dependency>
             <dependency>
@@ -74,11 +68,6 @@
                 <artifactId>jakarta.json-api</artifactId>
                 <version>${version.jakarta.json-p.api}</version>
             </dependency>
-            <dependency>
-                <groupId>jakarta.jms</groupId>
-                <artifactId>jakarta.jms-api</artifactId>
-                <version>${version.jakarta.jms.api}</version>
-            </dependency>
 
             <!-- Logging -->
             <dependency>

diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,6 @@
 
   <modules>
     <module>full-parent</module>
-    <module>full-parent-jakarta</module>
   </modules>
 
   <properties>
@@ -51,8 +50,8 @@
     <sonar.organization>smallrye</sonar.organization>
 
     <!-- maven-compiler-plugin -->
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
     <maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>