Merge pull request #3745 from jamezp/version-update

Update the minimum Java version to 17 and bump the version to 7.0.0.Alpha1
resteasy · Aug 10, 2023 · 5b7a255 · 5b7a255
2 parents 7d8ce1d + 47fd16e
commit 5b7a255
Show file tree

Hide file tree

Showing 76 changed files with 222 additions and 101 deletions.
diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml
@@ -13,7 +13,7 @@ on:
       javaVersion:
         description: "Java Version"
         required: true
-        default: "11"
+        default: "17"
         type: string
 
 jobs:

diff --git a/.github/workflows/manual-wildfly-build.yml b/.github/workflows/manual-wildfly-build.yml
@@ -13,7 +13,7 @@ on:
       javaVersion:
         description: "Java Version"
         required: true
-        default: "11"
+        default: "17"
         type: string
       wildfly-branch:
         description: "WildFly Branch"

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -5,8 +5,8 @@ name: Build and Test RESTEasy
 
 on:
   push:
-    branches-ignore:
-      - 'dependabot/**'
+    branches:
+      - 'main'
     paths-ignore:
       - '.gitignore'
       - ".github/workflows/manual-*.yml"
@@ -57,7 +57,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest ]
-        java: ['11', '17']
+        java: ['17']
         wildfly-version: ['28.0.1.Final', '29.0.0.Final']
 
     steps:
@@ -88,7 +88,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: ['11']
+        java: ['17']
         wildfly-version: ['28.0.1.Final', '29.0.0.Final']
         profile:
           - '-Dsecurity.manager'
@@ -121,13 +121,13 @@ jobs:
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
           cache: 'maven'
-      - name: Build Java Docs with Java 11
+      - name: Build Java Docs with Java 17
         run: |
           mvn clean install -B -DskipTests
           mvn clean site -B -DskipTests
@@ -138,10 +138,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
           cache: 'maven'
       - name: Validate Formatting

diff --git a/.github/workflows/resteasy-tck.yml b/.github/workflows/resteasy-tck.yml
@@ -0,0 +1,115 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Jakarta REST TCK
+
+on:
+  push:
+    branches:
+      - 'main'
+    paths-ignore:
+      - '.gitignore'
+      - ".github/workflows/manual-*.yml"
+      - ".mvn/**"
+      - "docbook/**"
+      - "distribution/**"
+      - "CODEOWNERS"
+      - "CODE_OF_CONDUCT.md"
+      - "CONTRIBUTING.adoc"
+      - "dco.txt"
+      - "LICENSE"
+      - "mvnw"
+      - "mvnw.cmd"
+      - "README.md"
+      - "SECURITY.md"
+      - "**/README.MD"
+  pull_request:
+    branches:
+      - '**'
+    paths-ignore:
+      - '.gitignore'
+      - ".github/workflows/manual-*.yml"
+      - ".mvn/**"
+      - "docbook/**"
+      - "distribution/**"
+      - "CODEOWNERS"
+      - "CODE_OF_CONDUCT.md"
+      - "CONTRIBUTING.adoc"
+      - "dco.txt"
+      - "LICENSE"
+      - "mvnw"
+      - "mvnw.cmd"
+      - "README.md"
+      - "SECURITY.md"
+      - "**/README.MD"
+  schedule:
+    - cron: '0 0 * * *' # Every day at 00:00 UTC
+  workflow_dispatch:
+    inputs:
+      os:
+        description: "Runner OS"
+        required: true
+        default: "ubuntu-latest"
+        type: string
+      javaVersion:
+        description: "Java Version"
+        required: true
+        default: "17"
+        type: string
+
+# Only run the latest job
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+jobs:
+  run-tck:
+
+    runs-on: ubuntu-latest
+    timeout-minutes: 90
+    strategy:
+      fail-fast: false
+      matrix:
+        java: ['17', '21-ea']
+
+    steps:
+      - name: Checkout RESTEasy
+        uses: actions/checkout@v3
+        with:
+          path: resteasy
+      - name: Checkout RESTEasy TCK Runner
+        uses: actions/checkout@v3
+        with:
+          repository: resteasy/resteasy-tck-runner
+          path: resteasy-tck-runner
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v3
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'temurin'
+          cache: 'maven'
+      - name: Build RESTEasy - JDK ${{ matrix.java }}
+        id: resteasy-build
+        run:  |
+          cd resteasy
+          mvn clean install -U -B -fae -DskipTests
+          RESTEASY_VERSION="$(mvn -B help:evaluate -Dexpression=project.version -DforceStdout -q)"
+          echo "RESTEASY_VERSION=$RESTEASY_VERSION"
+          echo "RESTEASY_VERSION=$RESTEASY_VERSION" >> "$GITHUB_OUTPUT"
+      - name: Run the Jakarta REST TCK - JDK ${{ matrix.java }}
+        run:  |
+          echo "RESTEASY_VERSION=${{ steps.resteasy-build.outputs.RESTEASY_VERSION }}"
+          cd resteasy-tck-runner
+          mvn clean install -U -B -fae -Dtck.debug.log=true -Dversion.org.jboss.resteasy="${{ steps.resteasy-build.outputs.RESTEASY_VERSION }}"
+      - uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: test-reports-${{ matrix.os }}-${{ matrix.java }}
+          path: |
+            '**/surefire-reports/'
+            '**/failsafe-reports/'
+      - uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: server-logs-${{ matrix.os }}-${{ matrix.java }}
+          path: '**/server.log'
diff --git a/.github/workflows/shared-resteasy-build.yml b/.github/workflows/shared-resteasy-build.yml
@@ -33,10 +33,10 @@
 #      - name: Set up JDK ${{ inputs.javaVersion }}
 #        uses: actions/setup-java@v3
 #        with:
