Upgrade to and align with Quarkus 3.8.1 LTS release.

pefernan · Mar 1, 2024 · c336955 · c336955
1 parent aaa4203
commit c336955
Show file tree

Hide file tree

Showing 7 changed files with 97 additions and 75 deletions.
diff --git a/kogito-apps-build-parent/pom.xml b/kogito-apps-build-parent/pom.xml
@@ -67,7 +67,7 @@
         <!-- OptaPlanner version -->
         <version.org.optaplanner>999-SNAPSHOT</version.org.optaplanner>
 
-        <version.org.hibernate>6.2.13.Final</version.org.hibernate>
+        <version.org.hibernate>6.4.4.Final</version.org.hibernate>
         <version.org.apache.opennlp>2.3.1</version.org.apache.opennlp>
         <version.org.apache.commons.csv>1.10.0</version.org.apache.commons.csv>
         <version.org.jredisearch>2.0.0</version.org.jredisearch>
@@ -136,53 +136,6 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-        <plugins>
-            <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>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.drools</groupId>
-                        <artifactId>drools-util</artifactId>
-                        <version>${version.drools.util}</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <id>Remove comments from generated files</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                        <configuration>
-                            <includeProjectDependencies>false</includeProjectDependencies>
-                            <includePluginDependencies>true</includePluginDependencies>
-                            <executableDependency>
-                                <groupId>org.drools</groupId>
-                                <artifactId>drools-util</artifactId>
-                            </executableDependency>
-                            <mainClass>org.drools.util.RemoveCommentsMain</mainClass>
-                            <arguments>
-                                <argument>true</argument>
-                                <argument>${project.basedir}/target/classes/META-INF/quarkus-javadoc.properties</argument>
-                                <argument>${project.basedir}/target/classes/META-INF/quarkus-extension.properties</argument>
-                                <argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/job/http/recipient/JobHttpRecipientRuntimeConfiguration.jdp</argument>
-                                <argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/job/sink/recipient/JobSinkRecipientRuntimeConfiguration.jdp</argument>
-                                <argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/addons/quarkus/jobs/service/embedded/KogitoAddonsQuarkusJobsServiceEmbeddedRuntimeConfig.jdp</argument>
-                                <argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/index/addon/config/DataIndexBuildConfig.jdp</argument>
-                                <argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/index/addon/config/DataIndexRuntimeConfig.jdp</argument>
-                                <argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/index/addon/config/DataIndexUIClientRuntimeConfig.jdp</argument>
-                                <argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/runtime/tools/quarkus/extension/runtime/config/DevConsoleRuntimeConfig.jdp</argument>
-                                <argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/runtime/tools/quarkus/extension/runtime/config/UserConfig.jdp</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
     </build>
 
     <dependencyManagement>

diff --git a/...verless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml b/...verless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml
@@ -60,7 +60,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-rest-client-deployment</artifactId>
+      <artifactId>quarkus-smallrye-reactive-messaging</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -71,6 +71,22 @@
       <artifactId>kogito-quarkus-extension-spi</artifactId>
     </dependency>
 
+    <!-- Required for DevUI SPI -->
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-vertx-http-dev-console-spi</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-smallrye-reactive-messaging-deployment</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-mutiny-reactive-streams-operators-deployment</artifactId>
+    </dependency>
+
     <!-- Undertow is needed so that the static resource serving can correctly locate CP resources from `META-INF/resources` of the application, as it would be normally expected.
          See https://issues.redhat.com/browse/KOGITO-3477 -->
     <dependency>

diff --git a/...vui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java b/...vui-deployment/src/main/java/org/kie/kogito/swf/tools/deployment/DevConsoleProcessor.java
@@ -22,6 +22,8 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 
 import org.kie.kogito.quarkus.extensions.spi.deployment.KogitoDataIndexServiceAvailableBuildItem;
@@ -30,8 +32,6 @@
 import io.quarkus.deployment.IsDevelopment;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.ConfigurationBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
 import io.quarkus.deployment.builditem.LiveReloadBuildItem;
@@ -42,10 +42,13 @@
 import io.quarkus.devui.spi.page.CardPageBuildItem;
 import io.quarkus.devui.spi.page.Page;
 import io.quarkus.maven.dependency.ResolvedDependency;
