- Fix data-index storage and addons

apache · Sep 18, 2024 · 35cdddd · 35cdddd
1 parent 345516c
commit 35cdddd
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 6 deletions.
diff --git a/data-index/data-index-service/data-index-service-inmemory/pom.xml b/data-index/data-index-service/data-index-service-inmemory/pom.xml
@@ -46,8 +46,8 @@
       <artifactId>data-index-storage-postgresql</artifactId>
     </dependency>
     <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-flyway</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-flyway</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>

diff --git a/data-index/data-index-service/data-index-service-postgresql/pom.xml b/data-index/data-index-service/data-index-service-postgresql/pom.xml
@@ -45,6 +45,10 @@
       <groupId>org.kie.kogito</groupId>
       <artifactId>data-index-storage-postgresql</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-flyway</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-smallrye-reactive-messaging-kafka</artifactId>

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
@@ -89,6 +89,11 @@
       <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-flyway</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/.../resources/META-INF/kie-flyway.properties → .../resources/META-INF/kie-flyway.properties b/.../resources/META-INF/kie-flyway.properties → .../resources/META-INF/kie-flyway.properties
diff --git a/...index/data-index-storage/data-index-storage-jpa/src/test/resources/application.properties b/...index/data-index-storage/data-index-storage-jpa/src/test/resources/application.properties
@@ -19,12 +19,12 @@
 
 # Kogito
 kogito.apps.persistence.type=jdbc
+kie.flyway.enabled=true
+
 # Data source
 quarkus.datasource.db-kind=h2
 quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test;NON_KEYWORDS=VALUE,KEY
 # Hibernate
-quarkus.hibernate-orm.database.generation=create
-quarkus.hibernate-orm.database.generation.halt-on-error=true
 quarkus.hibernate-orm.physical-naming-strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy
 quarkus.hibernate-orm.jdbc.timezone=UTC
 quarkus.hibernate-orm.log.sql=true

diff --git a/data-index/data-index-storage/data-index-storage-postgresql-reporting/pom.xml b/data-index/data-index-storage/data-index-storage-postgresql-reporting/pom.xml
@@ -72,6 +72,11 @@
       <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-flyway</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/data-index/data-index-storage/data-index-storage-postgresql/pom.xml b/data-index/data-index-storage/data-index-storage-postgresql/pom.xml
@@ -78,6 +78,11 @@
       <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-flyway</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/.../resources/META-INF/kie-flyway.properties → .../resources/META-INF/kie-flyway.properties b/.../resources/META-INF/kie-flyway.properties → .../resources/META-INF/kie-flyway.properties
diff --git a/...to-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/pom.xml b/...to-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/deployment/pom.xml
@@ -66,6 +66,10 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-reactive-routes-deployment</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-flyway-deployment</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-junit5-internal</artifactId>

diff --git a/...s-data-index-inmemory/integration-tests-process/src/main/resources/application.properties b/...s-data-index-inmemory/integration-tests-process/src/main/resources/application.properties
@@ -24,4 +24,5 @@ quarkus.keycloak.devservices.enabled=false
 # Security
 quarkus.oidc.enabled=false
 quarkus.oidc.tenant-enabled=false
-quarkus.oidc.auth-server-url=none
+quarkus.oidc.auth-server-url=none
+quarkus.test.arg-line=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005
diff --git a/...ogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/pom.xml b/...ogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/pom.xml
@@ -46,6 +46,10 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-vertx-graphql</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-flyway</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/...gito-addons-quarkus-data-index-inmemory/runtime/src/main/resources/application.properties b/...gito-addons-quarkus-data-index-inmemory/runtime/src/main/resources/application.properties
@@ -30,4 +30,10 @@ quarkus.datasource."data_index".devservices.enabled=false
 quarkus.hibernate-orm.jdbc.timezone=UTC
 quarkus.hibernate-orm.datasource=data_index
 quarkus.hibernate-orm.database.generation=update
-quarkus.hibernate-orm.database.generation.halt-on-error=true
+quarkus.hibernate-orm.database.generation.halt-on-error=true
+
+#Flyway
+quarkus.flyway."data_index".locations=db/data-index/postgresql
+quarkus.flyway."data_index".migrate-at-start=true
+
+kie.flyway.modules."data-index".enabled=false