-#          java-version: 11
+#          java-version: 17
 #          distribution: 'temurin'
 #          cache: 'maven'
-#      - name: Build on Linux with Java 11 using RESTEasy ${{ needs.resteasy-build.outputs.resteasy-version }}
+#      - name: Build on Linux with Java 178 using RESTEasy ${{ needs.resteasy-build.outputs.resteasy-version }}
 #        run: mvn clean verify '-Dversion.dev.resteasy=${{ needs.resteasy-build.outputs.resteasy-version }}'
 
 name: Build RESTEasy Upstream
@@ -70,10 +70,10 @@ jobs:
         with:
           repository: ${{ inputs.resteasy-repo }}
           ref: ${{ inputs.resteasy-branch }}
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
           cache: 'maven'
       - name: Build RESTEasy

diff --git a/.github/workflows/wildfly-build.yml b/.github/workflows/wildfly-build.yml
@@ -44,7 +44,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        java: ['11', '17', '21-ea']
+        java: ['17', '21-ea']
 
     steps:
       - uses: actions/checkout@v3
@@ -83,7 +83,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: ['11', '21-ea']
+        java: ['17', '21-ea']
         profile:
           - '-Dsecurity.manager'
           - '-Dprovision.preview'

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.3.0.Alpha1-SNAPSHOT</version>
+    <version>7.0.0.Alpha1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>RESTEASY-1056-jetty-bv11</artifactId>

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.3.0.Alpha1-SNAPSHOT</version>
+    <version>7.0.0.Alpha1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>RESTEASY-1630-jetty-resteasy-servlet-initializer</artifactId>

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.3.0.Alpha1-SNAPSHOT</version>
+    <version>7.0.0.Alpha1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>RESTEASY-736-jetty</artifactId>

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.3.0.Alpha1-SNAPSHOT</version>
+        <version>7.0.0.Alpha1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <name>RESTEasy Misc Arquillian-based tests</name>

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.3.0.Alpha1-SNAPSHOT</version>
+        <version>7.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 
     <artifactId>resteasy-dist</artifactId>

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.3.0.Alpha1-SNAPSHOT</version>
+        <version>7.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 
     <artifactId>resteasy-src-dist</artifactId>

