Merge pull request #3016 from jamezp/jakarta-rest-31

Initial migration to Jakarta REST 3.1
resteasy · Jan 14, 2022 · ad9b576 · ad9b576
2 parents d8177cd + 1820e64
commit ad9b576
Show file tree

Hide file tree

Showing 64 changed files with 128 additions and 279 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -25,81 +25,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
-        with:
-          java-version: 8
-          distribution: 'temurin'
-          cache: 'maven'
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v2
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
           cache: 'maven'
-      - name: Build with Maven Java ${{ matrix.java }} on WildFly ${{ matrix.wildfly-version }} - Linux
-        if: runner.os == 'Linux'
-        run: |
-          echo "::group::Build Logs"
-          mvn clean install -U -B -fae -Dserver.version=${{ matrix.wildfly-version }} -Dgithub.actions -Djava8.home="$JAVA_HOME_8_X64"
-          echo "::endgroup::"
-      - name: Build with Maven Java ${{ matrix.java }} on WildFly ${{ matrix.wildfly-version }} - Windows
-        if: runner.os == 'Windows'
-        run:  |
-          echo "::group::Build Logs"
-          mvn clean install -U -B -fae '-Dserver.version=${{ matrix.wildfly-version }}' '-Dgithub.actions' '"-Djava8.home=%JAVA_HOME_8_X64%"'
-          echo "::endgroup::"
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.wildfly-version }}
-          path: '**/surefire-reports/*.txt'
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: server-logs-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.wildfly-version }}
-          path: '**/server.log'
-
-  test-with-java8:
-
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 90
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest ]
-        wildfly-version: ['25.0.1.Final']
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
-        with:
-          java-version: 8
-          distribution: 'temurin'
-          cache: 'maven'
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
-        with:
-          java-version: 11
-          distribution: 'temurin'
-          cache: 'maven'
-      - name: Build with Java 11
-        run: |
-          echo "::group::Build Logs"
-          mvn clean install -U -B -DskipTests
-          echo "::endgroup::"
-      - name: Test with Java 8 on WildFly ${{ matrix.wildfly-version }} - Linux
-        if: runner.os == 'Linux'
+      - name: Build with Maven Java ${{ matrix.java }} on WildFly ${{ matrix.wildfly-version }} - ${{ matrix.os }}
         run:  |
-          echo "::group::Test Logs"
-          mvn clean install -U -B -fae -rf ':resteasy-testsuite' -Dserver.version=${{ matrix.wildfly-version }} -Dgithub.actions -Dtest.java8.home="$JAVA_HOME_8_X64"
-          echo "::endgroup::"
-      - name: Test with Java 8 on WildFly ${{ matrix.wildfly-version }} - Windows
-        if: runner.os == 'Windows'
-        run: |
           echo "::group::Build Logs"
-          mvn clean install -U -B -fae -rf ':resteasy-testsuite' '-Dserver.version=${{ matrix.wildfly-version }}' '-Dgithub.actions' '"-Dtest.java8.home=%JAVA_HOME_8_X64%"'
+          mvn clean install -U -B -fae '-Dserver.version=${{ matrix.wildfly-version }}' '-Dgithub.actions'
           echo "::endgroup::"
       - uses: actions/upload-artifact@v2
         if: failure()

diff --git a/.github/workflows/wildfly-build.yml b/.github/workflows/wildfly-build.yml
@@ -20,10 +20,10 @@ jobs:
         with:
           repository: wildfly/wildfly
           fetch-depth: 0
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
-          java-version: 8
+          java-version: 11
           distribution: 'temurin'
           cache: 'maven'
       - name: Build WildFly

diff --git a/arquillian/RESTEASY-1056-jetty-bv11/pom.xml b/arquillian/RESTEASY-1056-jetty-bv11/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jboss.resteasy</groupId>
     <artifactId>resteasy-misc-arquillian-tests</artifactId>
