diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index a63653408306..e12be4ed1a2d 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -37,6 +37,8 @@
     <maven.compiler.release>17</maven.compiler.release>
 
     <surefire.forkCount>1</surefire.forkCount>
+    <!-- Default empty value so @{argLine} in surefire/failsafe resolves to "" when JaCoCo is not active -->
+    <argLine></argLine>
     <alphanetworkCompilerEnabled>false</alphanetworkCompilerEnabled>
 
     <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
@@ -52,10 +54,10 @@
       - Version properties must be sorted alphabetically (other form of sorting were found to be unclear and ambiguous).
     -->
     <version.ch.qos.logback>1.5.35</version.ch.qos.logback>
-    <version.commons-codec>1.19.0</version.commons-codec>
+    <version.commons-codec>1.21.0</version.commons-codec>
     <version.commons-collections>3.2.2</version.commons-collections>
     <version.commons-logging>1.1.1</version.commons-logging>
-    <version.commons-io>2.20.0</version.commons-io>
+    <version.commons-io>2.21.0</version.commons-io>
     <version.common-text>1.14.0</version.common-text>
     <version.com.fasterxml.jackson>2.21.5</version.com.fasterxml.jackson>
     <version.com.fasterxml.jackson.databind>2.22.1</version.com.fasterxml.jackson.databind>
@@ -70,11 +72,11 @@
     <version.com.thoughtworks.xstream>1.4.21</version.com.thoughtworks.xstream>
     <version.guru.nidi>0.18.0</version.guru.nidi>
     <version.info.picocli>4.7.7</version.info.picocli>
-    <version.io.micrometer>1.14.12</version.io.micrometer>
-    <version.io.quarkus>3.27.4.1</version.io.quarkus>
+    <version.io.micrometer>1.16.6</version.io.micrometer>
+    <version.io.quarkus>3.33.3</version.io.quarkus>
     <version.io.netty>4.1.136.Final</version.io.netty>
-    <version.io.smallrye.openapi.core>4.0.12</version.io.smallrye.openapi.core>
-    <version.io.smallrye.config.core>3.13.4</version.io.smallrye.config.core>
+    <version.io.smallrye.openapi.core>4.2.4</version.io.smallrye.openapi.core>
+    <version.io.smallrye.config.core>3.16.0</version.io.smallrye.config.core>
     <version.org.apache.kafka>4.1.2</version.org.apache.kafka>
 
     <version.it.unimi.dsi.fastutil>8.5.11</version.it.unimi.dsi.fastutil>
@@ -84,7 +86,7 @@
     <version.org.antlr>3.5.2</version.org.antlr>
     <version.org.antlr.ST4>4.0.7</version.org.antlr.ST4>
     <version.org.apache.ant>1.10.11</version.org.apache.ant>
-    <version.org.apache.commons.lang3>3.18.0</version.org.apache.commons.lang3>
+    <version.org.apache.commons.lang3>3.20.0</version.org.apache.commons.lang3>
     <version.org.apache.commons.math3>3.6.1</version.org.apache.commons.math3>
     <version.org.apache.httpcomponents.httpcore>4.4.16</version.org.apache.httpcomponents.httpcore>
     <version.org.apache.maven>3.9.11</version.org.apache.maven>
@@ -115,14 +117,14 @@
     <version.jakarta.annotation-api>3.0.0</version.jakarta.annotation-api>
     <version.jakarta.transaction-api>2.0.1</version.jakarta.transaction-api>
     <version.jakarta.persistence-api>3.2.0</version.jakarta.persistence-api>
-    <version.jakarta.xml.bind-api>4.0.4</version.jakarta.xml.bind-api>
+    <version.jakarta.xml.bind-api>4.0.5</version.jakarta.xml.bind-api>
     <version.jakarta.json.bind-api>3.0.1</version.jakarta.json.bind-api>
     <version.jakarta.json>1.1.7</version.jakarta.json>
     <version.jakarta.json-api>2.1.3</version.jakarta.json-api>
     <version.org.apache.openjpa>4.0.0</version.org.apache.openjpa>
     <version.org.jpmml.model>1.6.4</version.org.jpmml.model> <!-- jpmml-model BSD 3C license - ATTENTION 1.5.1 intentional, because 1.5.1 evaluators works with 1.5.1 -->
