Post-Jakarta migration cleanup, bump TCK runtime to EE 10 versions (#…

…1394) Signed-off-by: Michael Edgar <[email protected]>
smallrye · Mar 5, 2023 · 7969769 · 7969769
1 parent bb4f953
commit 7969769
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 176 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,31 +5,7 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: javax:javaee-api
-    versions:
-    - "< 9, >= 8.a"
-  - dependency-name: org.eclipse.jetty:jetty-bom
-    versions:
-    - ">= 10.a, < 11"
-  - dependency-name: org.eclipse.jetty:jetty-bom
-    versions:
-    - ">= 11.a, < 12"
-  - dependency-name: org.eclipse.jetty:jetty-bom
-    versions:
-    - ">= 9.4.a, < 9.5"
-  - dependency-name: org.eclipse.jetty:jetty-deploy
-    versions:
-    - ">= 10.a, < 11"
-  - dependency-name: org.eclipse.jetty:jetty-deploy
-    versions:
-    - ">= 11.a, < 12"
-  - dependency-name: org.eclipse.jetty:jetty-deploy
-    versions:
-    - ">= 9.4.a, < 9.5"
-  - dependency-name: jakarta.xml.bind:jakarta.xml.bind-api
-    versions:
-    - 3.0.0
+
 - package-ecosystem: gradle
   directory: "/tools/gradle-plugin"
   schedule:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -101,13 +101,8 @@ jobs:
       matrix:
         include:
         - tck-version: "2.0.1"
-          testng-version: "6.14.3"
-          default-properties: false
         - tck-version: "3.0"
-          testng-version: "6.14.3"
-          default-properties: false
         - tck-version: "3.1"
-          default-properties: true
 
     name: MicroProfile OpenAPI TCK ${{ matrix.tck-version }}
     steps:
@@ -130,13 +125,8 @@ jobs:
       - name: build with maven
         run: mvn -B -pl '!testsuite/extra,!tools,!tools/gradle-plugin,!tools/maven-plugin,!ui,!ui/open-api-ui,!ui/open-api-ui-forms' install -DskipTests
 
-      - name: execute specific tck
-        if: ${{ matrix.default-properties == false }}
-        run: mvn -B test -f testsuite/tck/pom.xml -Dsmallrye.commit=$(git rev-parse HEAD) -Dversion.eclipse.microprofile.openapi=${{ matrix.tck-version }} -Dversion.testng=${{ matrix.testng-version }}
-
-      - name: execute default tck
-        if: ${{ matrix.default-properties == true }}
-        run: mvn -B test -f testsuite/tck/pom.xml -Dsmallrye.commit=$(git rev-parse HEAD)
+      - name: execute tck ${{ matrix.tck-version }}
+        run: mvn -B test -f testsuite/tck/pom.xml -Dsmallrye.commit=$(git rev-parse HEAD) -Dversion.eclipse.microprofile.openapi=${{ matrix.tck-version }}
 
       - uses: actions/upload-artifact@v3
         name: tck-report

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -82,13 +82,8 @@ jobs:
       matrix:
         include:
         - tck-version: "2.0.1"
-          testng-version: "6.14.3"
-          default-properties: false
         - tck-version: "3.0"
-          testng-version: "6.14.3"
-          default-properties: false
         - tck-version: "3.1"
-          default-properties: true
 
     name: MicroProfile OpenAPI TCK ${{ matrix.tck-version }}
     steps:
@@ -120,13 +115,8 @@ jobs:
       - name: build with maven
         run: mvn -B -pl '!testsuite/extra,!tools,!tools/gradle-plugin,!tools/maven-plugin,!ui,!ui/open-api-ui,!ui/open-api-ui-forms' install -DskipTests
 
