chore: update to min java11, preferred java21 (#1264)

* chore: update to min java11, preferred java21

* chore: update aem-mock to 5.5.0 (#1165)

* chore: update aem-mock, update groovy, run tests with java 11,17,21

* chore: remove more references to java8, include java-version file

* chore: remove more references to java8, include java-version file

* test: remove project-1_8

Author: buuhuu

.github/workflows/maven-release.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 8
+          java-version: 11
 
       # Set up dependency cache
       - name: Cache local Maven repository

.github/workflows/maven-sdk-update.yml

@@ -29,7 +29,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest ]
-        java: [11]
+        java: [11,17,21]
 
     outputs:
       commit: ${{ steps.getCommit.outputs.commit }}

.github/workflows/maven-test.yml

@@ -29,7 +29,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-20.04, macos-latest, windows-latest ]
-        java: [11]
+        java: [11,17,21]
 
     steps:
       - name: Configure git with longpath enabled (for windows)

pom.xml

@@ -108,7 +108,7 @@
                     <dependency>
                         <groupId>org.codehaus.groovy</groupId>
                         <artifactId>groovy-all</artifactId>
-                        <version>3.0.8</version>
+                        <version>3.0.24</version>
                         <type>pom</type> <!-- required JUST since Groovy 2.5.0 -->
                     </dependency>
                 </dependencies>
@@ -174,16 +174,6 @@
             </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>

src/main/archetype/it.tests/pom.xml

@@ -30,8 +30,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>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
     <dependencies>

src/main/archetype/pom.xml

@@ -91,7 +91,7 @@
 #end
         <aem.forms.sdk.api>SDK_FORMS_VERSION</aem.forms.sdk.api>
 #end
-        <bnd.version>5.1.2</bnd.version>
+        <bnd.version>6.4.0</bnd.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 #if ( $isSpaProject )
@@ -107,7 +107,7 @@
 #end
 #if ( $aemVersion == "cloud")
         <aem.sdk.api>SDK_VERSION</aem.sdk.api>
-        <aemanalyser.version>1.4.10</aemanalyser.version>
+        <aemanalyser.version>1.6.6</aemanalyser.version>
 #end
         <componentGroupName>$appTitle</componentGroupName>
     </properties>
@@ -148,17 +148,10 @@
                                 <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>
@@ -169,12 +162,7 @@
                 <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>
@@ -970,7 +958,7 @@ Bundle-DocURL:
             <dependency>
                 <groupId>io.wcm</groupId>
                 <artifactId>io.wcm.testing.aem-mock.junit5</artifactId>
-                <version>5.1.2</version>
+                <version>5.5.4</version>
                 <scope>test</scope>
                 <exclusions>
                     <exclusion>

src/main/resources/META-INF/archetype-post-generate.groovy

@@ -85,7 +85,7 @@ if (aemVersion == "cloud") {
     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");
+    new File(cloudManagerDir, "java-version").write("21");
 }
 
 buildContentSkeleton(uiContentPackage, uiAppsPackage, singleCountry, appId, language, country)