diff --git a/docbook/pom.xml b/docbook/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>org.jboss.resteasy</groupId>
     <artifactId>resteasy-reference-guide</artifactId>
-    <version>6.3.0.Alpha1-SNAPSHOT</version>
+    <version>7.0.0.Alpha1-SNAPSHOT</version>
     <packaging>jdocbook</packaging>
     <name>RESTEasy Reference Guide</name>
     <description/>

diff --git a/docbook/reference/en/en-US/master.xml b/docbook/reference/en/en-US/master.xml
@@ -71,7 +71,7 @@
    <bookinfo>
       <title>RESTEasy</title>
       <subtitle>Jakarta RESTFul Web Services</subtitle>
-      <releaseinfo>6.3.0.Alpha1-SNAPSHOT</releaseinfo>
+      <releaseinfo>7.0.0.Alpha1-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.3.0.Alpha1-SNAPSHOT]]></programlisting>
+                <programlisting><![CDATA[$ galleon.sh install org.jboss.resteasy:galleon-feature-pack:7.0.0.Alpha1-SNAPSHOT]]></programlisting>
             </para>
             <para>
                 If you are using Maven to provision WildFly you can simply add the feature pack to your plugin configuration.
@@ -278,7 +278,7 @@
             <feature-pack>
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>galleon-feature-pack</artifactId>
-                <version>6.3.0.Alpha1-SNAPSHOT</version>
+                <version>7.0.0.Alpha1-SNAPSHOT</version>
             </feature-pack>
         </feature-packs>
     </configuration>
@@ -365,17 +365,17 @@ public class MyApplication extends Application
 <dependency>
     <groupId>org.jboss.resteasy</groupId>
     <artifactId>resteasy-core</artifactId>
-    <version>6.3.0.Alpha1-SNAPSHOT</version>
+    <version>7.0.0.Alpha1-SNAPSHOT</version>
 </dependency>
 <dependency>
     <groupId>org.jboss.resteasy</groupId>
     <artifactId>resteasy-client</artifactId>
-    <version>6.3.0.Alpha1-SNAPSHOT</version>
+    <version>7.0.0.Alpha1-SNAPSHOT</version>
 </dependency>
 <dependency>
     <groupId>org.jboss.resteasy</groupId>
     <artifactId>resteasy-jaxb-provider</artifactId>
-    <version>6.3.0.Alpha1-SNAPSHOT</version>
+    <version>7.0.0.Alpha1-SNAPSHOT</version>
 </dependency>
 ]]></programlisting>
         <para>
@@ -408,7 +408,7 @@ public class MyApplication extends Application
 <dependency>
     <groupId>org.jboss.resteasy</groupId>
     <artifactId>resteasy-servlet-initializer</artifactId>
-    <version>6.3.0.Alpha1-SNAPSHOT</version>
+    <version>7.0.0.Alpha1-SNAPSHOT</version>
 </dependency>
 ]]></programlisting>
         </section>
@@ -1363,12 +1363,12 @@ String value = ConfigProvider.getConfig().getOptionalValue("prop_name", String.c
 <dependency>
     <groupId>org.jboss.resteasy</groupId>
     <artifactId>resteasy-core</artifactId>
-    <version>6.3.0.Alpha1-SNAPSHOT</version>
+    <version>7.0.0.Alpha1-SNAPSHOT</version>
 </dependency>
 <dependency>
     <groupId>org.jboss.resteasy</groupId>
     <artifactId>resteasy-client</artifactId>
-    <version>6.3.0.Alpha1-SNAPSHOT</version>
+    <version>7.0.0.Alpha1-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.3.0.Alpha1-SNAPSHOT</version>
+   <version>7.0.0.Alpha1-SNAPSHOT</version>
 </dependency>
 ]]></programlisting>
 </chapter>

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