chore(upgrade): Quarkus 3.2

.rhcicd/pr_check.sh

@@ -8,6 +8,10 @@ export COMPONENT_NAME="policies-engine"
 export IMAGE="quay.io/cloudservices/policies-engine"
 export DEPLOY_TIMEOUT="600"
 
+# Temporary deploy template fix of policies-ui-backend [RHINENG-6805]
+EXTRA_DEPLOY_ARGS="--set-template-ref policies-ui-backend=ddeef618125b31f083788040b6344cca372ec09c
+                   --set-image-tag quay.io/cloudservices/policies-ui-backend=pr-602-ddeef61"
+
 # IQE plugin config
 export IQE_PLUGINS="policies"
 export IQE_MARKER_EXPRESSION="policies_api_smoke"

pom.xml

@@ -32,6 +32,7 @@
     <compiler-plugin.version>3.11.0</compiler-plugin.version>
 
     <maven.compiler.parameters>true</maven.compiler.parameters>
+    <maven.compiler.release>${java-version}</maven.compiler.release>
     <maven.compiler.source>$java-version}</maven.compiler.source>
     <maven.compiler.target>$java-version}</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -43,16 +44,16 @@
     <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
 
     <!-- Quarkus -->
+    <quarkus.platform.group-id>com.redhat.quarkus.platform</quarkus.platform.group-id>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
-    <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-    <quarkus.platform.version>2.16.12.Final</quarkus.platform.version>
+    <quarkus.platform.version>3.2.9.Final-redhat-00003</quarkus.platform.version>
 
     <!-- Dependencies -->
     <insights-notification-schemas-java.version>0.17</insights-notification-schemas-java.version>
     <redhat.event-schemas.version>1.4.2</redhat.event-schemas.version>
     <clowder-quarkus-config-source.version>1.2.0</clowder-quarkus-config-source.version>
-    <quarkus-logging-cloudwatch.version>5.6.0</quarkus-logging-cloudwatch.version>
-    <quarkus-logging-sentry.version>1.2.1</quarkus-logging-sentry.version>
+    <quarkus-logging-cloudwatch.version>6.3.0</quarkus-logging-cloudwatch.version>
+    <quarkus-logging-sentry.version>2.0.4</quarkus-logging-sentry.version>
     <org.antlr.version>4.11.1</org.antlr.version>
 
   </properties>
@@ -127,7 +128,7 @@
     <dependency>
       <groupId>io.quarkiverse.hibernatetypes</groupId>
       <artifactId>quarkus-hibernate-types</artifactId>
-      <version>1.0.1</version>
+      <version>2.0.0</version>
     </dependency>
 
     <!-- Insights -->
@@ -196,100 +197,85 @@
 
   </dependencies>
 
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>redhat</id>
+      <url>https://maven.repository.redhat.com/ga</url>
+    </repository>
+  </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>redhat</id>
+      <url>https://maven.repository.redhat.com/ga</url>
+    </pluginRepository>
+  </pluginRepositories>
+
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>${enforcer-plugin.version}</version>
+        <groupId>${quarkus.platform.group-id}</groupId>
+        <artifactId>quarkus-maven-plugin</artifactId>
+        <version>${quarkus.platform.version}</version>
+        <extensions>true</extensions>
         <executions>
           <execution>
-            <id>enforce-versions</id>
             <goals>
-              <goal>enforce</goal>
+              <goal>build</goal>
+              <goal>generate-code</goal>
+              <goal>generate-code-tests</goal>
             </goals>
-            <configuration>
-              <rules>
-                <requireMavenVersion>
-                  <version>${maven-minimum-version}</version>
-                </requireMavenVersion>
-                <requireJavaVersion>
-                  <version>${java-version}</version>
-                </requireJavaVersion>
-              </rules>
-            </configuration>
           </execution>
         </executions>
       </plugin>
-
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${compiler-plugin.version}</version>
         <configuration>
-          <release>17</release>
-          <forceJavacCompilerUse>true</forceJavacCompilerUse>
+          <compilerArgs>
+            <arg>-parameters</arg>
+          </compilerArgs>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${surefire-plugin.version}</version>
         <configuration>
-          <trimStackTrace>false</trimStackTrace>
-          <systemProperties>
+          <systemPropertyVariables>
             <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-          </systemProperties>
+            <maven.home>${maven.home}</maven.home>
+          </systemPropertyVariables>
         </configuration>
       </plugin>
-
-      <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-clean-plugin</artifactId>
-          <version>3.2.0</version>
-      </plugin>
-      <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-deploy-plugin</artifactId>
-          <version>3.1.1</version>
-      </plugin>
-      <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-install-plugin</artifactId>
-          <version>3.1.1</version>
-      </plugin>
       <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>${maven-jar-plugin.version}</version>
-      </plugin>
-      <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>3.3.1</version>
-      </plugin>
-      <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>4.0.0-M5</version>
-      </plugin>
-
-      <plugin>
-        <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-maven-plugin</artifactId>
-        <version>${quarkus.platform.version}</version>
-        <extensions>true</extensions>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>${surefire-plugin.version}</version>
         <executions>
           <execution>
             <goals>
-              <goal>build</goal>
-              <goal>generate-code</goal>
-              <goal>generate-code-tests</goal>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
             </goals>
