Merge pull request #314 from quarkusio/2.2-backports

Bump to Quarkus 2.2.3.Final
quarkusio · Sep 16, 2021 · d28406c · d28406c
2 parents 9cc0e81 + 34d062a
commit d28406c
Show file tree

Hide file tree

Showing 30 changed files with 2,354 additions and 1,961 deletions.
diff --git a/generated-platform-project/quarkus-kogito/bom/pom.xml b/generated-platform-project/quarkus-kogito/bom/pom.xml
diff --git a/...t/quarkus-kogito/integration-tests/integration-tests-processes-persistence-common/pom.xml b/...t/quarkus-kogito/integration-tests/integration-tests-processes-persistence-common/pom.xml
@@ -42,6 +42,10 @@
           <artifactId>javax.activation-api</artifactId>
           <groupId>javax.activation</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>jakarta.activation-api</artifactId>
+          <groupId>jakarta.activation</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>jaxb-osgi</artifactId>
           <groupId>com.sun.xml.bind</groupId>
@@ -54,7 +58,7 @@
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-test-utils</artifactId>
+      <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...form-project/quarkus-kogito/integration-tests/integration-tests-quarkus-decisions/pom.xml b/...form-project/quarkus-kogito/integration-tests/integration-tests-quarkus-decisions/pom.xml
@@ -47,6 +47,10 @@
           <artifactId>javax.activation-api</artifactId>
           <groupId>javax.activation</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>jakarta.activation-api</artifactId>
+          <groupId>jakarta.activation</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>jaxb-osgi</artifactId>
           <groupId>com.sun.xml.bind</groupId>
@@ -82,7 +86,7 @@
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-test-utils</artifactId>
+      <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...rm-project/quarkus-kogito/integration-tests/integration-tests-quarkus-predictions/pom.xml b/...rm-project/quarkus-kogito/integration-tests/integration-tests-quarkus-predictions/pom.xml
@@ -47,6 +47,10 @@
           <artifactId>javax.activation-api</artifactId>
           <groupId>javax.activation</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>jakarta.activation-api</artifactId>
+          <groupId>jakarta.activation</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>jaxb-osgi</artifactId>
           <groupId>com.sun.xml.bind</groupId>
@@ -82,7 +86,7 @@
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-test-utils</artifactId>
+      <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...t/quarkus-kogito/integration-tests/integration-tests-quarkus-processes-infinispan/pom.xml b/...t/quarkus-kogito/integration-tests/integration-tests-quarkus-processes-infinispan/pom.xml
@@ -48,6 +48,10 @@
           <artifactId>javax.activation-api</artifactId>
           <groupId>javax.activation</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>jakarta.activation-api</artifactId>
+          <groupId>jakarta.activation</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>jaxb-osgi</artifactId>
           <groupId>com.sun.xml.bind</groupId>
@@ -60,7 +64,7 @@
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-test-utils</artifactId>
+      <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...project/quarkus-kogito/integration-tests/integration-tests-quarkus-processes-jdbc/pom.xml b/...project/quarkus-kogito/integration-tests/integration-tests-quarkus-processes-jdbc/pom.xml
@@ -51,6 +51,10 @@
           <artifactId>javax.activation-api</artifactId>
           <groupId>javax.activation</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>jakarta.activation-api</artifactId>
+          <groupId>jakarta.activation</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>jaxb-osgi</artifactId>
           <groupId>com.sun.xml.bind</groupId>
@@ -63,7 +67,7 @@
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-test-utils</artifactId>
+      <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...us-kogito/integration-tests/integration-tests-quarkus-processes-kafka-persistence/pom.xml b/...us-kogito/integration-tests/integration-tests-quarkus-processes-kafka-persistence/pom.xml
@@ -51,6 +51,10 @@
           <artifactId>javax.activation-api</artifactId>
           <groupId>javax.activation</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>jakarta.activation-api</artifactId>
+          <groupId>jakarta.activation</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>jaxb-osgi</artifactId>
           <groupId>com.sun.xml.bind</groupId>
@@ -63,7 +67,7 @@
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-test-utils</artifactId>
+      <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...ject/quarkus-kogito/integration-tests/integration-tests-quarkus-processes-mongodb/pom.xml b/...ject/quarkus-kogito/integration-tests/integration-tests-quarkus-processes-mongodb/pom.xml
@@ -51,6 +51,10 @@
           <artifactId>javax.activation-api</artifactId>
           <groupId>javax.activation</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>jakarta.activation-api</artifactId>
+          <groupId>jakarta.activation</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>jaxb-osgi</artifactId>
           <groupId>com.sun.xml.bind</groupId>
@@ -63,7 +67,7 @@
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-test-utils</artifactId>
+      <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...t/quarkus-kogito/integration-tests/integration-tests-quarkus-processes-postgresql/pom.xml b/...t/quarkus-kogito/integration-tests/integration-tests-quarkus-processes-postgresql/pom.xml
@@ -51,6 +51,10 @@
           <artifactId>javax.activation-api</artifactId>
           <groupId>javax.activation</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>jakarta.activation-api</artifactId>
+          <groupId>jakarta.activation</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>jaxb-osgi</artifactId>
           <groupId>com.sun.xml.bind</groupId>