+import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
 import io.quarkus.vertx.http.deployment.RouteBuildItem;
-import io.quarkus.vertx.http.runtime.devmode.DevConsoleRecorder;
+import io.quarkus.vertx.http.runtime.devmode.FileSystemStaticHandler;
 import io.quarkus.vertx.http.runtime.management.ManagementInterfaceBuildTimeConfig;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
 
 public class DevConsoleProcessor {
 
@@ -84,9 +87,7 @@ public CardPageBuildItem pages(NonApplicationRootPathBuildItem nonApplicationRoo
     }
 
     @BuildStep(onlyIf = IsDevelopment.class)
-    @Record(ExecutionTime.RUNTIME_INIT)
-    public void deployStaticResources(final DevConsoleRecorder recorder,
-            final CurateOutcomeBuildItem curateOutcomeBuildItem,
+    public void deployStaticResources(final CurateOutcomeBuildItem curateOutcomeBuildItem,
             final LiveReloadBuildItem liveReloadBuildItem,
             final LaunchModeBuildItem launchMode,
             final ShutdownContextBuildItem shutdownContext,
@@ -105,11 +106,39 @@ public void deployStaticResources(final DevConsoleRecorder recorder,
 
         routeBuildItemBuildProducer.produce(new RouteBuildItem.Builder()
                 .route(BASE_RELATIVE_URL + "/*")
-                .handler(recorder.devConsoleHandler(devConsoleStaticResourcesDeploymentPath.toString(),
+                .handler(devConsoleHandler(devConsoleStaticResourcesDeploymentPath.toString(),
                         shutdownContext))
                 .build());
     }
 
+    /**
+     *
+     * @param devConsoleFinalDestination
+     * @param shutdownContext
+     * @return
+     * @deprecated use {@link #fileSystemStaticHandler(List, ShutdownContext)}
+     */
+    @Deprecated
+    Handler<RoutingContext> devConsoleHandler(String devConsoleFinalDestination,
+            ShutdownContext shutdownContext) {
+        List<FileSystemStaticHandler.StaticWebRootConfiguration> webRootConfigurations = new ArrayList<>();
+        webRootConfigurations.add(
+                new FileSystemStaticHandler.StaticWebRootConfiguration(devConsoleFinalDestination, ""));
+
+        return fileSystemStaticHandler(webRootConfigurations, shutdownContext);
+    }
+
+    Handler<RoutingContext> fileSystemStaticHandler(
+            List<FileSystemStaticHandler.StaticWebRootConfiguration> webRootConfigurations,
+            ShutdownContext shutdownContext) {
+
+        FileSystemStaticHandler fileSystemStaticHandler = new FileSystemStaticHandler(webRootConfigurations);
+
+        shutdownContext.addShutdownTask(new ShutdownContext.CloseRunnable(fileSystemStaticHandler));
+
+        return fileSystemStaticHandler;
+    }
+
     @SuppressWarnings("unused")
     @BuildStep(onlyIf = IsDevelopment.class)
     public void isDataIndexAvailable(BuildProducer<DevConsoleTemplateInfoBuildItem> devConsoleTemplateInfoBuildItemBuildProducer,

diff --git a/...quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/pom.xml b/...quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/pom.xml
@@ -47,11 +47,6 @@
       <artifactId>quarkus-resteasy-jackson</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-rest-client</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-resteasy-multipart</artifactId>
@@ -67,6 +62,11 @@
       <artifactId>arc-processor</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-smallrye-reactive-messaging</artifactId>
+    </dependency>
+
     <!-- Undertow is needed so that the static resource serving can correctly locate CP resources from `META-INF/resources` of the application, as it would be normally expected.
          See https://issues.redhat.com/browse/KOGITO-3477 -->
     <dependency>

diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/pom.xml b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/pom.xml
@@ -60,7 +60,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-rest-client-deployment</artifactId>
+      <artifactId>quarkus-vertx-http-dev-console-spi</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>

diff --git a/...n/java/org/kie/kogito/runtime/tools/quarkus/extension/deployment/DevConsoleProcessor.java b/...n/java/org/kie/kogito/runtime/tools/quarkus/extension/deployment/DevConsoleProcessor.java
@@ -20,6 +20,8 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 
 import org.kie.kogito.quarkus.extensions.spi.deployment.KogitoDataIndexServiceAvailableBuildItem;
@@ -31,17 +33,18 @@
 import io.quarkus.deployment.IsDevelopment;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
 import io.quarkus.deployment.builditem.LiveReloadBuildItem;
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
 import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
 import io.quarkus.deployment.util.WebJarUtil;
 import io.quarkus.devconsole.spi.DevConsoleTemplateInfoBuildItem;
 import io.quarkus.maven.dependency.ResolvedDependency;
+import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.vertx.http.deployment.RouteBuildItem;
-import io.quarkus.vertx.http.runtime.devmode.DevConsoleRecorder;
+import io.quarkus.vertx.http.runtime.devmode.FileSystemStaticHandler;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
 
 public class DevConsoleProcessor {
 
@@ -58,9 +61,7 @@ public void collectUsersInfo(final BuildProducer<DevConsoleTemplateInfoBuildItem
     }
 
     @BuildStep(onlyIf = IsDevelopment.class)
-    @Record(ExecutionTime.RUNTIME_INIT)
-    public void deployStaticResources(final DevConsoleRecorder recorder,
-            final CurateOutcomeBuildItem curateOutcomeBuildItem,
+    public void deployStaticResources(final CurateOutcomeBuildItem curateOutcomeBuildItem,
             final LiveReloadBuildItem liveReloadBuildItem,
             final LaunchModeBuildItem launchMode,
             final ShutdownContextBuildItem shutdownContext,
@@ -79,17 +80,45 @@ public void deployStaticResources(final DevConsoleRecorder recorder,
 
         routeBuildItemBuildProducer.produce(new RouteBuildItem.Builder()
                 .route(BASE_RELATIVE_URL + "/resources/*")
-                .handler(recorder.devConsoleHandler(devConsoleStaticResourcesDeploymentPath.toString(),
+                .handler(devConsoleHandler(devConsoleStaticResourcesDeploymentPath.toString(),
                         shutdownContext))
                 .build());
 
         routeBuildItemBuildProducer.produce(new RouteBuildItem.Builder()
                 .route(BASE_RELATIVE_URL + "/*")
-                .handler(recorder.devConsoleHandler(devConsoleStaticResourcesDeploymentPath.toString(),
+                .handler(devConsoleHandler(devConsoleStaticResourcesDeploymentPath.toString(),
                         shutdownContext))
                 .build());
     }
 
+    /**
+     *
+     * @param devConsoleFinalDestination
+     * @param shutdownContext
+     * @return
+     * @deprecated use {@link #fileSystemStaticHandler(List, ShutdownContext)}
+     */
+    @Deprecated
+    Handler<RoutingContext> devConsoleHandler(String devConsoleFinalDestination,
+            ShutdownContext shutdownContext) {
+        List<FileSystemStaticHandler.StaticWebRootConfiguration> webRootConfigurations = new ArrayList<>();
+        webRootConfigurations.add(
+                new FileSystemStaticHandler.StaticWebRootConfiguration(devConsoleFinalDestination, ""));
+
+        return fileSystemStaticHandler(webRootConfigurations, shutdownContext);
+    }
+
+    Handler<RoutingContext> fileSystemStaticHandler(
+            List<FileSystemStaticHandler.StaticWebRootConfiguration> webRootConfigurations,
+            ShutdownContext shutdownContext) {
+
+        FileSystemStaticHandler fileSystemStaticHandler = new FileSystemStaticHandler(webRootConfigurations);
+
+        shutdownContext.addShutdownTask(new ShutdownContext.CloseRunnable(fileSystemStaticHandler));
+
+        return fileSystemStaticHandler;
+    }
+
     @SuppressWarnings("unused")
     @BuildStep(onlyIf = IsDevelopment.class)
     public void isProcessEnabled(BuildProducer<DevConsoleTemplateInfoBuildItem> devConsoleTemplateInfoBuildItemBuildProducer,

diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/pom.xml b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/pom.xml
@@ -47,11 +47,6 @@
       <artifactId>quarkus-resteasy-jackson</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-rest-client</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-resteasy-multipart</artifactId>