+            <configuration>
+              <systemPropertyVariables>
+                <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+                <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                <maven.home>${maven.home}</maven.home>
+              </systemPropertyVariables>
+            </configuration>
           </execution>
         </executions>
-        <configuration>
-          <debug>5006</debug>
-          <suspend>false</suspend>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>io.github.git-commit-id</groupId>

src/main/java/com/redhat/cloud/policies/engine/RunOnStartup.java

@@ -2,14 +2,14 @@
 
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.Startup;
+import jakarta.annotation.PostConstruct;
+
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.regex.Pattern;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-import javax.annotation.PostConstruct;
-
 @Startup
 public class RunOnStartup {
 

src/main/java/com/redhat/cloud/policies/engine/clowder/KafkaSaslInitializer.java

@@ -2,14 +2,14 @@
 
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.StartupEvent;
+import jakarta.annotation.Priority;
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.ConfigProvider;
 
-import javax.annotation.Priority;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
 
-import static javax.interceptor.Interceptor.Priority.PLATFORM_BEFORE;
+import static jakarta.interceptor.Interceptor.Priority.PLATFORM_BEFORE;
 
 /*
  * This bean is required to make sure that SmallRye Reactive Messaging will use the configuration from

src/main/java/com/redhat/cloud/policies/engine/config/FeatureFlipper.java

@@ -5,8 +5,8 @@
 import io.quarkus.runtime.configuration.ProfileManager;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
 
 import static io.quarkus.runtime.LaunchMode.TEST;
 

src/main/java/com/redhat/cloud/policies/engine/db/StatelessSessionFactory.java

@@ -4,9 +4,9 @@
 import org.hibernate.Session;
 import org.hibernate.StatelessSession;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
 import java.util.function.Consumer;
 import java.util.function.Function;
 

src/main/java/com/redhat/cloud/policies/engine/db/entities/OrgIdLatestUpdate.java

@@ -1,9 +1,9 @@
 package com.redhat.cloud.policies.engine.db.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.time.LocalDateTime;
 
 @Entity

src/main/java/com/redhat/cloud/policies/engine/db/entities/PoliciesHistoryEntry.java

@@ -1,26 +1,25 @@
 package com.redhat.cloud.policies.engine.db.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.util.Objects;
 import java.util.UUID;
 import io.vertx.core.json.JsonArray;
 
-import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.Type;
 import io.quarkiverse.hibernate.types.json.JsonBinaryType;
 import io.quarkiverse.hibernate.types.json.JsonTypes;
 
 @Entity
 @Table(name = "policies_history")
-@TypeDef(name = JsonTypes.JSON_BIN, typeClass = JsonBinaryType.class)
 public class PoliciesHistoryEntry {
 
     @Id
-    @GeneratedValue
+    @GeneratedValue(strategy = GenerationType.UUID)
     private UUID id;
 
     private String tenantId;
@@ -35,7 +34,7 @@ public class PoliciesHistoryEntry {
 
     private String hostName;
 
-    @Type(type = JsonTypes.JSON_BIN)
+    @Type(JsonBinaryType.class)
     @Column(name = "host_groups", nullable = false, columnDefinition = JsonTypes.JSON_BIN)
     private JsonArray hostGroups = new JsonArray();
 

src/main/java/com/redhat/cloud/policies/engine/db/entities/Policy.java

@@ -1,9 +1,9 @@
 package com.redhat.cloud.policies.engine.db.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.util.UUID;
 
 @Entity

src/main/java/com/redhat/cloud/policies/engine/db/repositories/PoliciesHistoryRepository.java

@@ -6,8 +6,8 @@
 import io.quarkus.logging.Log;
 import io.vertx.core.json.JsonArray;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.util.Iterator;
 import java.util.Optional;
 import java.util.UUID;

src/main/java/com/redhat/cloud/policies/engine/db/repositories/PoliciesRepository.java

@@ -6,9 +6,9 @@
 import io.quarkus.cache.CacheResult;
 import io.quarkus.logging.Log;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.persistence.NoResultException;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.persistence.NoResultException;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
@@ -55,7 +55,7 @@ LocalDateTime findLatestUpdate(String orgId) {
     }
 
     private List<Policy> findEnabledPolicies(String orgId) {
-        String hql = "FROM Policy WHERE orgId = :orgId AND enabled IS TRUE";
+        String hql = "FROM Policy WHERE orgId = :orgId AND enabled = TRUE";
         return statelessSessionFactory.getCurrentSession().createQuery(hql, Policy.class)
                 .setParameter("orgId", orgId)
                 .getResultList();

src/main/java/com/redhat/cloud/policies/engine/metrics/ProcSelfStatusExporter.java

@@ -4,10 +4,10 @@
 import io.micrometer.core.instrument.Tag;
 import io.quarkus.logging.Log;
 import io.quarkus.scheduler.Scheduled;
+import jakarta.annotation.PostConstruct;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.io.File;
 import java.util.Scanner;
 import java.util.Set;

src/main/java/com/redhat/cloud/policies/engine/process/EventProcessor.java

@@ -8,11 +8,11 @@
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.quarkus.logging.Log;
+import jakarta.annotation.PostConstruct;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;