Merge pull request #26 from rgdoliveira/sync_main

Sync main branch with Apache main branch

.ci/jenkins/tests/pom.xml

@@ -55,7 +55,7 @@
         <logback.configration>logback-test.xml</logback.configration>
         <logdir>${project.build.directory}/log</logdir>
         <test.loglevel>ERROR</test.loglevel>
-        <log.logback.version>1.2.9</log.logback.version>
+        <log.logback.version>1.2.13</log.logback.version>
         <log.slf4j.version>1.7.25</log.slf4j.version>
         <build-helper-maven-plugin.version>1.9.1</build-helper-maven-plugin.version>
 

addons/README.md

@@ -50,8 +50,8 @@ your `pom.xml` file:
 
 <dependencies>
   <dependency>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-process-management</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-process-management</artifactId>
     <version>${kogito.version}</version>
   </dependency>
 </dependencies>

addons/common/events/mongodb/README.md

@@ -21,8 +21,8 @@ To enable this events publisher, make sure dependency for the Kafka events publi
 2. Springboot:
 ```xml
 <dependency>
-  <groupId>org.kie.kogito</groupId>
-  <artifactId>kogito-addons-springboot-events-kafka</artifactId>
+  <groupId>org.kie</groupId>
+  <artifactId>kie-addons-springboot-events-kafka</artifactId>
 </dependency>
 ```
 
@@ -31,15 +31,15 @@ Then add the following dependency for MongoDB events publisher:
 1. Quarkus:
 ```xml
 <dependency>
-  <groupId>org.kie.kogito</groupId>
-  <artifactId>kogito-addons-quarkus-events-mongodb</artifactId>
+  <groupId>org.kie</groupId>
+  <artifactId>kie-addons-quarkus-events-mongodb</artifactId>
 </dependency>
 ```
 
 2. Springboot:
 ```xml
 <dependency>
-  <groupId>org.kie.kogito</groupId>
-  <artifactId>kogito-addons-springboot-events-mongodb</artifactId>
+  <groupId>org.kie</groupId>
+  <artifactId>kie-addons-springboot-events-mongodb</artifactId>
 </dependency>
 ```

addons/common/persistence/jdbc/src/main/java/org/kie/kogito/persistence/jdbc/correlation/JDBCCorrelationService.java → addons/common/persistence/jdbc/src/main/java/org/kie/kogito/persistence/jdbc/correlation/PostgreSQLCorrelationService.java

@@ -18,8 +18,6 @@
  */
 package org.kie.kogito.persistence.jdbc.correlation;
 
-import java.sql.Connection;
-import java.sql.SQLException;
 import java.util.Optional;
 
 import javax.sql.DataSource;
@@ -29,25 +27,13 @@
 import org.kie.kogito.correlation.CorrelationInstance;
 import org.kie.kogito.correlation.CorrelationService;
 import org.kie.kogito.event.correlation.MD5CorrelationEncoder;
-import org.kie.kogito.persistence.jdbc.DatabaseType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-public class JDBCCorrelationService implements CorrelationService {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(JDBCCorrelationService.class);
+public class PostgreSQLCorrelationService implements CorrelationService {
 
     private PostgreSQLCorrelationRepository repository;
     private CorrelationEncoder correlationEncoder;
 
-    public JDBCCorrelationService(DataSource dataSource) {
-        try (Connection connection = dataSource.getConnection()) {
-            if (!DatabaseType.POSTGRES.equals(DatabaseType.getDataBaseType(connection))) {
-                throw new IllegalArgumentException("Only PostgreSQL is supported for correlation");
-            }
-        } catch (SQLException e) {
-            LOGGER.error("Error getting connection for {}", dataSource);
-        }
+    public PostgreSQLCorrelationService(DataSource dataSource) {
         this.repository = new PostgreSQLCorrelationRepository(dataSource);
         this.correlationEncoder = new MD5CorrelationEncoder();
     }

addons/common/persistence/jdbc/src/main/resources/db/postgresql/V1.35.0__create_runtime_PostgreSQL.sql

@@ -1,4 +1,4 @@
--- To be used with kogito-addons-quarkus-persistence-jdbc for Quarkus or kogito-addons-springboot-persistence-jdbc for SpringBoot
+-- To be used with kie-addons-quarkus-persistence-jdbc for Quarkus or kie-addons-springboot-persistence-jdbc for SpringBoot
 CREATE TABLE process_instances
 (
     id              character(36)     NOT NULL,

addons/common/persistence/jdbc/src/test/java/org/kie/persistence/jdbc/correlation/JDBCCorrelationServiceIT.java

@@ -27,7 +27,7 @@
 import org.kie.kogito.correlation.CompositeCorrelation;
 import org.kie.kogito.correlation.CorrelationInstance;
 import org.kie.kogito.correlation.SimpleCorrelation;
-import org.kie.kogito.persistence.jdbc.correlation.JDBCCorrelationService;
+import org.kie.kogito.persistence.jdbc.correlation.PostgreSQLCorrelationService;
 import org.kie.kogito.testcontainers.KogitoPostgreSqlContainer;
 import org.postgresql.ds.PGSimpleDataSource;
 import org.testcontainers.containers.JdbcDatabaseContainer;
@@ -42,15 +42,15 @@ public class JDBCCorrelationServiceIT {
     @Container
     private static final KogitoPostgreSqlContainer PG_CONTAINER = new KogitoPostgreSqlContainer();
     private static PGSimpleDataSource dataSource;
-    private static JDBCCorrelationService correlationService;
+    private static PostgreSQLCorrelationService correlationService;
 
     @BeforeAll
     public static void setUp() {
         dataSource = new PGSimpleDataSource();
         dataSource.setUrl(PG_CONTAINER.getJdbcUrl());
         dataSource.setUser(PG_CONTAINER.getUsername());
         dataSource.setPassword(PG_CONTAINER.getPassword());
-        correlationService = new JDBCCorrelationService(dataSource);
+        correlationService = new PostgreSQLCorrelationService(dataSource);
         //create table
         //        DDLRunner.init(new GenericRepository(dataSource), true);
         initMigration(PG_CONTAINER, "postgresql");