This is an automated email from the ASF dual-hosted git repository.
pefernan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-apps.git
The following commit(s) were added to refs/heads/main by this push:
new 9eb120ec4 [kie-issues#1856] Remove unnecessary quarkus-jdbc
dependencies from D… (#2202)
9eb120ec4 is described below
commit 9eb120ec413b53b190a705089e887cd2d21731d3
Author: Abdul Jaleel <[email protected]>
AuthorDate: Tue Mar 11 19:52:34 2025 +0530
[kie-issues#1856] Remove unnecessary quarkus-jdbc dependencies from D…
(#2202)
* [kie-issues#1856] Remove unnecessary quarkus-jdbc dependencies from Data
Audit Addon / Job Service Storage JPA
* [kie-issues#1856] Remove unnecessary quarkus-jdbc dependencies from Data
Audit Addon / Job Service Storage JPA
* [kie-issues#1856] quarkus-jdbc-h2 dependency added
* - Remove unnecessary `quarkus-jdbc-h2` deps
---------
Co-authored-by: Pere Fernández <[email protected]>
---
.../data-audit-quarkus-jpa-service/pom.xml | 8 ++++++
.../kogito-addons-data-audit-jpa-quarkus/pom.xml | 11 --------
.../kogito-addons-data-audit-quarkus/pom.xml | 6 +++++
.../data-index-storage-jpa/pom.xml | 1 +
.../kogito/index/jdbc/H2QuarkusTestProfile.java | 30 ----------------------
.../index/jdbc/query/H2JobEntityQueryIT.java | 6 -----
.../query/H2ProcessDefinitionEntityQueryIT.java | 6 -----
.../jdbc/query/H2ProcessInstanceEntityQueryIT.java | 6 -----
.../query/H2UserTaskInstanceEntityQueryIT.java | 6 -----
.../kogito/index/jdbc/storage/H2JobStorageIT.java | 3 ---
.../jdbc/storage/H2ProcessDefinitionStorageIT.java | 3 ---
.../jdbc/storage/H2ProcessInstanceStorageIT.java | 3 ---
.../jdbc/storage/H2UserTaskInstanceStorageIT.java | 3 ---
.../src/test/resources/application.properties | 8 +++---
.../deployment/pom.xml | 4 ---
jobs-service/jobs-service-storage-jpa/pom.xml | 1 +
16 files changed, 20 insertions(+), 85 deletions(-)
diff --git
a/data-audit/kogito-addons-data-audit-jpa/data-audit-quarkus-jpa-service/pom.xml
b/data-audit/kogito-addons-data-audit-jpa/data-audit-quarkus-jpa-service/pom.xml
index 4be041bda..de69a4a45 100644
---
a/data-audit/kogito-addons-data-audit-jpa/data-audit-quarkus-jpa-service/pom.xml
+++
b/data-audit/kogito-addons-data-audit-jpa/data-audit-quarkus-jpa-service/pom.xml
@@ -56,6 +56,14 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-container-image-jib</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-jdbc-h2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-jdbc-postgresql</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-quarkus/pom.xml
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-quarkus/pom.xml
index 9933d8be0..f351fae24 100644
---
a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-quarkus/pom.xml
+++
b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-quarkus/pom.xml
@@ -72,7 +72,6 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc</artifactId>
</dependency>
-
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-reactive-routes</artifactId>
@@ -85,21 +84,11 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-graphql</artifactId>
</dependency>
-
<!-- dependencies -->
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-hibernate-orm</artifactId>
</dependency>
-
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-jdbc-h2</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-jdbc-postgresql</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/data-audit/kogito-addons-data-audit-quarkus/pom.xml
b/data-audit/kogito-addons-data-audit-quarkus/pom.xml
index ab8f54b9f..66bc2b2ab 100644
--- a/data-audit/kogito-addons-data-audit-quarkus/pom.xml
+++ b/data-audit/kogito-addons-data-audit-quarkus/pom.xml
@@ -111,6 +111,12 @@
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-jdbc-h2</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
diff --git a/data-index/data-index-storage/data-index-storage-jpa/pom.xml
b/data-index/data-index-storage/data-index-storage-jpa/pom.xml
index 7db734cf5..aa44ca214 100644
--- a/data-index/data-index-storage/data-index-storage-jpa/pom.xml
+++ b/data-index/data-index-storage/data-index-storage-jpa/pom.xml
@@ -53,6 +53,7 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jdbc-h2</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
diff --git
a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/H2QuarkusTestProfile.java
b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/H2QuarkusTestProfile.java
deleted file mode 100644
index b42ab3699..000000000
---
a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/H2QuarkusTestProfile.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.kie.kogito.index.jdbc;
-
-import io.quarkus.test.junit.QuarkusTestProfile;
-
-public class H2QuarkusTestProfile implements QuarkusTestProfile {
-
- @Override
- public String getConfigProfile() {
- return "test-h2";
- }
-}
diff --git
a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/H2JobEntityQueryIT.java
b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/H2JobEntityQueryIT.java
index 88aa60b86..ffeaa7fc9 100644
---
a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/H2JobEntityQueryIT.java
+++
b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/H2JobEntityQueryIT.java
@@ -18,19 +18,13 @@
*/
package org.kie.kogito.index.jdbc.query;
-import org.kie.kogito.index.jdbc.H2QuarkusTestProfile;
import org.kie.kogito.index.jpa.query.AbstractJobEntityQueryIT;
import io.quarkus.test.TestTransaction;
-import io.quarkus.test.common.QuarkusTestResource;
-import io.quarkus.test.h2.H2DatabaseTestResource;
import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit.TestProfile;
@QuarkusTest
@TestTransaction
-@QuarkusTestResource(value = H2DatabaseTestResource.class,
restrictToAnnotatedClass = true)
-@TestProfile(H2QuarkusTestProfile.class)
class H2JobEntityQueryIT extends AbstractJobEntityQueryIT {
}
diff --git
a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/H2ProcessDefinitionEntityQueryIT.java
b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/H2ProcessDefinitionEntityQueryIT.java
index 704c46164..49ee1d6df 100644
---
a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/H2ProcessDefinitionEntityQueryIT.java
+++
b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/H2ProcessDefinitionEntityQueryIT.java
@@ -18,19 +18,13 @@
*/
package org.kie.kogito.index.jdbc.query;
-import org.kie.kogito.index.jdbc.H2QuarkusTestProfile;
import org.kie.kogito.index.jpa.query.AbstractProcessDefinitionEntityQueryIT;
import io.quarkus.test.TestTransaction;
-import io.quarkus.test.common.QuarkusTestResource;
-import io.quarkus.test.h2.H2DatabaseTestResource;
import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit.TestProfile;
@QuarkusTest
@TestTransaction
-@QuarkusTestResource(value = H2DatabaseTestResource.class,
restrictToAnnotatedClass = true)
-@TestProfile(H2QuarkusTestProfile.class)
class H2ProcessDefinitionEntityQueryIT extends
AbstractProcessDefinitionEntityQueryIT {
}
diff --git
a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/H2ProcessInstanceEntityQueryIT.java
b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/H2ProcessInstanceEntityQueryIT.java
index c68e22d9d..10ecbaf75 100644
---
a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/H2ProcessInstanceEntityQueryIT.java
+++
b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/H2ProcessInstanceEntityQueryIT.java
@@ -18,19 +18,13 @@
*/
package org.kie.kogito.index.jdbc.query;
-import org.kie.kogito.index.jdbc.H2QuarkusTestProfile;
import org.kie.kogito.index.jpa.query.AbstractProcessInstanceEntityQueryIT;
import io.quarkus.test.TestTransaction;
-import io.quarkus.test.common.QuarkusTestResource;
-import io.quarkus.test.h2.H2DatabaseTestResource;
import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit.TestProfile;
@QuarkusTest
@TestTransaction
-@QuarkusTestResource(value = H2DatabaseTestResource.class,
restrictToAnnotatedClass = true)
-@TestProfile(H2QuarkusTestProfile.class)
class H2ProcessInstanceEntityQueryIT extends
AbstractProcessInstanceEntityQueryIT {
@Override
diff --git
a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/H2UserTaskInstanceEntityQueryIT.java
b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/H2UserTaskInstanceEntityQueryIT.java
index 79e6ea184..d5c3c8f0c 100644
---
a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/H2UserTaskInstanceEntityQueryIT.java
+++
b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/query/H2UserTaskInstanceEntityQueryIT.java
@@ -18,19 +18,13 @@
*/
package org.kie.kogito.index.jdbc.query;
-import org.kie.kogito.index.jdbc.H2QuarkusTestProfile;
import org.kie.kogito.index.jpa.query.AbstractUserTaskInstanceEntityQueryIT;
import io.quarkus.test.TestTransaction;
-import io.quarkus.test.common.QuarkusTestResource;
-import io.quarkus.test.h2.H2DatabaseTestResource;
import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit.TestProfile;
@QuarkusTest
@TestTransaction
-@QuarkusTestResource(value = H2DatabaseTestResource.class,
restrictToAnnotatedClass = true)
-@TestProfile(H2QuarkusTestProfile.class)
class H2UserTaskInstanceEntityQueryIT extends
AbstractUserTaskInstanceEntityQueryIT {
}
diff --git
a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/H2JobStorageIT.java
b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/H2JobStorageIT.java
index 3a6815e46..557701f75 100644
---
a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/H2JobStorageIT.java
+++
b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/H2JobStorageIT.java
@@ -18,16 +18,13 @@
*/
package org.kie.kogito.index.jdbc.storage;
-import org.kie.kogito.index.jdbc.H2QuarkusTestProfile;
import org.kie.kogito.index.jpa.storage.AbstractJobStorageIT;
import io.quarkus.test.TestTransaction;
import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit.TestProfile;
@QuarkusTest
@TestTransaction
-@TestProfile(H2QuarkusTestProfile.class)
public class H2JobStorageIT extends AbstractJobStorageIT {
}
diff --git
a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/H2ProcessDefinitionStorageIT.java
b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/H2ProcessDefinitionStorageIT.java
index ab110245e..17ec61c54 100644
---
a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/H2ProcessDefinitionStorageIT.java
+++
b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/H2ProcessDefinitionStorageIT.java
@@ -18,16 +18,13 @@
*/
package org.kie.kogito.index.jdbc.storage;
-import org.kie.kogito.index.jdbc.H2QuarkusTestProfile;
import org.kie.kogito.index.jpa.storage.AbstractProcessDefinitionStorageIT;
import io.quarkus.test.TestTransaction;
import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit.TestProfile;
@QuarkusTest
@TestTransaction
-@TestProfile(H2QuarkusTestProfile.class)
class H2ProcessDefinitionStorageIT extends AbstractProcessDefinitionStorageIT {
}
diff --git
a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/H2ProcessInstanceStorageIT.java
b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/H2ProcessInstanceStorageIT.java
index 3b73dd3fb..c3eacc038 100644
---
a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/H2ProcessInstanceStorageIT.java
+++
b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/H2ProcessInstanceStorageIT.java
@@ -18,15 +18,12 @@
*/
package org.kie.kogito.index.jdbc.storage;
-import org.kie.kogito.index.jdbc.H2QuarkusTestProfile;
import org.kie.kogito.index.jpa.storage.AbstractProcessInstanceStorageIT;
import io.quarkus.test.TestTransaction;
import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit.TestProfile;
@QuarkusTest
@TestTransaction
-@TestProfile(H2QuarkusTestProfile.class)
public class H2ProcessInstanceStorageIT extends
AbstractProcessInstanceStorageIT {
}
diff --git
a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/H2UserTaskInstanceStorageIT.java
b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/H2UserTaskInstanceStorageIT.java
index b8b5105c6..fb497bbec 100644
---
a/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/H2UserTaskInstanceStorageIT.java
+++
b/data-index/data-index-storage/data-index-storage-jpa/src/test/java/org/kie/kogito/index/jdbc/storage/H2UserTaskInstanceStorageIT.java
@@ -18,15 +18,12 @@
*/
package org.kie.kogito.index.jdbc.storage;
-import org.kie.kogito.index.jdbc.H2QuarkusTestProfile;
import org.kie.kogito.index.jpa.storage.AbstractUserTaskInstanceStorageIT;
import io.quarkus.test.TestTransaction;
import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit.TestProfile;
@QuarkusTest
@TestTransaction
-@TestProfile(H2QuarkusTestProfile.class)
public class H2UserTaskInstanceStorageIT extends
AbstractUserTaskInstanceStorageIT {
}
diff --git
a/data-index/data-index-storage/data-index-storage-jpa/src/test/resources/application.properties
b/data-index/data-index-storage/data-index-storage-jpa/src/test/resources/application.properties
index eb83483fe..20e4e1212 100644
---
a/data-index/data-index-storage/data-index-storage-jpa/src/test/resources/application.properties
+++
b/data-index/data-index-storage/data-index-storage-jpa/src/test/resources/application.properties
@@ -24,9 +24,9 @@ kie.flyway.enabled=true
# Data sources
%test-postgresql.quarkus.datasource.db-kind=postgresql
%test-postgresql.quarkus.datasource.devservices.enabled=false
-%test-h2.quarkus.datasource.db-kind=h2
-%test-h2.quarkus.datasource.username=kogito
-%test-h2.quarkus.datasource.jdbc.url=jdbc:h2:mem:default;NON_KEYWORDS=VALUE,KEY
+quarkus.datasource.db-kind=h2
+quarkus.datasource.username=kogito
+quarkus.datasource.jdbc.url=jdbc:h2:mem:default;NON_KEYWORDS=VALUE,KEY
# Hibernate
quarkus.hibernate-orm.physical-naming-strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy
@@ -39,4 +39,4 @@ quarkus.hibernate-orm.flush.mode=always
quarkus.oidc.enabled=false
quarkus.oidc.tenant-enabled=false
quarkus.oidc.auth-server-url=none
-quarkus.keycloak.devservices.enabled=false
\ No newline at end of file
+quarkus.keycloak.devservices.enabled=false
diff --git
a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/deployment/pom.xml
b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/deployment/pom.xml
index 548cefa97..04812fe67 100644
---
a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/deployment/pom.xml
+++
b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/deployment/pom.xml
@@ -46,10 +46,6 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-hibernate-orm-panache-deployment</artifactId>
</dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-jdbc-h2-deployment</artifactId>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/jobs-service/jobs-service-storage-jpa/pom.xml
b/jobs-service/jobs-service-storage-jpa/pom.xml
index 4e1594188..6fd7e8975 100644
--- a/jobs-service/jobs-service-storage-jpa/pom.xml
+++ b/jobs-service/jobs-service-storage-jpa/pom.xml
@@ -66,6 +66,7 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jdbc-h2</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.kie.kogito</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