-      - name: execute specific tck
-        if: ${{ matrix.default-properties == false }}
-        run: mvn -B test -f testsuite/tck/pom.xml -Dsmallrye.commit=$(git rev-parse HEAD) -Dversion.eclipse.microprofile.openapi=${{ matrix.tck-version }} -Dversion.testng=${{ matrix.testng-version }}
-
-      - name: execute default tck
-        if: ${{ matrix.default-properties == true }}
-        run: mvn -B test -f testsuite/tck/pom.xml -Dsmallrye.commit=$(git rev-parse HEAD)
+      - name: execute tck ${{ matrix.tck-version }}
+        run: mvn -B test -f testsuite/tck/pom.xml -Dsmallrye.commit=$(git rev-parse HEAD) -Dversion.eclipse.microprofile.openapi=${{ matrix.tck-version }}
 
       - name: stage tck report
         run: mv testsuite/tck/target/surefire-reports/microprofile-openapi-tck-report.html ./microprofile-openapi-tck-report-${{ matrix.tck-version }}.html

diff --git a/extension-jaxrs/pom.xml b/extension-jaxrs/pom.xml
@@ -15,23 +15,6 @@
       <version.parsson.json>1.1.1</version.parsson.json>
     </properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.jboss.resteasy</groupId>
-                <artifactId>resteasy-core-spi</artifactId>
-                <version>${version.resteasy}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-              <groupId>org.jboss.resteasy</groupId>
-              <artifactId>resteasy-multipart-provider</artifactId>
-              <version>${version.resteasy}</version>
-              <scope>test</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <!-- SmallRye core implementation -->
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -28,30 +28,14 @@
         <version.org.skyscreamer>1.5.1</version.org.skyscreamer>
         <version.maven-resources-plugin>3.3.0</version.maven-resources-plugin>
         <version.com.github.eirslett.frontend-maven-plugin>1.12.1</version.com.github.eirslett.frontend-maven-plugin>
-
-        <artifactId.arquillian.jetty>arquillian-jetty-embedded-11</artifactId.arquillian.jetty>
-        <version.arquillian.jetty>1.0.0.Final</version.arquillian.jetty>
-        <version.jetty>11.0.7</version.jetty>
-        <version.resteasy>6.0.0.Final</version.resteasy>
-        <!-- RESTEasy REST Client relocated to another GAV, so these props are for jakarta auto migration -->
-        <groupId.resteasy.client>org.jboss.resteasy.microprofile</groupId.resteasy.client>
-        <artifactId.resteasy.client>microprofile-rest-client</artifactId.resteasy.client>
-        <version.resteasy.client>2.1.0.Final</version.resteasy.client>
         <version.quarkus>2.13.1.Final</version.quarkus>
-        <version.testng>7.4.0</version.testng>
+        <version.testng>7.7.1</version.testng>
+        <version.arquillian.jetty>1.0.0.Final</version.arquillian.jetty>
+        <version.jetty>11.0.14</version.jetty>
 
-        <!--
-            xmlReportPaths must contain an entry for each project that reports coverage.
-            Each module reports execution data in its own target/jacoco.exec. The exec
-            data is then aggregated by testsuite/extra. The list of paths here allows
-            Sonar to find the aggregate report while processing each module.
-          -->
-        <sonar.coverage.jacoco.xmlReportPaths>
-            ${project.basedir}/target/site/jacoco-aggregate/jacoco.xml,
-            ${project.basedir}/../extra/target/site/jacoco-aggregate/jacoco.xml,
-            ${project.basedir}/../testsuite/extra/target/site/jacoco-aggregate/jacoco.xml,
-            ${project.basedir}/testsuite/extra/target/site/jacoco-aggregate/jacoco.xml
-        </sonar.coverage.jacoco.xmlReportPaths>
+        <!-- Use Jakarta EE 10 versions -->
+        <version.resteasy>6.2.3.Final</version.resteasy>
+        <version.weld.core>5.1.0.Final</version.weld.core>
     </properties>
 
     <licenses>
@@ -142,78 +126,50 @@
             </dependency>
 
             <!-- Jakarta EE -->
-            <!-- CDI -->
             <dependency>
-                <groupId>jakarta.enterprise</groupId>
-                <artifactId>jakarta.enterprise.cdi-api</artifactId>
-                <version>3.0.1</version>
+                <groupId>jakarta.platform</groupId>
+                <artifactId>jakarta.jakartaee-bom</artifactId>
+                <version>${version.jakarta.api}</version>
+                <scope>import</scope>
+                <type>pom</type>
             </dependency>
+            <!-- CDI -->
             <dependency>
                 <groupId>javax.enterprise</groupId>
                 <artifactId>cdi-api</artifactId>
                 <version>2.0</version>
             </dependency>
             <!-- JaxRS -->
