ASSETS-35923 create .cloudmanager/java-version for cloud projects, mi…

…n jdk11 (#1175) * create .cloudmanager/java-version for cloud projects, min jdk11 * revert change to maven-release.yml * set maven-compiler-plugin release=11 configuration to match min jdk11 --------- Co-authored-by: Dirk Rudolph <drudolph@adobe.com>
adobe · Mar 12, 2024 · 72a123a · 72a123a
1 parent 4cc5eb3
commit 72a123a
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -174,6 +174,16 @@
             </properties>
         </profile>
 
+        <profile>
+            <id>it-java8</id>
+            <activation>
+                <jdk>[1.8,11)</jdk>
+            </activation>
+            <properties>
+                <archetype.test.projectsDirectory>${project.build.testOutputDirectory}/projects-1_8</archetype.test.projectsDirectory>
+            </properties>
+        </profile>
+
         <profile>
             <!-- This is the release profile. -->
             <id>release</id>

diff --git a/src/main/archetype/pom.xml b/src/main/archetype/pom.xml
@@ -148,10 +148,17 @@
                                 <requireMavenVersion>
                                     <version>[3.3.9,)</version>
                                 </requireMavenVersion>
+#if ( $aemVersion == "cloud")
+                                <requireJavaVersion>
+                                    <message>Maven must be executed with a Java 11 JRE or higher.</message>
+                                    <version>11</version>
+                                </requireJavaVersion>
+#else
                                 <requireJavaVersion>
                                     <message>Maven must be executed with a Java 8 JRE or higher.</message>
                                     <version>1.8.0</version>
                                 </requireJavaVersion>
+#end
                             </rules>
                         </configuration>
                     </execution>
@@ -162,8 +169,12 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
+#if ( $aemVersion == "cloud")
+                    <release>11</release>
+#else
                     <source>1.8</source>
                     <target>1.8</target>
+#end
                 </configuration>
             </plugin>
         </plugins>

diff --git a/src/main/resources/META-INF/archetype-post-generate.groovy b/src/main/resources/META-INF/archetype-post-generate.groovy
@@ -88,6 +88,9 @@ if (aemVersion == "cloud") {
     }
     println "Using AEM as a Cloud Service SDK version: " + sdkVersion
     rootPom.text = rootPom.text.replaceAll('SDK_VERSION', sdkVersion.toString())
+    def cloudManagerDir = new File(rootDir, ".cloudmanager");
+    assert cloudManagerDir.mkdir();
+    new File(cloudManagerDir, "java-version").write("11");
 }
 
 buildContentSkeleton(uiContentPackage, uiAppsPackage, singleCountry, appId, language, country)
@@ -259,7 +262,7 @@ if (includeForms == "y" || includeFormsenrollment == "y" || includeFormscommunic
     }
     println "Using AEM Forms as a Cloud Service SDK version: " + sdkFormsVersion
     rootPom.text = rootPom.text.replaceAll('SDK_FORMS_VERSION', sdkFormsVersion.toString())
-    
+
 }
 
 // if config.publish folder ends up empty, remove it, otherwise the filevault-package-maven-plugin will throw

diff --git a/src/test/resources/projects-1_8/basic b/src/test/resources/projects-1_8/basic
@@ -0,0 +1 @@
+../projects/basic
diff --git a/src/test/resources/projects-1_8/basic-6.5.0 b/src/test/resources/projects-1_8/basic-6.5.0
@@ -0,0 +1 @@
+../projects/basic-6.5.0
diff --git a/src/test/resources/projects-1_8/cif b/src/test/resources/projects-1_8/cif
@@ -0,0 +1 @@
+../projects/cif
diff --git a/src/test/resources/projects-1_8/forms-basic-6.5.0 b/src/test/resources/projects-1_8/forms-basic-6.5.0
@@ -0,0 +1 @@
+../projects/forms-basic-6.5.0
diff --git a/src/test/resources/projects-1_8/frontend-angular b/src/test/resources/projects-1_8/frontend-angular
@@ -0,0 +1 @@
+../projects/frontend-angular
diff --git a/src/test/resources/projects-1_8/frontend-angular-ssr b/src/test/resources/projects-1_8/frontend-angular-ssr
@@ -0,0 +1 @@
+../projects/frontend-angular-ssr
diff --git a/src/test/resources/projects-1_8/frontend-general b/src/test/resources/projects-1_8/frontend-general
@@ -0,0 +1 @@
+../projects/frontend-general
diff --git a/src/test/resources/projects-1_8/frontend-react b/src/test/resources/projects-1_8/frontend-react
@@ -0,0 +1 @@
+../projects/frontend-react
diff --git a/src/test/resources/projects-1_8/frontend-react-ssr b/src/test/resources/projects-1_8/frontend-react-ssr
@@ -0,0 +1 @@
+../projects/frontend-react-ssr