-    <version.org.junit.jupiter>5.13.4</version.org.junit.jupiter>
-    <version.org.junit.platform>1.13.4</version.org.junit.platform> <!-- Keep synchronized with junit-jupiter (middle and minor should be the same) -->
+    <version.org.junit.jupiter>6.0.3</version.org.junit.jupiter>
+    <version.org.junit.platform>6.0.3</version.org.junit.platform> <!-- JUnit 6 uses a unified version across all modules -->
     <version.org.mvel>2.5.2.Final</version.org.mvel>
     <version.org.powermock>2.0.9</version.org.powermock>
     <version.org.slf4j>2.0.17</version.org.slf4j>
@@ -145,7 +147,7 @@
     <version.org.asciidoctor.asciidoctorj>2.2.0</version.org.asciidoctor.asciidoctorj>
     <version.org.asciidoctor.asciidoctorj-pdf>1.5.0</version.org.asciidoctor.asciidoctorj-pdf>
     <version.org.w3c.dom>2.3.0-jaxb-1.0.6</version.org.w3c.dom>
-    <version.org.mockito>5.18.0</version.org.mockito>
+    <version.org.mockito>5.21.0</version.org.mockito>
     <!-- Version of JMH -->
     <version.org.openjdk.jmh>1.21</version.org.openjdk.jmh>
 
@@ -186,16 +188,16 @@
     <version.compiler.plugin>3.13.0</version.compiler.plugin>
     <version.shade.plugin>3.3.0</version.shade.plugin>
 
-    <version.net.byte-buddy>1.17.6</version.net.byte-buddy>
+    <version.net.byte-buddy>1.17.8</version.net.byte-buddy>
 
-    <version.org.postgresql>42.7.12</version.org.postgresql>
+    <version.org.postgresql>42.7.13</version.org.postgresql>
 
     <version.ch.obermuhlner>2.0.1</version.ch.obermuhlner>
-    <version.io.smallrye.jandex>3.4.0</version.io.smallrye.jandex>
+    <version.io.smallrye.jandex>3.5.3</version.io.smallrye.jandex>
     <version.org.eclipse.yasson>3.0.4</version.org.eclipse.yasson>
     <version.org.yaml.snakeyaml>2.6</version.org.yaml.snakeyaml>
 
-    <version.com.github.javaparser>3.27.0</version.com.github.javaparser>
+    <version.com.github.javaparser>3.28.0</version.com.github.javaparser>
 
     <version.com.google.guava>33.4.8-jre</version.com.google.guava>
 
@@ -222,14 +224,14 @@
     <version.archunit.maven.plugin>4.0.2</version.archunit.maven.plugin>
     <version.archunit.junit5>1.4.0</version.archunit.junit5>
 
-    <version.io.vertx>4.5.28</version.io.vertx>
+    <version.io.vertx>4.5.31</version.io.vertx>
     <version.org.codehaus.plexus.plexus-utils>3.6.1</version.org.codehaus.plexus.plexus-utils>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <!-- Version overrides to fix vulnerabilities. -->
-      <!-- Override vertx-core version from Quarkus 3.27.3 BOM (CVE fix) -->
+      <!-- Override vertx-core version from Quarkus 3.33.3 BOM (CVE fix) -->
       <dependency>
         <groupId>io.vertx</groupId>
         <artifactId>vertx-core</artifactId>