@@ -63,7 +67,7 @@
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-test-utils</artifactId>
+      <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...platform-project/quarkus-kogito/integration-tests/integration-tests-quarkus-rules/pom.xml b/...platform-project/quarkus-kogito/integration-tests/integration-tests-quarkus-rules/pom.xml
@@ -47,6 +47,10 @@
           <artifactId>javax.activation-api</artifactId>
           <groupId>javax.activation</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>jakarta.activation-api</artifactId>
+          <groupId>jakarta.activation</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>jaxb-osgi</artifactId>
           <groupId>com.sun.xml.bind</groupId>
@@ -82,7 +86,7 @@
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-test-utils</artifactId>
+      <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...roject/quarkus-kogito/integration-tests/kogito-quarkus-decisions-integration-test/pom.xml b/...roject/quarkus-kogito/integration-tests/kogito-quarkus-decisions-integration-test/pom.xml
@@ -47,6 +47,10 @@
           <artifactId>javax.activation-api</artifactId>
           <groupId>javax.activation</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>jakarta.activation-api</artifactId>
+          <groupId>jakarta.activation</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>jaxb-osgi</artifactId>
           <groupId>com.sun.xml.bind</groupId>

diff --git a/...ct/quarkus-kogito/integration-tests/kogito-quarkus-integration-test-maven-devmode/pom.xml b/...ct/quarkus-kogito/integration-tests/kogito-quarkus-integration-test-maven-devmode/pom.xml
@@ -50,6 +50,10 @@
           <artifactId>javax.activation-api</artifactId>
           <groupId>javax.activation</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>jakarta.activation-api</artifactId>
+          <groupId>jakarta.activation</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>jaxb-osgi</artifactId>
           <groupId>com.sun.xml.bind</groupId>
@@ -63,7 +67,7 @@
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-test-maven</artifactId>
-      <version>2.1.0.Final</version>
+      <version>2.2.2.Final</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...platform-project/quarkus-kogito/integration-tests/kogito-quarkus-integration-test/pom.xml b/...platform-project/quarkus-kogito/integration-tests/kogito-quarkus-integration-test/pom.xml
@@ -47,6 +47,10 @@
           <artifactId>javax.activation-api</artifactId>
           <groupId>javax.activation</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>jakarta.activation-api</artifactId>
+          <groupId>jakarta.activation</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>jaxb-osgi</artifactId>
           <groupId>com.sun.xml.bind</groupId>

diff --git a/...ject/quarkus-kogito/integration-tests/kogito-quarkus-predictions-integration-test/pom.xml b/...ject/quarkus-kogito/integration-tests/kogito-quarkus-predictions-integration-test/pom.xml
@@ -47,6 +47,10 @@
           <artifactId>javax.activation-api</artifactId>
           <groupId>javax.activation</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>jakarta.activation-api</artifactId>
+          <groupId>jakarta.activation</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>jaxb-osgi</artifactId>
           <groupId>com.sun.xml.bind</groupId>

diff --git a/...ct/quarkus-kogito/integration-tests/kogito-quarkus-rules-integration-test-session/pom.xml b/...ct/quarkus-kogito/integration-tests/kogito-quarkus-rules-integration-test-session/pom.xml
@@ -42,6 +42,10 @@
           <artifactId>javax.activation-api</artifactId>
           <groupId>javax.activation</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>jakarta.activation-api</artifactId>
+          <groupId>jakarta.activation</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>jaxb-osgi</artifactId>
           <groupId>com.sun.xml.bind</groupId>

diff --git a/...rm-project/quarkus-kogito/integration-tests/kogito-quarkus-rules-integration-test/pom.xml b/...rm-project/quarkus-kogito/integration-tests/kogito-quarkus-rules-integration-test/pom.xml
@@ -47,6 +47,10 @@
           <artifactId>javax.activation-api</artifactId>
           <groupId>javax.activation</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>jakarta.activation-api</artifactId>
+          <groupId>jakarta.activation</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>jaxb-osgi</artifactId>
           <groupId>com.sun.xml.bind</groupId>

diff --git a/...rkus-kogito/integration-tests/kogito-quarkus-serverless-workflow-integration-test/pom.xml b/...rkus-kogito/integration-tests/kogito-quarkus-serverless-workflow-integration-test/pom.xml
@@ -47,6 +47,10 @@
           <artifactId>javax.activation-api</artifactId>
           <groupId>javax.activation</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>jakarta.activation-api</artifactId>
+          <groupId>jakarta.activation</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>jaxb-osgi</artifactId>
           <groupId>com.sun.xml.bind</groupId>

diff --git a/generated-platform-project/quarkus-maven-plugin/pom.xml b/generated-platform-project/quarkus-maven-plugin/pom.xml
@@ -23,7 +23,7 @@
               <goal>attach-maven-plugin</goal>
             </goals>
             <configuration>
-              <originalPluginCoords>io.quarkus:quarkus-maven-plugin:2.2.2.Final</originalPluginCoords>
+              <originalPluginCoords>io.quarkus:quarkus-maven-plugin:2.2.3.Final</originalPluginCoords>
               <targetPluginCoords>io.quarkus.platform:quarkus-maven-plugin:999-SNAPSHOT</targetPluginCoords>
             </configuration>
           </execution>