This is an automated email from the ASF dual-hosted git repository.
tkobayas pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-drools.git
The following commit(s) were added to refs/heads/main by this push:
new 865beea0ae [incubator-kie-drools-6280] Update maven.compiler.release
for kie-archetypes (#6281)
865beea0ae is described below
commit 865beea0ae8ea00a7d35860926324a7b45a6581e
Author: Toshiya Kobayashi <[email protected]>
AuthorDate: Wed Mar 19 20:08:06 2025 +0900
[incubator-kie-drools-6280] Update maven.compiler.release for
kie-archetypes (#6281)
- Use properties for maven.compiler.release, slf4j-version, junit-version,
logback-version
---
.../resources/META-INF/maven/archetype-metadata.xml | 3 +++
.../src/main/resources/archetype-resources/pom.xml | 18 +++++++++---------
.../integrationtestDefaults/archetype.properties | 7 ++++---
.../projects/integrationtestDefaults/reference/pom.xml | 18 +++++++++---------
.../resources/META-INF/maven/archetype-metadata.xml | 3 +++
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../integrationtestDefaults/archetype.properties | 7 ++++---
.../projects/integrationtestDefaults/reference/pom.xml | 8 ++++----
.../resources/META-INF/maven/archetype-metadata.xml | 3 +++
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../integrationtestDefaults/archetype.properties | 7 ++++---
.../projects/integrationtestDefaults/reference/pom.xml | 8 ++++----
.../resources/META-INF/maven/archetype-metadata.xml | 3 +++
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../integrationtestDefaults/archetype.properties | 7 ++++---
.../projects/integrationtestDefaults/reference/pom.xml | 8 ++++----
16 files changed, 61 insertions(+), 45 deletions(-)
diff --git
a/kie-archetypes/kie-drools-dmn-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
b/kie-archetypes/kie-drools-dmn-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index a867b4b0c4..bd7981589a 100644
---
a/kie-archetypes/kie-drools-dmn-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++
b/kie-archetypes/kie-drools-dmn-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -23,6 +23,9 @@
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<requiredProperties>
+ <requiredProperty key="javaVersion">
+ <defaultValue>${maven.compiler.release}</defaultValue>
+ </requiredProperty>
<requiredProperty key="droolsVersion">
<defaultValue>${project.version}</defaultValue>
</requiredProperty>
diff --git
a/kie-archetypes/kie-drools-dmn-archetype/src/main/resources/archetype-resources/pom.xml
b/kie-archetypes/kie-drools-dmn-archetype/src/main/resources/archetype-resources/pom.xml
index 8122674f2e..f36395450e 100644
---
a/kie-archetypes/kie-drools-dmn-archetype/src/main/resources/archetype-resources/pom.xml
+++
b/kie-archetypes/kie-drools-dmn-archetype/src/main/resources/archetype-resources/pom.xml
@@ -34,11 +34,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.release>11</maven.compiler.release>
- <version.drools>${droolsVersion}</version.drools>
- <version.slf4j>${slf4jVersion}</version.slf4j>
- <version.junit>${junitVersion}</version.junit>
- <version.logback>${logbackVersion}</version.logback>
+ <maven.compiler.release>${javaVersion}</maven.compiler.release>
+ <drools-version>${droolsVersion}</drools-version>
+ <slf4j-version>${slf4jVersion}</slf4j-version>
+ <junit-version>${junitVersion}</junit-version>
+ <logback-version>${logbackVersion}</logback-version>
</properties>
<dependencyManagement>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.kie</groupId>
<artifactId>kie-dmn-bom</artifactId>
- <version>${version.drools}</version>
+ <version>${drools-version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
@@ -70,7 +70,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${version.junit}</version>
+ <version>${junit-version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${version.logback}</version>
+ <version>${logback-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -95,7 +95,7 @@
<plugin>
<groupId>org.kie</groupId>
<artifactId>kie-maven-plugin</artifactId>
- <version>${version.drools}</version>
+ <version>${drools-version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
diff --git
a/kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
b/kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
index 955eb678f2..27b70a9d6e 100644
---
a/kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
+++
b/kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
@@ -21,7 +21,8 @@ package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
artifactId=basic
+javaVersion=${maven.compiler.release}
droolsVersion=${project.version}
-slf4jVersion=1.7.2
-junitVersion=4.11
-logbackVersion=1.5.16
+slf4jVersion=${version.org.slf4j}
+junitVersion=${version.junit}
+logbackVersion=${version.ch.qos.logback}
diff --git
a/kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
b/kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
index 85b5c5c490..f10ade50f2 100644
---
a/kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
+++
b/kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
@@ -31,11 +31,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.release>11</maven.compiler.release>
- <version.drools>${project.version}</version.drools>
- <version.slf4j>1.7.2</version.slf4j>
- <version.junit>4.11</version.junit>
- <version.logback>1.5.16</version.logback>
+ <maven.compiler.release>${maven.compiler.release}</maven.compiler.release>
+ <drools-version>${project.version}</drools-version>
+ <slf4j-version>${version.org.slf4j}</slf4j-version>
+ <junit-version>${version.junit}</junit-version>
+ <logback-version>${version.ch.qos.logback}</logback-version>
</properties>
<dependencyManagement>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.kie</groupId>
<artifactId>kie-dmn-bom</artifactId>
- <version>${dollar}{version.drools}</version>
+ <version>${dollar}{drools-version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
@@ -67,7 +67,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>${junit-version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -78,7 +78,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${version.logback}</version>
+ <version>${logback-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -92,7 +92,7 @@
<plugin>
<groupId>org.kie</groupId>
<artifactId>kie-maven-plugin</artifactId>
- <version>${version.drools}</version>
+ <version>${drools-version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
diff --git
a/kie-archetypes/kie-drools-exec-model-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
b/kie-archetypes/kie-drools-exec-model-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 6691a5cc67..9bf984298a 100644
---
a/kie-archetypes/kie-drools-exec-model-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++
b/kie-archetypes/kie-drools-exec-model-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -23,6 +23,9 @@
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<requiredProperties>
+ <requiredProperty key="javaVersion">
+ <defaultValue>${maven.compiler.release}</defaultValue>
+ </requiredProperty>
<requiredProperty key="droolsVersion">
<defaultValue>${project.version}</defaultValue>
</requiredProperty>
diff --git
a/kie-archetypes/kie-drools-exec-model-archetype/src/main/resources/archetype-resources/pom.xml
b/kie-archetypes/kie-drools-exec-model-archetype/src/main/resources/archetype-resources/pom.xml
index 094cacd450..0db197fa01 100644
---
a/kie-archetypes/kie-drools-exec-model-archetype/src/main/resources/archetype-resources/pom.xml
+++
b/kie-archetypes/kie-drools-exec-model-archetype/src/main/resources/archetype-resources/pom.xml
@@ -34,7 +34,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.release>11</maven.compiler.release>
+ <maven.compiler.release>${javaVersion}</maven.compiler.release>
<drools-version>${droolsVersion}</drools-version>
<slf4j-version>${slf4jVersion}</slf4j-version>
<junit-version>${junitVersion}</junit-version>
diff --git
a/kie-archetypes/kie-drools-exec-model-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
b/kie-archetypes/kie-drools-exec-model-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
index 955eb678f2..27b70a9d6e 100644
---
a/kie-archetypes/kie-drools-exec-model-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
+++
b/kie-archetypes/kie-drools-exec-model-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
@@ -21,7 +21,8 @@ package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
artifactId=basic
+javaVersion=${maven.compiler.release}
droolsVersion=${project.version}
-slf4jVersion=1.7.2
-junitVersion=4.11
-logbackVersion=1.5.16
+slf4jVersion=${version.org.slf4j}
+junitVersion=${version.junit}
+logbackVersion=${version.ch.qos.logback}
diff --git
a/kie-archetypes/kie-drools-exec-model-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
b/kie-archetypes/kie-drools-exec-model-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
index c83d009011..ab1581e2ac 100644
---
a/kie-archetypes/kie-drools-exec-model-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
+++
b/kie-archetypes/kie-drools-exec-model-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
@@ -31,11 +31,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.release>11</maven.compiler.release>
+ <maven.compiler.release>${maven.compiler.release}</maven.compiler.release>
<drools-version>${project.version}</drools-version>
- <slf4j-version>1.7.2</slf4j-version>
- <junit-version>4.11</junit-version>
- <logback-version>1.5.16</logback-version>
+ <slf4j-version>${version.org.slf4j}</slf4j-version>
+ <junit-version>${version.junit}</junit-version>
+ <logback-version>${version.ch.qos.logback}</logback-version>
</properties>
<dependencyManagement>
diff --git
a/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
b/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index df9b53c707..fad641273d 100644
---
a/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++
b/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -23,6 +23,9 @@
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<requiredProperties>
+ <requiredProperty key="javaVersion">
+ <defaultValue>${maven.compiler.release}</defaultValue>
+ </requiredProperty>
<requiredProperty key="droolsVersion">
<defaultValue>${project.version}</defaultValue>
</requiredProperty>
diff --git
a/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/main/resources/archetype-resources/pom.xml
b/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/main/resources/archetype-resources/pom.xml
index 199bb027f0..fb6bba465d 100644
---
a/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/main/resources/archetype-resources/pom.xml
+++
b/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/main/resources/archetype-resources/pom.xml
@@ -34,7 +34,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.release>11</maven.compiler.release>
+ <maven.compiler.release>${javaVersion}</maven.compiler.release>
<drools-version>${droolsVersion}</drools-version>
<slf4j-version>${slf4jVersion}</slf4j-version>
<junit-version>${junitVersion}</junit-version>
diff --git
a/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
b/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
index aa12980bdd..5275cd4af2 100644
---
a/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
+++
b/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
@@ -22,8 +22,9 @@ package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
artifactId=basic
+javaVersion=${maven.compiler.release}
droolsVersion=${project.version}
-slf4jVersion=1.7.2
-junitVersion=4.11
-logbackVersion=1.5.16
+slf4jVersion=${version.org.slf4j}
+junitVersion=${version.junit}
+logbackVersion=${version.ch.qos.logback}
diff --git
a/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
b/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
index 3bb4ea9b14..9d0a604c07 100644
---
a/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
+++
b/kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
@@ -31,11 +31,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.release>11</maven.compiler.release>
+ <maven.compiler.release>${maven.compiler.release}</maven.compiler.release>
<drools-version>${project.version}</drools-version>
- <slf4j-version>1.7.2</slf4j-version>
- <junit-version>4.11</junit-version>
- <logback-version>1.5.16</logback-version>
+ <slf4j-version>${version.org.slf4j}</slf4j-version>
+ <junit-version>${version.junit}</junit-version>
+ <logback-version>${version.ch.qos.logback}</logback-version>
</properties>
<dependencyManagement>
diff --git
a/kie-archetypes/kie-drools-yaml-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
b/kie-archetypes/kie-drools-yaml-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 9d9247c21e..921914d206 100644
---
a/kie-archetypes/kie-drools-yaml-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++
b/kie-archetypes/kie-drools-yaml-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -23,6 +23,9 @@
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<requiredProperties>
+ <requiredProperty key="javaVersion">
+ <defaultValue>${maven.compiler.release}</defaultValue>
+ </requiredProperty>
<requiredProperty key="droolsVersion">
<defaultValue>${project.version}</defaultValue>
</requiredProperty>
diff --git
a/kie-archetypes/kie-drools-yaml-archetype/src/main/resources/archetype-resources/pom.xml
b/kie-archetypes/kie-drools-yaml-archetype/src/main/resources/archetype-resources/pom.xml
index 163da14646..d70b2bfe5b 100644
---
a/kie-archetypes/kie-drools-yaml-archetype/src/main/resources/archetype-resources/pom.xml
+++
b/kie-archetypes/kie-drools-yaml-archetype/src/main/resources/archetype-resources/pom.xml
@@ -34,7 +34,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.release>11</maven.compiler.release>
+ <maven.compiler.release>${javaVersion}</maven.compiler.release>
<drools-version>${droolsVersion}</drools-version>
<slf4j-version>${slf4jVersion}</slf4j-version>
<junit-version>${junitVersion}</junit-version>
diff --git
a/kie-archetypes/kie-drools-yaml-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
b/kie-archetypes/kie-drools-yaml-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
index 955eb678f2..27b70a9d6e 100644
---
a/kie-archetypes/kie-drools-yaml-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
+++
b/kie-archetypes/kie-drools-yaml-archetype/src/test/resources/projects/integrationtestDefaults/archetype.properties
@@ -21,7 +21,8 @@ package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
artifactId=basic
+javaVersion=${maven.compiler.release}
droolsVersion=${project.version}
-slf4jVersion=1.7.2
-junitVersion=4.11
-logbackVersion=1.5.16
+slf4jVersion=${version.org.slf4j}
+junitVersion=${version.junit}
+logbackVersion=${version.ch.qos.logback}
diff --git
a/kie-archetypes/kie-drools-yaml-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
b/kie-archetypes/kie-drools-yaml-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
index 032dc612a3..56b2de84e8 100644
---
a/kie-archetypes/kie-drools-yaml-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
+++
b/kie-archetypes/kie-drools-yaml-archetype/src/test/resources/projects/integrationtestDefaults/reference/pom.xml
@@ -31,11 +31,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.release>11</maven.compiler.release>
+ <maven.compiler.release>${maven.compiler.release}</maven.compiler.release>
<drools-version>${project.version}</drools-version>
- <slf4j-version>1.7.2</slf4j-version>
- <junit-version>4.11</junit-version>
- <logback-version>1.5.16</logback-version>
+ <slf4j-version>${version.org.slf4j}</slf4j-version>
+ <junit-version>${version.junit}</junit-version>
+ <logback-version>${version.ch.qos.logback}</logback-version>
</properties>
<dependencyManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