-    <version>6.0.1-SNAPSHOT</version>
+    <version>6.1.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>RESTEASY-1056-jetty-bv11</artifactId>
@@ -25,8 +25,8 @@
           <artifactId>jboss-logging</artifactId>
       </dependency>
       <dependency>
-          <groupId>org.jboss.spec.javax.ws.rs</groupId>
-          <artifactId>jboss-jaxrs-api_3.0_spec</artifactId>
+          <groupId>jakarta.ws.rs</groupId>
+          <artifactId>jakarta.ws.rs-api</artifactId>
       </dependency>
 
     <!-- Test dependencies -->

diff --git a/arquillian/RESTEASY-1630-jetty-resteasy-servlet-initializer/pom.xml b/arquillian/RESTEASY-1630-jetty-resteasy-servlet-initializer/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jboss.resteasy</groupId>
     <artifactId>resteasy-misc-arquillian-tests</artifactId>
-    <version>6.0.1-SNAPSHOT</version>
+    <version>6.1.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>RESTEASY-1630-jetty-resteasy-servlet-initializer</artifactId>
@@ -28,8 +28,8 @@
       <artifactId>jboss-logging</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.spec.javax.ws.rs</groupId>
-      <artifactId>jboss-jaxrs-api_3.0_spec</artifactId>
+      <groupId>jakarta.ws.rs</groupId>
+      <artifactId>jakarta.ws.rs-api</artifactId>
     </dependency>
 
     <!-- Test dependencies -->

diff --git a/arquillian/RESTEASY-736-jetty/pom.xml b/arquillian/RESTEASY-736-jetty/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jboss.resteasy</groupId>
     <artifactId>resteasy-misc-arquillian-tests</artifactId>
-    <version>6.0.1-SNAPSHOT</version>
+    <version>6.1.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>RESTEASY-736-jetty</artifactId>
@@ -17,8 +17,8 @@
           <artifactId>jboss-logging</artifactId>
       </dependency>
       <dependency>
-          <groupId>org.jboss.spec.javax.ws.rs</groupId>
-          <artifactId>jboss-jaxrs-api_3.0_spec</artifactId>
+          <groupId>jakarta.ws.rs</groupId>
+          <artifactId>jakarta.ws.rs-api</artifactId>
       </dependency>
 
       <!-- Test dependencies -->

diff --git a/arquillian/pom.xml b/arquillian/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.jboss.resteasy</groupId>
         <artifactId>resteasy-jaxrs-all</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <name>RESTEasy Misc Arquillian-based tests</name>
@@ -24,8 +24,6 @@
         <version.arquillian.jetty>1.0.0.CR3</version.arquillian.jetty>
         <!-- Test properties -->
         <additionalJvmArgs/>
-        <!-- The Jakarta version of Jetty only supports Java 11 -->
-        <skip.java8.tests>true</skip.java8.tests>
     </properties>
 
     <dependencyManagement>

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jboss.resteasy</groupId>
         <artifactId>resteasy-jaxrs-all</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>resteasy-dist</artifactId>
@@ -40,8 +40,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.jboss.spec.javax.ws.rs</groupId>
-            <artifactId>jboss-jaxrs-api_3.0_spec</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
         </dependency>
         <dependency>
             <groupId>jakarta.servlet</groupId>

diff --git a/distribution/src-distribution/pom.xml b/distribution/src-distribution/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jboss.resteasy</groupId>
         <artifactId>resteasy-dist</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>resteasy-src-dist</artifactId>

diff --git a/docbook/pom.xml b/docbook/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.jboss.resteasy</groupId>
     <artifactId>resteasy-reference-guide-${translation}</artifactId>
-    <version>6.0.1-SNAPSHOT</version>
+    <version>6.1.0-SNAPSHOT</version>
     <packaging>jdocbook</packaging>
     <name>RESTEasy Reference Guide (${translation})</name>
     <description/>

