Update to Quarkus 3.6.7 (#126)

quarkiverse · Jan 26, 2024 · 6759d7b · 6759d7b
1 parent b0580f1
commit 6759d7b
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 50 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,23 +6,28 @@
     <artifactId>quarkiverse-parent</artifactId>
     <version>15</version>
   </parent>
+
   <groupId>io.quarkiverse.microprofile</groupId>
   <artifactId>quarkus-microprofile-parent</artifactId>
   <version>999-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Quarkus - MicroProfile - Parent</name>
+
   <properties>
-    <quarkus.version>3.6.1</quarkus.version>
+    <quarkus.version>3.6.7</quarkus.version>
   </properties>
+
   <scm>
     <connection>scm:git:[email protected]:quarkiverse/quarkus-microprofile.git</connection>
     <developerConnection>scm:git:[email protected]:quarkiverse/quarkus-microprofile.git</developerConnection>
     <url>https://github.com/quarkiverse/quarkus-microprofile</url>
   </scm>
+
   <modules>
     <module>platform</module>
     <module>tck</module>
   </modules>
+
   <build>
     <pluginManagement>
       <plugins>
@@ -31,47 +36,24 @@
           <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
           <version>${quarkus.version}</version>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>${version.surefire.plugin}</version>
-          <configuration>
-            <reuseForks>false</reuseForks>
-            <systemPropertyVariables>
-              <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-            </systemPropertyVariables>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-report-plugin</artifactId>
-          <version>${version.surefire.plugin}</version>
-          <configuration>
-            <aggregate>true</aggregate>
-            <title>Quarkus MicroProfile</title>
-            <outputName>tck-results</outputName>
-            <outputDirectory>${project.build.directory}</outputDirectory>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>uk.co.automatictester</groupId>
-          <artifactId>wiremock-maven-plugin</artifactId>
-          <version>${wiremock.plugin.version}</version>
-          <dependencies>
-            <!-- plugin defines "wiremock" artifactId (in provided scope), not the preferred "wiremock-jre8"
-                 which cannot be forced here, see https://issues.apache.org/jira/browse/MNG-6222 -->
-            <dependency>
-              <groupId>com.github.tomakehurst</groupId>
-              <artifactId>wiremock</artifactId>
-              <version>${wiremock.jre8.version}</version>
-            </dependency>
-          </dependencies>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>
+
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-smallrye-opentracing</artifactId>
+        <version>3.6.2</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-smallrye-opentracing-deployment</artifactId>
+        <version>3.6.2</version>
+      </dependency>
+
       <dependency>
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-bom</artifactId>

diff --git a/tck/jwt/pom.xml b/tck/jwt/pom.xml
@@ -32,7 +32,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.6.1</version>
                 <executions>
                     <execution>
                         <id>unpack-suite-files</id>

diff --git a/tck/pom.xml b/tck/pom.xml
@@ -14,8 +14,9 @@
 
     <properties>
         <maven.version>3.9.6</maven.version>
+        <version.dependency.plugin>3.6.1</version.dependency.plugin>
 
-        <jakarta.cdi.version>4.0.12</jakarta.cdi.version>
+        <jakarta.cdi.version>4.0.13</jakarta.cdi.version>
         <jakarta.rest.version>3.1.4</jakarta.rest.version>
         <jakarta.jsonp.version>2.1.1</jakarta.jsonp.version>
         <jakarta.jsonb.version>3.0.0</jakarta.jsonb.version>
@@ -34,6 +35,39 @@
         <wiremock.jre8.version>2.27.2</wiremock.jre8.version>
     </properties>
 
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>${version.dependency.plugin}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${version.surefire.plugin}</version>
+                    <configuration>
+                        <reuseForks>false</reuseForks>
+                        <systemPropertyVariables>
+                            <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                        </systemPropertyVariables>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-report-plugin</artifactId>
+                    <version>${version.surefire.plugin}</version>
+                    <configuration>
+                        <aggregate>true</aggregate>
+                        <outputName>tck-results</outputName>
+                        <outputDirectory>${project.build.directory}</outputDirectory>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
     <dependencyManagement>
         <dependencies>
             <!-- The Arquillian BOM overrides the Maven dependencies with 3.6.3, but Quarkus requires 3.8.1 -->

diff --git a/tck/rest-client/pom.xml b/tck/rest-client/pom.xml
@@ -33,6 +33,16 @@
             <plugin>
                 <groupId>uk.co.automatictester</groupId>
                 <artifactId>wiremock-maven-plugin</artifactId>
+                <version>${wiremock.plugin.version}</version>
+                <dependencies>
+                    <!-- plugin defines "wiremock" artifactId (in provided scope), not the preferred "wiremock-jre8"
+                         which cannot be forced here, see https://issues.apache.org/jira/browse/MNG-6222 -->
+                    <dependency>
+                        <groupId>com.github.tomakehurst</groupId>
+                        <artifactId>wiremock</artifactId>
+                        <version>${wiremock.jre8.version}</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <phase>generate-test-sources</phase>

diff --git a/tck/rest/exclusions.txt b/tck/rest/exclusions.txt
@@ -1,6 +1,6 @@
-# TCK Challenge
-# Requires https://github.com/jakartaee/rest/pull/1164
-ee.jakarta.tck.ws.rs.ee.rs.container.responsecontext.JAXRSClientIT#setEntityStreamTest
+# Using JUnit 5.10.1 makes tests without @Test annotation to be executed. This didn't happen before Quarkus 3.6.1 and all tests passed.
+ee.jakarta.tck.ws.rs.ee.rs.formparam.locator.JAXRSLocatorClientIT#formParamEntityWithEncodedTest
+ee.jakarta.tck.ws.rs.ee.rs.formparam.sub.JAXRSSubClientIT#formParamEntityWithEncodedTest
 
 # Requires https://github.com/resteasy/resteasy/pull/3722
 ee.jakarta.tck.ws.rs.jaxrs21.ee.sse.sseeventsource.JAXRSClientIT

diff --git a/tck/rest/pom.xml b/tck/rest/pom.xml
@@ -52,15 +52,8 @@
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta-restful-ws-tck</artifactId>
-            <version>3.1.3-1</version>
+            <version>3.1.4</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <repositories>
-        <repository>
-            <id>jakarta</id>
-            <url>https://jakarta.oss.sonatype.org/content/groups/staging/</url>
-        </repository>
-    </repositories>
 </project>