You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2023/12/22 10:51:26 UTC
(maven-archetypes) branch jdk21 updated (e3ab5a3 -> 560f62b)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch jdk21
in repository https://gitbox.apache.org/repos/asf/maven-archetypes.git
discard e3ab5a3 [MARCHETYPES-76] Update to Java 8
discard 3daf973 Partially revert "[MARCHETYPES-76] maven-archetype-quickstart generates EOLed maven.compiler setup (#18)"
discard 6141bad Add tests with Java 8 and 21
new 9eea2ff [MARCHETYPES-78] Add tests with Java 8 and 21
new d7400ed [MARCHETYPES-78] Partially revert "[MARCHETYPES-76] maven-archetype-quickstart generates EOLed maven.compiler setup (#18)"
new 560f62b [MARCHETYPES-78] Update to Java 8
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (e3ab5a3)
\
N -- N -- N refs/heads/jdk21 (560f62b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
(maven-archetypes) 02/03: [MARCHETYPES-78] Partially revert "[MARCHETYPES-76] maven-archetype-quickstart generates EOLed maven.compiler setup (#18)"
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch jdk21
in repository https://gitbox.apache.org/repos/asf/maven-archetypes.git
commit d7400edaa9e7d4032c5c7f5dc748653b32e9da34
Author: Sylwester Lachiewicz <sl...@gmail.com>
AuthorDate: Fri Dec 22 10:53:12 2023 +0100
[MARCHETYPES-78] Partially revert "[MARCHETYPES-76] maven-archetype-quickstart generates EOLed maven.compiler setup (#18)"
This reverts commit bf9f2954030e86c3d9e44525591d294f4468cb59.
---
.../src/main/resources-filtered/archetype-resources/pom.xml | 10 +++++-----
.../archetype.properties | 2 +-
.../{it-java-7-junit-4.12 => it-java-8-junit-4.12}/goal.txt | 0
.../reference/.mvn/jvm.config | 0
.../reference/.mvn/maven.config | 0
.../reference/pom.xml | 4 ++--
.../reference/src/main/java/it/pkg/App.java | 0
.../reference/src/test/java/it/pkg/AppTest.java | 0
.../projects/{it-java-7 => it-java-8}/archetype.properties | 2 +-
.../test/resources/projects/{it-java-7 => it-java-8}/goal.txt | 0
.../{it-java-7 => it-java-8}/reference/.mvn/jvm.config | 0
.../{it-java-7 => it-java-8}/reference/.mvn/maven.config | 0
.../projects/{it-java-7 => it-java-8}/reference/pom.xml | 4 ++--
.../reference/src/main/java/it/pkg/App.java | 0
.../reference/src/test/java/it/pkg/AppTest.java | 0
15 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml
index 3b9f8ef..5ccc3fa 100644
--- a/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml
+++ b/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-#macro( compilerProperties $jcv )
+#macro( compilerProperties $javaCompilerVersion )
#set( $Double = 0.0 )
-#if ( $Double.valueOf($jcv) > 8 )
- <maven.compiler.release>${jcv}</maven.compiler.release>
+#if ( $Double.valueOf($javaCompilerVersion) > 8 )
+ <maven.compiler.release>${javaCompilerVersion}</maven.compiler.release>
#else
- <maven.compiler.source>${jcv}</maven.compiler.source>
- <maven.compiler.target>${jcv}</maven.compiler.target>
+ <maven.compiler.source>${javaCompilerVersion}</maven.compiler.source>
+ <maven.compiler.target>${javaCompilerVersion}</maven.compiler.target>
#end
#end
#macro( junit $ver )
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/archetype.properties b/maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/archetype.properties
similarity index 82%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/archetype.properties
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/archetype.properties
index 57dffc9..64ac86a 100644
--- a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/archetype.properties
+++ b/maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/archetype.properties
@@ -2,5 +2,5 @@ groupId=archetype.it
artifactId=java-8-junit-412-quickstart
version=0.1-SNAPSHOT
package=it.pkg
-javaCompilerVersion=1.7
+javaCompilerVersion=1.8
junitVersion=4.12
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/goal.txt b/maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/goal.txt
similarity index 100%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/goal.txt
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/goal.txt
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/.mvn/jvm.config b/maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/.mvn/jvm.config
similarity index 100%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/.mvn/jvm.config
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/.mvn/jvm.config
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/.mvn/maven.config b/maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/.mvn/maven.config
similarity index 100%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/.mvn/maven.config
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/.mvn/maven.config
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/pom.xml b/maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/pom.xml
similarity index 95%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/pom.xml
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/pom.xml
index cfd0d9b..61a23c6 100644
--- a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/pom.xml
+++ b/maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/pom.xml
@@ -13,8 +13,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/src/main/java/it/pkg/App.java b/maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/src/main/java/it/pkg/App.java
similarity index 100%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/src/main/java/it/pkg/App.java
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/src/main/java/it/pkg/App.java
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/src/test/java/it/pkg/AppTest.java b/maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/src/test/java/it/pkg/AppTest.java
similarity index 100%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/src/test/java/it/pkg/AppTest.java
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/src/test/java/it/pkg/AppTest.java
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/archetype.properties b/maven-archetype-quickstart/src/test/resources/projects/it-java-8/archetype.properties
similarity index 78%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7/archetype.properties
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8/archetype.properties
index c9870c6..c8706aa 100644
--- a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/archetype.properties
+++ b/maven-archetype-quickstart/src/test/resources/projects/it-java-8/archetype.properties
@@ -2,4 +2,4 @@ groupId=archetype.it
artifactId=java-8-quickstart
version=0.1-SNAPSHOT
package=it.pkg
-javaCompilerVersion=1.7
+javaCompilerVersion=1.8
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/goal.txt b/maven-archetype-quickstart/src/test/resources/projects/it-java-8/goal.txt
similarity index 100%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7/goal.txt
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8/goal.txt
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/.mvn/jvm.config b/maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/.mvn/jvm.config
similarity index 100%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/.mvn/jvm.config
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/.mvn/jvm.config
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/.mvn/maven.config b/maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/.mvn/maven.config
similarity index 100%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/.mvn/maven.config
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/.mvn/maven.config
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/pom.xml b/maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/pom.xml
similarity index 95%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/pom.xml
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/pom.xml
index a92c65d..26aba1c 100644
--- a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/pom.xml
+++ b/maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/pom.xml
@@ -13,8 +13,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/src/main/java/it/pkg/App.java b/maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/src/main/java/it/pkg/App.java
similarity index 100%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/src/main/java/it/pkg/App.java
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/src/main/java/it/pkg/App.java
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/src/test/java/it/pkg/AppTest.java b/maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/src/test/java/it/pkg/AppTest.java
similarity index 100%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/src/test/java/it/pkg/AppTest.java
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/src/test/java/it/pkg/AppTest.java
(maven-archetypes) 03/03: [MARCHETYPES-78] Update to Java 8
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch jdk21
in repository https://gitbox.apache.org/repos/asf/maven-archetypes.git
commit 560f62b68a32548005e9b7a8da7a309fa11163db
Author: Sylwester Lachiewicz <sl...@gmail.com>
AuthorDate: Fri Dec 22 10:58:53 2023 +0100
[MARCHETYPES-78] Update to Java 8
---
.../src/main/resources-filtered/archetype-resources/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/main/resources-filtered/archetype-resources/pom.xml | 6 +++---
.../src/main/resources-filtered/archetype-resources/pom.xml | 4 ++--
.../src/main/resources-filtered/archetype-resources/pom.xml | 4 ++--
.../src/main/resources-filtered/archetype-resources/pom.xml | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/pom.xml
index 7f8bb87..f87a72d 100644
--- a/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/pom.xml
+++ b/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/pom.xml
@@ -16,8 +16,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<build>
diff --git a/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml b/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml
index 4c25d0f..77c9658 100644
--- a/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml
+++ b/maven-archetype-archetype/src/main/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml
@@ -10,8 +10,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
diff --git a/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml
index 2dcba31..8c8ccb3 100644
--- a/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml
+++ b/maven-archetype-plugin/src/main/resources-filtered/archetype-resources/pom.xml
@@ -36,8 +36,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<maven.version>3.3.9</maven.version>
</properties>
@@ -65,7 +65,7 @@
<artifactId>maven-compat</artifactId>
<version>\${maven.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
diff --git a/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml
index a7df4cf..67a3be2 100644
--- a/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml
+++ b/maven-archetype-portlet/src/main/resources-filtered/archetype-resources/pom.xml
@@ -15,8 +15,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
diff --git a/maven-archetype-profiles/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-profiles/src/main/resources-filtered/archetype-resources/pom.xml
index b6d10cd..0fcf1e8 100644
--- a/maven-archetype-profiles/src/main/resources-filtered/archetype-resources/pom.xml
+++ b/maven-archetype-profiles/src/main/resources-filtered/archetype-resources/pom.xml
@@ -14,8 +14,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
diff --git a/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml
index fddc7f3..1b9ea01 100644
--- a/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml
+++ b/maven-archetype-simple/src/main/resources-filtered/archetype-resources/pom.xml
@@ -15,8 +15,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
(maven-archetypes) 01/03: [MARCHETYPES-78] Add tests with Java 8 and 21
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch jdk21
in repository https://gitbox.apache.org/repos/asf/maven-archetypes.git
commit 9eea2ff0ffb5f1a01b5ff6eeb2722ee71ac8f73f
Author: Sylwester Lachiewicz <sl...@gmail.com>
AuthorDate: Fri Dec 22 10:46:06 2023 +0100
[MARCHETYPES-78] Add tests with Java 8 and 21
---
.github/workflows/maven-verify.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
index 4d67fdc..29970f0 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -25,3 +25,5 @@ jobs:
build:
name: Verify
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
+ with:
+ jdk-matrix: '[ "8", "11", "17", "21" ]'