diff --git a/docbook/reference/en/en-US/master.xml b/docbook/reference/en/en-US/master.xml
@@ -70,7 +70,7 @@
    <bookinfo>
       <title>RESTEasy</title>
       <subtitle>Jakarta RESTFul Web Services</subtitle>
-      <releaseinfo>6.0.1-SNAPSHOT</releaseinfo>
+      <releaseinfo>6.1.0-SNAPSHOT</releaseinfo>
    </bookinfo>
 
    <toc/>

diff --git a/docbook/reference/en/en-US/modules/Installation_Configuration.xml b/docbook/reference/en/en-US/modules/Installation_Configuration.xml
@@ -256,7 +256,7 @@
                 <programlisting><![CDATA[$ galleon.sh install wildfly:current]]></programlisting>
 
                 To install the RESTEasy upgrade on top of that you simply need to use the tool again with the Maven GAV:
-                <programlisting><![CDATA[$ galleon.sh install org.jboss.resteasy:galleon-feature-pack:6.0.1-SNAPSHOT]]></programlisting>
+                <programlisting><![CDATA[$ galleon.sh install org.jboss.resteasy:galleon-feature-pack:6.1.0-SNAPSHOT]]></programlisting>
             </para>
             <para>
                 If you are using Maven to provision WildFly you can simply add the feature pack to your plugin configuration.
@@ -273,7 +273,7 @@
             <feature-pack>
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>galleon-feature-pack</artifactId>
-                <version>6.0.1-SNAPSHOT</version>
+                <version>6.1.0-SNAPSHOT</version>
             </feature-pack>
         </feature-packs>
     </configuration>
@@ -360,17 +360,17 @@ public class MyApplication extends Application
 <dependency>
     <groupId>org.jboss.resteasy</groupId>
     <artifactId>resteasy-core</artifactId>
-    <version>6.0.1-SNAPSHOT</version>
+    <version>6.1.0-SNAPSHOT</version>
 </dependency>
 <dependency>
     <groupId>org.jboss.resteasy</groupId>
     <artifactId>resteasy-client</artifactId>
-    <version>6.0.1-SNAPSHOT</version>
+    <version>6.1.0-SNAPSHOT</version>
 </dependency>
 <dependency>
     <groupId>org.jboss.resteasy</groupId>
     <artifactId>resteasy-jaxb-provider</artifactId>
-    <version>6.0.1-SNAPSHOT</version>
+    <version>6.1.0-SNAPSHOT</version>
 </dependency>
 ]]></programlisting>
         <para>
@@ -403,7 +403,7 @@ public class MyApplication extends Application
 <dependency>
     <groupId>org.jboss.resteasy</groupId>
     <artifactId>resteasy-servlet-initializer</artifactId>
-    <version>6.0.1-SNAPSHOT</version>
+    <version>6.1.0-SNAPSHOT</version>
 </dependency>
 ]]></programlisting>
         </section>
@@ -1398,12 +1398,12 @@ public abstract class Application
 <dependency>
     <groupId>org.jboss.resteasy</groupId>
     <artifactId>resteasy-core</artifactId>
-    <version>6.0.1-SNAPSHOT</version>
+    <version>6.1.0-SNAPSHOT</version>
 </dependency>
 <dependency>
     <groupId>org.jboss.resteasy</groupId>
     <artifactId>resteasy-client</artifactId>
-    <version>6.0.1-SNAPSHOT</version>
+    <version>6.1.0-SNAPSHOT</version>
 </dependency>
 ]]></programlisting>
 

diff --git a/docbook/reference/en/en-US/modules/Json-p.xml b/docbook/reference/en/en-US/modules/Json-p.xml
@@ -10,7 +10,7 @@
 <dependency>
    <groupId>org.jboss.resteasy</groupId>
    <artifactId>resteasy-json-p-provider</artifactId>
-   <version>6.0.1-SNAPSHOT</version>
+   <version>6.1.0-SNAPSHOT</version>
 </dependency>
 ]]></programlisting>
     <para>

