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 90f8b9ef0 NO_ISSUE: Copying resources directly to `target` instead to
`src/main/resources` to keep module sources clean. (#2106)
90f8b9ef0 is described below
commit 90f8b9ef0ebd4c1b96589735946224341cd3752c
Author: Pere Fernández <[email protected]>
AuthorDate: Fri Oct 4 15:56:19 2024 +0200
NO_ISSUE: Copying resources directly to `target` instead to
`src/main/resources` to keep module sources clean. (#2106)
* NO_ISSUE: Copying resources directly to `target` instead to
`src/main/resources` to keep module sources clean.
* - changed it tests
* - fix springboot it-tests
- renamed path variables
* - renamed path variables
* - fix target path
* Revert "- fix target path"
This reverts commit c6e36fe42cac397df4400f5aa1bdd2afe0fbf852.
* - fix Trusty Springboot IT test
---
.../.gitignore | 19 ------------------
.../pom.xml | 16 +--------------
.../.gitignore | 19 ------------------
.../pom.xml | 16 +--------------
.../.gitignore | 18 -----------------
.../pom.xml | 2 +-
.../.gitignore | 18 -----------------
.../pom.xml | 15 +-------------
.../.gitignore | 18 -----------------
.../pom.xml | 23 +++++++++-------------
.../data-index-storage-jpa/.gitignore | 1 -
.../data-index-storage-jpa/pom.xml | 13 ++++++------
.../main/resources/META-INF/kie-flyway.properties | 4 ++--
.../main/resources/META-INF/kie-flyway.properties | 2 +-
jobs-service/jobs-service-storage-jpa/.gitignore | 1 -
jobs-service/jobs-service-storage-jpa/pom.xml | 11 ++++++-----
.../persistence-commons-jpa/.gitignore | 1 -
.../persistence-commons-jpa/pom.xml | 11 ++++++-----
18 files changed, 35 insertions(+), 173 deletions(-)
diff --git
a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/.gitignore
b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/.gitignore
deleted file mode 100644
index e4c482fe2..000000000
---
a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/.gitignore
+++ /dev/null
@@ -1,19 +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.
-
-src/main/resources/**/*.bpmn
-src/main/resources/*.sql
\ No newline at end of file
diff --git
a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml
b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml
index 5773846b3..ad1b65312 100644
---
a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml
+++
b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml
@@ -137,7 +137,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
-
<outputDirectory>${project.basedir}/src/main/resources</outputDirectory>
+
<outputDirectory>${project.basedir}/target/classes</outputDirectory>
<resources>
<resource>
<directory>${project.parent.basedir}/integration-tests-data-index-service-common/src/main/resources</directory>
@@ -156,20 +156,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${project.basedir}/src/main/resources/</directory>
- <includes>
- <include>**/*.bpmn</include>
- <include>*create.sql</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
diff --git
a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/.gitignore
b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/.gitignore
deleted file mode 100644
index 27e5bc048..000000000
---
a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/.gitignore
+++ /dev/null
@@ -1,19 +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.
-
-src/main/resources/**/*.bpmn
-src/main/resources/*create.sql
\ No newline at end of file
diff --git
a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml
b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml
index 9540d3e3e..afc37da46 100644
---
a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml
+++
b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml
@@ -152,7 +152,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
-
<outputDirectory>${project.basedir}/src/main/resources</outputDirectory>
+
<outputDirectory>${project.basedir}/target/generated-resources</outputDirectory>
<resources>
<resource>
<directory>${project.parent.basedir}/integration-tests-data-index-service-common/src/main/resources</directory>
@@ -171,20 +171,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${project.basedir}/src/main/resources/</directory>
- <includes>
- <include>**/*.bpmn</include>
- <include>*create.sql</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
diff --git
a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/.gitignore
b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/.gitignore
deleted file mode 100644
index 76298e600..000000000
---
a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/.gitignore
+++ /dev/null
@@ -1,18 +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.
-
-src/main/resources/**/*.bpmn
\ No newline at end of file
diff --git
a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/pom.xml
b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/pom.xml
index 5ee3f0acb..c7c28d746 100644
---
a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/pom.xml
+++
b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-springboot/pom.xml
@@ -109,7 +109,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>src/main/resources</outputDirectory>
+
<outputDirectory>${project.basedir}/target/generated-resources</outputDirectory>
<resources>
<resource>
<directory>${common.test.resources.dir}</directory>
diff --git
a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/.gitignore
b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/.gitignore
deleted file mode 100644
index 2109313e7..000000000
---
a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/.gitignore
+++ /dev/null
@@ -1,18 +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.
-
-src/main/resources/**/*.dmn
diff --git
a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/pom.xml
b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/pom.xml
index ea3863b22..2b4ea70d9 100644
---
a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/pom.xml
+++
b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/pom.xml
@@ -83,7 +83,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
-
<outputDirectory>${project.basedir}/src/main/resources</outputDirectory>
+
<outputDirectory>${project.basedir}/target/classes</outputDirectory>
<resources>
<resource>
<directory>${project.parent.basedir}/integration-tests-trusty-service-common/src/main/resources</directory>
@@ -96,19 +96,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${project.basedir}/src/main/resources</directory>
- <includes>
- <include>*.dmn</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
<plugin>
<groupId>io.quarkus</groupId>
diff --git
a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/.gitignore
b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/.gitignore
deleted file mode 100644
index 2109313e7..000000000
---
a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/.gitignore
+++ /dev/null
@@ -1,18 +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.
-
-src/main/resources/**/*.dmn
diff --git
a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/pom.xml
b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/pom.xml
index ccc4b9331..1f01ab3b4 100644
---
a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/pom.xml
+++
b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-springboot/pom.xml
@@ -77,6 +77,14 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/target/generated-resources</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
@@ -87,7 +95,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
-
<outputDirectory>${project.basedir}/src/main/resources</outputDirectory>
+
<outputDirectory>${project.basedir}/target/generated-resources</outputDirectory>
<resources>
<resource>
<directory>${project.parent.basedir}/integration-tests-trusty-service-common/src/main/resources</directory>
@@ -100,19 +108,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${project.basedir}/src/main/resources</directory>
- <includes>
- <include>*.dmn</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
<plugin>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-maven-plugin</artifactId>
diff --git a/data-index/data-index-storage/data-index-storage-jpa/.gitignore
b/data-index/data-index-storage/data-index-storage-jpa/.gitignore
deleted file mode 100644
index dcbcbd920..000000000
--- a/data-index/data-index-storage/data-index-storage-jpa/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main/resources/kie-flyway/db/data-index/postgresql/*
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 61e0e2b61..393cc0901 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
@@ -34,12 +34,13 @@
<properties>
<path.to.postgresql.storage>../data-index-storage-postgresql</path.to.postgresql.storage>
-
<path.to.script.folder>src/main/resources/kie-flyway/db/</path.to.script.folder>
-
<path.to.migration.scripts.from>${path.to.postgresql.storage}/${path.to.script.folder}/data-index/postgresql</path.to.migration.scripts.from>
-
<path.to.migration.scripts.to>${path.to.script.folder}/data-index/postgresql</path.to.migration.scripts.to>
+
<path.to.flyway.location>kie-flyway/db/data-index/postgresql</path.to.flyway.location>
+
<path.to.script.folder>src/main/resources/${path.to.flyway.location}</path.to.script.folder>
+
<path.to.migration.scripts.source>${path.to.postgresql.storage}/${path.to.script.folder}</path.to.migration.scripts.source>
+
<path.to.migration.scripts.target>target/classes/${path.to.flyway.location}</path.to.migration.scripts.target>
<java.module.name>org.kie.kogito.index.jpa</java.module.name>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.kie.kogito</groupId>
@@ -131,10 +132,10 @@
<goal>copy-resources</goal>
</goals>
<configuration>
-
<outputDirectory>${path.to.migration.scripts.to}</outputDirectory>
+
<outputDirectory>${path.to.migration.scripts.target}</outputDirectory>
<resources>
<resource>
- <directory>${path.to.migration.scripts.from}</directory>
+ <directory>${path.to.migration.scripts.source}</directory>
<includes>
<include>*.sql</include>
</includes>
diff --git
a/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/META-INF/kie-flyway.properties
b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/META-INF/kie-flyway.properties
index d8f805bbb..41c52109f 100644
---
a/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/META-INF/kie-flyway.properties
+++
b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/META-INF/kie-flyway.properties
@@ -19,5 +19,5 @@
module.name=data-index
-module.locations.postgresql=classpath:kie-flyway/db/data-index/postgresql,classpath:kie-flyway/db/persistence-common/postgresql
-module.locations.default=classpath:kie-flyway/db/data-index/ansi,classpath:kie-flyway/db/persistence-common/ansi
\ No newline at end of file
+module.locations.postgresql=classpath:kie-flyway/db/data-index/postgresql,classpath:kie-flyway/db/persistence-commons/postgresql
+module.locations.default=classpath:kie-flyway/db/data-index/ansi,classpath:kie-flyway/db/persistence-commons/ansi
\ No newline at end of file
diff --git
a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/META-INF/kie-flyway.properties
b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/META-INF/kie-flyway.properties
index 2d8c8351c..383546a8f 100644
---
a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/META-INF/kie-flyway.properties
+++
b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/META-INF/kie-flyway.properties
@@ -19,4 +19,4 @@
module.name=data-index
-module.locations.postgresql=classpath:kie-flyway/db/data-index/postgresql,classpath:kie-flyway/db/persistence-common/postgresql
\ No newline at end of file
+module.locations.postgresql=classpath:kie-flyway/db/data-index/postgresql,classpath:kie-flyway/db/persistence-commons/postgresql
\ No newline at end of file
diff --git a/jobs-service/jobs-service-storage-jpa/.gitignore
b/jobs-service/jobs-service-storage-jpa/.gitignore
deleted file mode 100644
index 2df81122b..000000000
--- a/jobs-service/jobs-service-storage-jpa/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main/resources/kie-flyway/db/jobs-service/postgresql/*
diff --git a/jobs-service/jobs-service-storage-jpa/pom.xml
b/jobs-service/jobs-service-storage-jpa/pom.xml
index b4a105479..b49d36ce7 100644
--- a/jobs-service/jobs-service-storage-jpa/pom.xml
+++ b/jobs-service/jobs-service-storage-jpa/pom.xml
@@ -35,9 +35,10 @@
<properties>
<path.to.postgresql.storage>../jobs-service-postgresql-common</path.to.postgresql.storage>
- <path.to.script.folder>src/main/resources/db/</path.to.script.folder>
-
<path.to.migration.scripts.from>${path.to.postgresql.storage}/${path.to.script.folder}/jobs-service/postgresql</path.to.migration.scripts.from>
-
<path.to.migration.scripts.to>${path.to.script.folder}/jobs-service/postgresql</path.to.migration.scripts.to>
+
<path.to.flyway.location>kie-flyway/db/jobs-service/postgresql</path.to.flyway.location>
+
<path.to.script.folder>src/main/resources/${path.to.flyway.location}</path.to.script.folder>
+
<path.to.migration.scripts.source>${path.to.postgresql.storage}/${path.to.script.folder}</path.to.migration.scripts.source>
+
<path.to.migration.scripts.target>target/classes/${path.to.flyway.location}</path.to.migration.scripts.target>
<java.module.name>org.kie.kogito.job.service.repository.jpa</java.module.name>
</properties>
@@ -138,10 +139,10 @@
<goal>copy-resources</goal>
</goals>
<configuration>
-
<outputDirectory>${path.to.migration.scripts.to}</outputDirectory>
+
<outputDirectory>${path.to.migration.scripts.target}</outputDirectory>
<resources>
<resource>
-
<directory>${path.to.migration.scripts.from}</directory>
+
<directory>${path.to.migration.scripts.source}</directory>
<includes>
<include>*.sql</include>
</includes>
diff --git a/persistence-commons/persistence-commons-jpa/.gitignore
b/persistence-commons/persistence-commons-jpa/.gitignore
deleted file mode 100644
index 398874aed..000000000
--- a/persistence-commons/persistence-commons-jpa/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/src/main/resources/kie-flyway/db/persistence-commons/postgresql/*
\ No newline at end of file
diff --git a/persistence-commons/persistence-commons-jpa/pom.xml
b/persistence-commons/persistence-commons-jpa/pom.xml
index 55a1c1ace..234a38804 100644
--- a/persistence-commons/persistence-commons-jpa/pom.xml
+++ b/persistence-commons/persistence-commons-jpa/pom.xml
@@ -34,9 +34,10 @@
<properties>
<path.to.postgresql.storage>../persistence-commons-postgresql</path.to.postgresql.storage>
-
<path.to.script.folder>src/main/resources/kie-flyway/db/</path.to.script.folder>
-
<path.to.migration.scripts.from>${path.to.postgresql.storage}/${path.to.script.folder}/persistence-commons/postgresql</path.to.migration.scripts.from>
-
<path.to.migration.scripts.to>${path.to.script.folder}/persistence-commons/postgresql</path.to.migration.scripts.to>
+
<path.to.flyway.location>kie-flyway/db/persistence-commons/postgresql</path.to.flyway.location>
+
<path.to.script.folder>src/main/resources/${path.to.flyway.location}</path.to.script.folder>
+
<path.to.migration.scripts.source>${path.to.postgresql.storage}/${path.to.script.folder}</path.to.migration.scripts.source>
+
<path.to.migration.scripts.target>target/classes/${path.to.flyway.location}</path.to.migration.scripts.target>
<java.module.name>org.kie.kogito.persistence.jpa</java.module.name>
</properties>
@@ -77,10 +78,10 @@
<goal>copy-resources</goal>
</goals>
<configuration>
-
<outputDirectory>${path.to.migration.scripts.to}</outputDirectory>
+
<outputDirectory>${path.to.migration.scripts.target}</outputDirectory>
<resources>
<resource>
- <directory>${path.to.migration.scripts.from}</directory>
+ <directory>${path.to.migration.scripts.source}</directory>
<includes>
<include>*.sql</include>
</includes>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
