[MARCHETYPES-81] generate target 8 instead of 1.8

apache · Jan 7, 2024 · d7ebf01 · d7ebf01
1 parent e0da200
commit d7ebf01
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 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
@@ -16,8 +16,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
   </properties>
 
   <build>

diff --git a/...ain/resources-filtered/archetype-resources/src/main/resources/archetype-resources/pom.xml b/...ain/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.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>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
@@ -36,8 +36,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
     <maven.version>3.3.9</maven.version>
   </properties>
 

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
@@ -15,8 +15,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>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
@@ -14,8 +14,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
   </properties>
 
   <dependencies>

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
@@ -46,7 +46,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 #if ( ${javaCompilerVersion} == $null )
-#compilerProperties( "1.8" )
+#compilerProperties( "8" )
 #else
 #compilerProperties( ${javaCompilerVersion} )
 #end

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-7/archetype.properties
@@ -2,4 +2,4 @@ groupId=archetype.it
 artifactId=java-8-quickstart
 version=0.1-SNAPSHOT
 package=it.pkg
-javaCompilerVersion=1.7
+javaCompilerVersion=7
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-7/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>7</maven.compiler.source>
+    <maven.compiler.target>7</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
@@ -15,8 +15,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
   </properties>
 
   <dependencies>

diff --git a/maven-archetype-webapp/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-webapp/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.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
   </properties>
 
   <dependencies>