@@ -1667,7 +1669,7 @@
             <excludes>
               <exclude>**/*IntegrationTest.java</exclude>
             </excludes>
-            <argLine>-Xmx1024m -Dfile.encoding=UTF-8</argLine>
+            <argLine>@{argLine} -Xmx1024m -Dfile.encoding=UTF-8</argLine>
             <systemPropertyVariables>
               <apple.awt.UIElement>true</apple.awt.UIElement>
               <org.uberfire.nio.git.daemon.enabled>false</org.uberfire.nio.git.daemon.enabled>
@@ -1692,7 +1694,7 @@
               <include>**/*IntegrationTest.java</include>
               <include>**/*IT.java</include>
             </includes>
-            <argLine>-Xmx1024m -Dfile.encoding=UTF-8</argLine>
+            <argLine>@{argLine} -Xmx1024m -Dfile.encoding=UTF-8</argLine>
           </configuration>
         </plugin>
         <plugin>
@@ -2427,14 +2429,14 @@
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-surefire-plugin</artifactId>
               <configuration>
-                <argLine>-Xmx1024m -Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US</argLine>
+                <argLine>@{argLine} -Xmx1024m -Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US</argLine>
               </configuration>
             </plugin>
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-failsafe-plugin</artifactId>
               <configuration>
-                <argLine>-Xmx1024m -Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US</argLine>
+                <argLine>@{argLine} -Xmx1024m -Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US</argLine>
               </configuration>
             </plugin>
           </plugins>
diff --git a/drools-model/drools-mvel-parser/src/main/java/org/drools/mvel/parser/ast/visitor/DrlGenericVisitor.java b/drools-model/drools-mvel-parser/src/main/java/org/drools/mvel/parser/ast/visitor/DrlGenericVisitor.java
index c3ba2ae7b122..8d37c8ad2fb4 100644
--- a/drools-model/drools-mvel-parser/src/main/java/org/drools/mvel/parser/ast/visitor/DrlGenericVisitor.java
+++ b/drools-model/drools-mvel-parser/src/main/java/org/drools/mvel/parser/ast/visitor/DrlGenericVisitor.java
@@ -40,8 +40,9 @@
 import com.github.javaparser.ast.body.RecordDeclaration;
 import com.github.javaparser.ast.body.VariableDeclarator;
 import com.github.javaparser.ast.comments.BlockComment;
-import com.github.javaparser.ast.comments.JavadocComment;
 import com.github.javaparser.ast.comments.LineComment;
+import com.github.javaparser.ast.comments.MarkdownComment;
+import com.github.javaparser.ast.comments.TraditionalJavadocComment;
 import com.github.javaparser.ast.expr.ArrayAccessExpr;
 import com.github.javaparser.ast.expr.ArrayCreationExpr;
 import com.github.javaparser.ast.expr.ArrayInitializerExpr;
@@ -68,6 +69,7 @@
 import com.github.javaparser.ast.expr.NormalAnnotationExpr;
 import com.github.javaparser.ast.expr.NullLiteralExpr;
 import com.github.javaparser.ast.expr.ObjectCreationExpr;
+import com.github.javaparser.ast.expr.MatchAllPatternExpr;
 import com.github.javaparser.ast.expr.RecordPatternExpr;
 import com.github.javaparser.ast.expr.SimpleName;
 import com.github.javaparser.ast.expr.SingleMemberAnnotationExpr;
@@ -251,7 +253,12 @@ default R visit(InitializerDeclaration n, A arg) {
     }
 
     @Override
-    default R visit(JavadocComment n, A arg) {
+    default R visit(TraditionalJavadocComment n, A arg) {
+        return defaultMethod(n, arg);
+    }
+
+    @Override
+    default R visit(MarkdownComment n, A arg) {
         return defaultMethod(n, arg);
     }
 
@@ -688,4 +695,9 @@ default R visit(TypePatternExpr n, A arg) {
     default R visit(RecordPatternExpr n, A arg) {
         return defaultMethod(n, arg);
     }
+
+    @Override
+    default R visit(MatchAllPatternExpr n, A arg) {
+        return defaultMethod(n, arg);
+    }
 }
diff --git a/drools-model/drools-mvel-parser/src/main/java/org/drools/mvel/parser/ast/visitor/DrlVoidVisitor.java b/drools-model/drools-mvel-parser/src/main/java/org/drools/mvel/parser/ast/visitor/DrlVoidVisitor.java
index 763071768df1..1adafee87881 100644
--- a/drools-model/drools-mvel-parser/src/main/java/org/drools/mvel/parser/ast/visitor/DrlVoidVisitor.java
+++ b/drools-model/drools-mvel-parser/src/main/java/org/drools/mvel/parser/ast/visitor/DrlVoidVisitor.java
@@ -39,8 +39,9 @@
 import com.github.javaparser.ast.body.RecordDeclaration;
 import com.github.javaparser.ast.body.VariableDeclarator;
 import com.github.javaparser.ast.comments.BlockComment;
-import com.github.javaparser.ast.comments.JavadocComment;
 import com.github.javaparser.ast.comments.LineComment;
+import com.github.javaparser.ast.comments.MarkdownComment;
+import com.github.javaparser.ast.comments.TraditionalJavadocComment;
 import com.github.javaparser.ast.expr.ArrayAccessExpr;
 import com.github.javaparser.ast.expr.ArrayCreationExpr;
 import com.github.javaparser.ast.expr.ArrayInitializerExpr;
@@ -67,6 +68,7 @@
 import com.github.javaparser.ast.expr.NormalAnnotationExpr;
 import com.github.javaparser.ast.expr.NullLiteralExpr;
 import com.github.javaparser.ast.expr.ObjectCreationExpr;
+import com.github.javaparser.ast.expr.MatchAllPatternExpr;
 import com.github.javaparser.ast.expr.RecordPatternExpr;
 import com.github.javaparser.ast.expr.SimpleName;
 import com.github.javaparser.ast.expr.SingleMemberAnnotationExpr;
@@ -385,7 +387,12 @@ default void visit(IntersectionType n, A arg) {
     }
 
     @Override
-    default void visit(JavadocComment n, A arg) {
+    default void visit(TraditionalJavadocComment n, A arg) {
+
+    }
+
+    @Override
+    default void visit(MarkdownComment n, A arg) {
 
     }
 
@@ -676,4 +683,8 @@ default void visit(TypePatternExpr n, A arg) {
     @Override
     default void visit(RecordPatternExpr n, A arg) {
     }
+
+    @Override
+    default void visit(MatchAllPatternExpr n, A arg) {
+    }
 }
diff --git a/drools-model/drools-mvel-parser/src/main/javacc-support/org/drools/mvel/parser/GeneratedMvelParserTokenManagerBase.java b/drools-model/drools-mvel-parser/src/main/javacc-support/org/drools/mvel/parser/GeneratedMvelParserTokenManagerBase.java
index 873b7ea12ab7..8a45b7954b73 100644
--- a/drools-model/drools-mvel-parser/src/main/javacc-support/org/drools/mvel/parser/GeneratedMvelParserTokenManagerBase.java
+++ b/drools-model/drools-mvel-parser/src/main/javacc-support/org/drools/mvel/parser/GeneratedMvelParserTokenManagerBase.java
@@ -22,6 +22,7 @@
 import com.github.javaparser.ast.comments.BlockComment;
 import com.github.javaparser.ast.comments.Comment;
 import com.github.javaparser.ast.comments.JavadocComment;
+import com.github.javaparser.ast.comments.TraditionalJavadocComment;
 import com.github.javaparser.ast.comments.LineComment;
 
 // MVEL use JP JavaToken
@@ -48,7 +49,7 @@ private static TokenRange tokenRange(Token token) {
     static Comment createCommentFromToken(Token token) {
         String commentText = token.image;
         if (token.kind == JAVADOC_COMMENT) {
-            return new JavadocComment(tokenRange(token), commentText.substring(3, commentText.length() - 2));
+            return new TraditionalJavadocComment(tokenRange(token), commentText.substring(3, commentText.length() - 2));
         } else if (token.kind == MULTI_LINE_COMMENT) {
             return new BlockComment(tokenRange(token), commentText.substring(2, commentText.length() - 2));
         } else if (token.kind == SINGLE_LINE_COMMENT) {
diff --git a/drools-quarkus-extension/drools-quarkus-deployment/pom.xml b/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
index 468b19311c49..6a0e60cc52f2 100644
--- a/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
@@ -92,7 +92,7 @@
     <!-- test -->
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5-internal</artifactId>
+      <artifactId>quarkus-junit-internal</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml
index c9c19842382a..781316a2aba7 100644
--- a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml
@@ -51,7 +51,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -98,6 +98,7 @@
           <groupId>io.quarkus</groupId>
           <artifactId>quarkus-maven-plugin</artifactId>
           <version>${version.io.quarkus}</version>
+          <extensions>true</extensions>
           <configuration>
             <noDeps>true</noDeps>
             <skip>${skipTests}</skip>
diff --git a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/pom.xml b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/pom.xml
index f290a6ed7070..709279e5e71b 100644
--- a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/pom.xml
@@ -67,7 +67,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -125,6 +125,7 @@
           <groupId>io.quarkus</groupId>
           <artifactId>quarkus-maven-plugin</artifactId>
           <version>${version.io.quarkus}</version>
+          <extensions>true</extensions>
           <configuration>
             <noDeps>true</noDeps>
             <skip>${skipTests}</skip>
diff --git a/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/pom.xml b/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/pom.xml
index 497594c688ba..c5b1a1dc1aae 100644
--- a/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/pom.xml
@@ -61,7 +61,7 @@
 
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -76,7 +76,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5-internal</artifactId>
+      <artifactId>quarkus-junit-internal</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -107,6 +107,7 @@
           <groupId>io.quarkus</groupId>
           <artifactId>quarkus-maven-plugin</artifactId>
           <version>${version.io.quarkus}</version>
+          <extensions>true</extensions>
           <configuration>
             <noDeps>true</noDeps>
             <skip>${skipTests}</skip>
diff --git a/drools-quarkus-extension/drools-quarkus-integration-test-kmodule/pom.xml b/drools-quarkus-extension/drools-quarkus-integration-test-kmodule/pom.xml
index ecc5bbf4e997..3b879f421734 100644
--- a/drools-quarkus-extension/drools-quarkus-integration-test-kmodule/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-integration-test-kmodule/pom.xml
@@ -65,7 +65,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -107,6 +107,7 @@
           <groupId>io.quarkus</groupId>
           <artifactId>quarkus-maven-plugin</artifactId>
           <version>${version.io.quarkus}</version>
+          <extensions>true</extensions>
           <configuration>
             <noDeps>true</noDeps>
             <skip>${skipTests}</skip>
diff --git a/drools-quarkus-extension/drools-quarkus-integration-test-multimodule/drools-quarkus-integration-test-multimodule-main/pom.xml b/drools-quarkus-extension/drools-quarkus-integration-test-multimodule/drools-quarkus-integration-test-multimodule-main/pom.xml
index 751292a5a400..0054b9c05a13 100644
--- a/drools-quarkus-extension/drools-quarkus-integration-test-multimodule/drools-quarkus-integration-test-multimodule-main/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-integration-test-multimodule/drools-quarkus-integration-test-multimodule-main/pom.xml
@@ -67,7 +67,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -104,6 +104,7 @@
           <groupId>io.quarkus</groupId>
           <artifactId>quarkus-maven-plugin</artifactId>
           <version>${version.io.quarkus}</version>
+          <extensions>true</extensions>
           <configuration>
             <noDeps>true</noDeps>
             <skip>${skipTests}</skip>
diff --git a/drools-quarkus-extension/drools-quarkus-integration-test/pom.xml b/drools-quarkus-extension/drools-quarkus-integration-test/pom.xml
index c6da32fcb099..55189f2bc6ea 100644
--- a/drools-quarkus-extension/drools-quarkus-integration-test/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-integration-test/pom.xml
@@ -69,7 +69,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -111,6 +111,7 @@
           <groupId>io.quarkus</groupId>
           <artifactId>quarkus-maven-plugin</artifactId>
           <version>${version.io.quarkus}</version>
+          <extensions>true</extensions>
           <configuration>
             <noDeps>true</noDeps>
             <skip>${skipTests}</skip>
diff --git a/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml b/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml
index 207eab66ce53..5ab1cad38feb 100644
--- a/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml
@@ -48,7 +48,7 @@
 
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -95,6 +95,7 @@
           <groupId>io.quarkus</groupId>
           <artifactId>quarkus-maven-plugin</artifactId>
           <version>${version.io.quarkus}</version>
+          <extensions>true</extensions>
           <configuration>
             <noDeps>true</noDeps>
             <skip>${skipTests}</skip>
diff --git a/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test-norest/pom.xml b/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test-norest/pom.xml
index cae8ddf1948c..cfc036d92b24 100644
--- a/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test-norest/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test-norest/pom.xml
@@ -56,7 +56,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -98,6 +98,7 @@
           <groupId>io.quarkus</groupId>
           <artifactId>quarkus-maven-plugin</artifactId>
           <version>${version.io.quarkus}</version>
+          <extensions>true</extensions>
           <configuration>
             <noDeps>true</noDeps>
             <skip>${skipTests}</skip>
diff --git a/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/pom.xml b/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/pom.xml
index 4d2e377ec18a..3f4b897a1788 100644
--- a/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/pom.xml
@@ -64,7 +64,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -106,6 +106,7 @@
           <groupId>io.quarkus</groupId>
           <artifactId>quarkus-maven-plugin</artifactId>
           <version>${version.io.quarkus}</version>
+          <extensions>true</extensions>
           <configuration>
             <noDeps>true</noDeps>
             <skip>${skipTests}</skip>
diff --git a/drools-quarkus-extension/drools-quarkus-ruleunits-deployment/pom.xml b/drools-quarkus-extension/drools-quarkus-ruleunits-deployment/pom.xml
index 3530e122fdda..43211b12fade 100644
--- a/drools-quarkus-extension/drools-quarkus-ruleunits-deployment/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-ruleunits-deployment/pom.xml
@@ -93,7 +93,7 @@
     <!-- test -->
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5-internal</artifactId>
+      <artifactId>quarkus-junit-internal</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/drools-quarkus-extension/drools-quarkus-ruleunits/pom.xml b/drools-quarkus-extension/drools-quarkus-ruleunits/pom.xml
index 17b8d11e2a64..ee9a54b51d99 100644
--- a/drools-quarkus-extension/drools-quarkus-ruleunits/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-ruleunits/pom.xml
@@ -89,7 +89,7 @@
         <!-- test -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
diff --git a/drools-quarkus-extension/drools-quarkus-util-deployment/src/main/java/org/drools/quarkus/util/deployment/QuarkusAppPaths.java b/drools-quarkus-extension/drools-quarkus-util-deployment/src/main/java/org/drools/quarkus/util/deployment/QuarkusAppPaths.java
index b529b1a7e65d..95e910c21cef 100644
--- a/drools-quarkus-extension/drools-quarkus-util-deployment/src/main/java/org/drools/quarkus/util/deployment/QuarkusAppPaths.java
+++ b/drools-quarkus-extension/drools-quarkus-util-deployment/src/main/java/org/drools/quarkus/util/deployment/QuarkusAppPaths.java
@@ -27,7 +27,6 @@
 import java.util.List;
 import java.util.Set;
 
-import io.quarkus.deployment.pkg.steps.JarResultBuildStep;
 import org.drools.codegen.common.AppPaths;
 
 /**
@@ -52,7 +51,7 @@ private enum PathType {
     }
 
     protected QuarkusAppPaths(List<Path> projectPaths, Collection<Path> classesPaths, boolean isJar) {
-        super(projectPaths, classesPaths, isJar, AppPaths.BT, JarResultBuildStep.MAIN, false);
+        super(projectPaths, classesPaths, isJar, AppPaths.BT, AppPaths.MAIN_DIR, false);
     }
 
     public static AppPaths from(Iterable<Path> paths) {
diff --git a/drools-quarkus-extension/drools-quarkus/pom.xml b/drools-quarkus-extension/drools-quarkus/pom.xml
index c12881f807bf..9c7ad0c08372 100644
--- a/drools-quarkus-extension/drools-quarkus/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus/pom.xml
@@ -85,7 +85,7 @@
         <!-- test -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
+            <artifactId>quarkus-junit-internal</artifactId>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/codegen/feel11/CompilerBytecodeLoader.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/codegen/feel11/CompilerBytecodeLoader.java
index c15af1f9a559..5801eb9c2f00 100644
--- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/codegen/feel11/CompilerBytecodeLoader.java
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/codegen/feel11/CompilerBytecodeLoader.java
@@ -29,7 +29,7 @@
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
 import com.github.javaparser.ast.body.FieldDeclaration;
 import com.github.javaparser.ast.body.MethodDeclaration;
-import com.github.javaparser.ast.comments.JavadocComment;
+import com.github.javaparser.ast.comments.TraditionalJavadocComment;
 import com.github.javaparser.ast.expr.Expression;
 import com.github.javaparser.ast.expr.NameExpr;
 import com.github.javaparser.ast.expr.NullLiteralExpr;
@@ -164,7 +164,7 @@ private void populateFirstMethodJavadoc(CompilationUnit cu, String feelExpressio
         MethodDeclaration applyMethodDEclaration = cu
                 .findFirst(MethodDeclaration.class)
                 .orElseThrow(() -> new RuntimeException("Something unexpected changed in the template."));
-        applyMethodDEclaration.setComment(new JavadocComment("   FEEL: " + feelExpression + "   "));
+        applyMethodDEclaration.setComment(new TraditionalJavadocComment("   FEEL: " + feelExpression + "   "));
     }
 
     private MethodDeclaration getCreateBaseNodeMethodDeclaration(CompilationUnit cu) {