Revert "[MARCHETYPES-76] maven-archetype-quickstart generates EOLed m…

…aven.compiler setup (#18)" Fails with Java 21 This reverts commit bf9f295.
apache · Dec 22, 2023 · 0da7166 · 0da7166
1 parent bf9f295
commit 0da7166
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 12 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
@@ -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 )
@@ -46,7 +46,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 #if ( ${javaCompilerVersion} == $null )
-#compilerProperties( "1.8" )
+#compilerProperties( "1.7" )
 #else
 #compilerProperties( ${javaCompilerVersion} )
 #end

diff --git a/...it-java-7-junit-4.12/archetype.properties → ...it-java-8-junit-4.12/archetype.properties b/...it-java-7-junit-4.12/archetype.properties → ...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/...es/projects/it-java-7-junit-4.12/goal.txt → ...es/projects/it-java-8-junit-4.12/goal.txt b/...es/projects/it-java-7-junit-4.12/goal.txt → ...es/projects/it-java-8-junit-4.12/goal.txt
diff --git a/...va-7-junit-4.12/reference/.mvn/jvm.config → ...va-8-junit-4.12/reference/.mvn/jvm.config b/...va-7-junit-4.12/reference/.mvn/jvm.config → ...va-8-junit-4.12/reference/.mvn/jvm.config
diff --git a/...-7-junit-4.12/reference/.mvn/maven.config → ...-8-junit-4.12/reference/.mvn/maven.config b/...-7-junit-4.12/reference/.mvn/maven.config → ...-8-junit-4.12/reference/.mvn/maven.config
diff --git a/...ts/it-java-7-junit-4.12/reference/pom.xml → ...ts/it-java-8-junit-4.12/reference/pom.xml b/...ts/it-java-7-junit-4.12/reference/pom.xml → ...ts/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/...2/reference/src/main/java/it/pkg/App.java → ...2/reference/src/main/java/it/pkg/App.java b/...2/reference/src/main/java/it/pkg/App.java → ...2/reference/src/main/java/it/pkg/App.java
diff --git a/...ference/src/test/java/it/pkg/AppTest.java → ...ference/src/test/java/it/pkg/AppTest.java b/...ference/src/test/java/it/pkg/AppTest.java → ...ference/src/test/java/it/pkg/AppTest.java
diff --git a/...s/projects/it-java-7/archetype.properties → ...s/projects/it-java-8/archetype.properties b/...s/projects/it-java-7/archetype.properties → ...s/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/...est/resources/projects/it-java-7/goal.txt → ...est/resources/projects/it-java-8/goal.txt b/...est/resources/projects/it-java-7/goal.txt → ...est/resources/projects/it-java-8/goal.txt
diff --git a/...jects/it-java-7/reference/.mvn/jvm.config → ...jects/it-java-8/reference/.mvn/jvm.config b/...jects/it-java-7/reference/.mvn/jvm.config → ...jects/it-java-8/reference/.mvn/jvm.config
diff --git a/...cts/it-java-7/reference/.mvn/maven.config → ...cts/it-java-8/reference/.mvn/maven.config b/...cts/it-java-7/reference/.mvn/maven.config → ...cts/it-java-8/reference/.mvn/maven.config
diff --git a/...rces/projects/it-java-7/reference/pom.xml → ...rces/projects/it-java-8/reference/pom.xml b/...rces/projects/it-java-7/reference/pom.xml → ...rces/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/...7/reference/src/main/java/it/pkg/App.java → ...8/reference/src/main/java/it/pkg/App.java b/...7/reference/src/main/java/it/pkg/App.java → ...8/reference/src/main/java/it/pkg/App.java
diff --git a/...ference/src/test/java/it/pkg/AppTest.java → ...ference/src/test/java/it/pkg/AppTest.java b/...ference/src/test/java/it/pkg/AppTest.java → ...ference/src/test/java/it/pkg/AppTest.java