diff --git a/docbook/reference/en/en-US/modules/Links.xml b/docbook/reference/en/en-US/modules/Links.xml
@@ -52,7 +52,7 @@
 					<tr>
 						<td>org.jboss.resteasy</td>
 						<td>resteasy-links</td>
-						<td>6.0.1-SNAPSHOT</td>
+						<td>6.1.0-SNAPSHOT</td>
 					</tr>
 				</tbody>
 			</table>

diff --git a/docbook/reference/en/en-US/modules/RESTEasy_Embedded_Container.xml b/docbook/reference/en/en-US/modules/RESTEasy_Embedded_Container.xml
@@ -138,7 +138,7 @@ public class UndertowTest
   <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jdk-http</artifactId>
-      <version>6.0.1-SNAPSHOT</version>
+      <version>6.1.0-SNAPSHOT</version>
   </dependency>
 ]]></programlisting>
 
@@ -167,7 +167,7 @@ public class UndertowTest
   <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-netty4</artifactId>
-      <version>6.0.1-SNAPSHOT</version>
+      <version>6.1.0-SNAPSHOT</version>
   </dependency>
 ]]></programlisting>
 
@@ -200,7 +200,7 @@ public class UndertowTest
   <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-reactor-netty</artifactId>
-      <version>6.0.1-SNAPSHOT</version>
+      <version>6.1.0-SNAPSHOT</version>
   </dependency>
 ]]></programlisting>
 
@@ -227,7 +227,7 @@ public class UndertowTest
   <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-vertx</artifactId>
-      <version>6.0.1-SNAPSHOT</version>
+      <version>6.1.0-SNAPSHOT</version>
   </dependency>
     ]]></programlisting>
 

diff --git a/docbook/reference/en/en-US/modules/signature.xml b/docbook/reference/en/en-US/modules/signature.xml
@@ -172,7 +172,7 @@
     <para><programlisting>        &lt;dependency&gt;
             &lt;groupId&gt;org.jboss.resteasy&lt;/groupId&gt;
             &lt;artifactId&gt;resteasy-crypto&lt;/artifactId&gt;
-            &lt;version&gt;6.0.1-SNAPSHOT&lt;/version&gt;
+            &lt;version&gt;6.1.0-SNAPSHOT&lt;/version&gt;
         &lt;/dependency&gt;
 
 </programlisting></para>

diff --git a/docbook/reference/en/en-US/modules/smime.xml b/docbook/reference/en/en-US/modules/smime.xml
@@ -21,7 +21,7 @@
     <para><programlisting>        &lt;dependency&gt;
             &lt;groupId&gt;org.jboss.resteasy&lt;/groupId&gt;
             &lt;artifactId&gt;resteasy-crypto&lt;/artifactId&gt;
-            &lt;version&gt;6.0.1-SNAPSHOT&lt;/version&gt;
+            &lt;version&gt;6.1.0-SNAPSHOT&lt;/version&gt;
         &lt;/dependency&gt;
 
 </programlisting></para>

diff --git a/galleon-feature-pack/pom.xml b/galleon-feature-pack/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.jboss.resteasy</groupId>
         <artifactId>resteasy-jaxrs-all</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -358,8 +358,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.jboss.spec.javax.ws.rs</groupId>
-            <artifactId>jboss-jaxrs-api_3.0_spec</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
         </dependency>
 
         <dependency>

diff --git a/...ture-pack/src/main/resources/modules/system/layers/base/jakarta/ws/rs/api/main/module.xml b/...ture-pack/src/main/resources/modules/system/layers/base/jakarta/ws/rs/api/main/module.xml
@@ -22,7 +22,7 @@
 <module xmlns="urn:jboss:module:1.9" name="jakarta.ws.rs.api">
 
     <resources>
-        <artifact name="${org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_3.0_spec}"/>
+        <artifact name="${jakarta.ws.rs:jakarta.ws.rs-api}"/>
     </resources>
 
     <dependencies>