You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2023/05/02 09:12:05 UTC
[turbine-parent] 01/02: Update Apache parent to v.29, update cyclonedx to 2.7.8
This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-parent.git
commit aa8549b78ae09d40217fe60718c8fac219fcdbf0
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Tue May 2 10:49:56 2023 +0200
Update Apache parent to v.29, update cyclonedx to 2.7.8
---
README.md | 5 +++++
pom.xml | 9 +++++++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 7b124bd..099362f 100644
--- a/README.md
+++ b/README.md
@@ -43,3 +43,8 @@ Since v10
Since v11
- Requires Java 11 minimal.
+
+Since v12
+
+- Exclude jacoco if jvm > 18,
+- Add cyclonedx for apache-release
diff --git a/pom.xml b/pom.xml
index 6a9c238..a6b4ad8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>27</version>
+ <version>29</version>
<relativePath />
</parent>
<groupId>org.apache.turbine</groupId>
@@ -210,7 +210,7 @@
<plugin>
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId>
- <version>2.7.4</version>
+ <version>2.7.8</version>
</plugin>
</plugins>
</pluginManagement>
@@ -510,6 +510,9 @@
<phase>package</phase>
</execution>
</executions>
+ <configuration>
+ <outputName>${artifactId}-${version}-bom</outputName>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -605,6 +608,7 @@
<properties>
<java.version>12</java.version>
<turbine.compiler.compilerVersion>12</turbine.compiler.compilerVersion>
+ <maven.compiler.target>12</maven.compiler.target>
<maven.compiler.release>12</maven.compiler.release>
</properties>
</profile>
@@ -644,6 +648,7 @@
<!-- Default configuration for compiler source and target JVM -->
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.release>11</maven.compiler.release>
<java.version>11</java.version>
<!-- Compiler and surefire plugin settings for "java" profiles, maven.compiler.* is now different from compilerVersion, which