Quarkus LTS Upgrade to 3.8.4 (apache#5853)

* Upgrade to and align with Quarkus 3.8.2 LTS release. * Upgrade to and align with Quarkus 3.8.2 LTS release. * Upgrade to and align with Quarkus 3.8.4 LTS release. * Remove unnecessary util class, as Quarkus 3.8.x does not have the issue anymore.
rgdoliveira · May 7, 2024 · 6443dda · 6443dda
1 parent 0978f7e
commit 6443dda
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 340 deletions.
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
diff --git a/drools-persistence/drools-persistence-jpa/pom.xml b/drools-persistence/drools-persistence-jpa/pom.xml
@@ -202,7 +202,7 @@
     </dependency>
     <dependency>
       <groupId>org.jboss</groupId>
-      <artifactId>jboss-transaction-spi-jakarta</artifactId>
+      <artifactId>jboss-transaction-spi</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/drools-quarkus-extension/drools-quarkus-deployment/pom.xml b/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
@@ -178,29 +178,6 @@
                     </execution>
                 </executions>
             </plugin>
-          <plugin>
-            <!-- Remove comments from META-INF/quarkus-javadoc.properties -->
-            <!-- This is needed because the file generated by quarkus contains a timestamp in a comment that makes the build not reproducible -->
-            <!-- This workaround can be removed when drools will be migrated to quarkus release containing this fix https://github.com/quarkusio/quarkus/pull/38365 -->
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <version>3.1.1</version>
-            <executions>
-              <execution>
-                <id>Run Script</id>
-                <phase>prepare-package</phase>
-                <goals>
-                  <goal>java</goal>
-                </goals>
-                <configuration>
-                  <mainClass>org.drools.util.RemoveCommentsMain</mainClass>
-                  <arguments>
-                    <argument>${project.basedir}/target/classes/META-INF/quarkus-javadoc.properties</argument>
-                  </arguments>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
     </build>
 </project>
diff --git a/drools-quarkus-extension/drools-quarkus/pom.xml b/drools-quarkus-extension/drools-quarkus/pom.xml
@@ -149,29 +149,6 @@
                 <groupId>io.smallrye</groupId>
                 <artifactId>jandex-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <!-- Remove comments from META-INF/quarkus-extension.properties -->
-                <!-- This is needed because the file generated by quarkus contains a timestamp in a comment that makes the build not reproducible -->
-                <!-- This workaround can be removed when drools will be migrated to quarkus release containing this fix https://github.com/quarkusio/quarkus/pull/38365 -->
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>3.1.1</version>
-                <executions>
-                    <execution>
-                        <id>Run Script</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                        <configuration>
-                            <mainClass>org.drools.util.RemoveCommentsMain</mainClass>
-                            <arguments>
-                                <argument>${project.basedir}/target/classes/META-INF/quarkus-extension.properties</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/drools-traits/pom.xml b/drools-traits/pom.xml
@@ -157,7 +157,7 @@
     </dependency>
     <dependency>
       <groupId>org.jboss</groupId>
-      <artifactId>jboss-transaction-spi-jakarta</artifactId>
+      <artifactId>jboss-transaction-spi</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/drools-util/src/main/java/org/drools/util/RemoveCommentsMain.java b/drools-util/src/main/java/org/drools/util/RemoveCommentsMain.java
diff --git a/drools-util/src/test/java/org/drools/util/RemoveCommentsTest.java b/drools-util/src/test/java/org/drools/util/RemoveCommentsTest.java
diff --git a/kie-internal/pom.xml b/kie-internal/pom.xml
@@ -89,6 +89,12 @@
       <groupId>com.sun.xml.bind</groupId>
       <artifactId>jaxb-xjc</artifactId>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.sun.xml.bind</groupId>
+          <artifactId>jaxb-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>

diff --git a/kie-test-util/pom.xml b/kie-test-util/pom.xml
@@ -87,7 +87,7 @@
     </dependency>
     <dependency>
       <groupId>org.jboss</groupId>
-      <artifactId>jboss-transaction-spi-jakarta</artifactId>
+      <artifactId>jboss-transaction-spi</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>