-            <dependency>
-                <groupId>jakarta.ws.rs</groupId>
-                <artifactId>jakarta.ws.rs-api</artifactId>
-                <version>3.1.0</version>
-            </dependency>
             <dependency>
                 <groupId>javax.ws.rs</groupId>
                 <artifactId>javax.ws.rs-api</artifactId>
                 <version>2.1.1</version>
             </dependency>
             <!-- Bean Validation-->
-            <dependency>
-                <groupId>jakarta.validation</groupId>
-                <artifactId>jakarta.validation-api</artifactId>
-                <version>3.0.2</version>
-            </dependency>
             <dependency>
                 <groupId>javax.validation</groupId>
                 <artifactId>validation-api</artifactId>
                 <version>2.0.1.Final</version>
             </dependency>
             <!-- JsonP -->
-            <dependency>
-                <groupId>jakarta.json</groupId>
-                <artifactId>jakarta.json-api</artifactId>
-                <version>2.1.1</version>
-            </dependency>
             <dependency>
                 <groupId>javax.json</groupId>
                 <artifactId>javax.json-api</artifactId>
                 <version>1.1.4</version>
             </dependency>
             <!-- JsonB -->
-            <dependency>
-                <groupId>jakarta.json.bind</groupId>
-                <artifactId>jakarta.json.bind-api</artifactId>
-                <version>3.0.0</version>
-            </dependency>
             <dependency>
                 <groupId>javax.json.bind</groupId>
                 <artifactId>javax.json.bind-api</artifactId>
                 <version>1.0</version>
             </dependency>
             <!-- JAXB -->
-            <dependency>
-                <groupId>jakarta.xml.bind</groupId>
-                <artifactId>jakarta.xml.bind-api</artifactId>
-                <version>4.0.0</version>
-            </dependency>
             <dependency>
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>
                 <version>2.3.1</version>
             </dependency>
             <!-- Annotation -->
-            <dependency>
-                <groupId>jakarta.annotation</groupId>
-                <artifactId>jakarta.annotation-api</artifactId>
-                <version>2.1.1</version>
-            </dependency>
             <dependency>
                 <groupId>javax.annotation</groupId>
                 <artifactId>javax.annotation-api</artifactId>

diff --git a/testsuite/tck/pom.xml b/testsuite/tck/pom.xml
@@ -26,10 +26,6 @@
   <artifactId>smallrye-open-api-testsuite-tck</artifactId>
   <name>SmallRye: MicroProfile OpenAPI TCK</name>
 
-  <properties>
-    <version.weld.core>4.0.3.Final</version.weld.core>
-  </properties>
-
   <build>
     <plugins>
       <plugin>
@@ -85,7 +81,7 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.arquillian.container</groupId>
-      <artifactId>${artifactId.arquillian.jetty}</artifactId>
+      <artifactId>arquillian-jetty-embedded-11</artifactId>
       <version>${version.arquillian.jetty}</version>
       <scope>test</scope>
       <exclusions>
@@ -153,17 +149,16 @@
       <artifactId>resteasy-json-binding-provider</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>${groupId.resteasy.client}</groupId>
-      <artifactId>${artifactId.resteasy.client}</artifactId>
-      <version>${version.resteasy.client}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>io.smallrye.config</groupId>
       <artifactId>smallrye-config</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.slf4j</groupId>
+      <artifactId>slf4j-jboss-logging</artifactId>
+      <version>1.2.1.Final</version>
+    </dependency>
   </dependencies>
 
   <profiles>

diff --git a/testsuite/tck/src/test/java/io/smallrye/openapi/tck/OpenApiEndpoint.java b/testsuite/tck/src/test/java/io/smallrye/openapi/tck/OpenApiEndpoint.java
@@ -9,6 +9,7 @@
 import java.util.stream.Stream;
 
 import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.servlet.ServletContext;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
@@ -22,6 +23,7 @@
 import io.smallrye.openapi.runtime.io.Format;
 
 @Path("/openapi")
+@ApplicationScoped
 public class OpenApiEndpoint {
     @Context
     ServletContext servletContext;

diff --git a/to-jakarta.sh b/to-jakarta.sh