Merge branch 'main' into SITES-28486

adobe · Feb 19, 2025 · 6330090 · 6330090
2 parents b7e546b + d8834a1
commit 6330090
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -56,7 +56,7 @@
         <vault.user>admin</vault.user>
         <vault.password>admin</vault.password>
         <slf4j.version>1.7.25</slf4j.version>
-        <aem.java.version>11</aem.java.version>
+        <aem.java.version>8</aem.java.version>
         <jacoco.version>0.8.8</jacoco.version>
         <frontend-maven-plugin.version>1.11.3</frontend-maven-plugin.version>
         <node.version>v16.13.1</node.version>
@@ -305,7 +305,7 @@
                     <version>5.1.4</version>
                     <configuration>
                         <instructions>
-                            <Bundle-RequiredExecutionEnvironment>JavaSE-${aem.java.version}</Bundle-RequiredExecutionEnvironment>
+                            <Bundle-RequiredExecutionEnvironment>JavaSE-1.${aem.java.version}</Bundle-RequiredExecutionEnvironment>
                         </instructions>
                     </configuration>
                     <executions>

diff --git a/testing/it/e2e-selenium/pom.xml b/testing/it/e2e-selenium/pom.xml
@@ -142,7 +142,7 @@
     </build>
 
     <properties>
-        <cq.java.version>11</cq.java.version>
+        <aem.java.version>11</aem.java.version>
         <excludedGroups>failing,nested</excludedGroups>
         <granite.it.author.url>http://localhost:4502</granite.it.author.url>
         <granite.it.publish.url>http://localhost:4503</granite.it.publish.url>

diff --git a/testing/it/http/pom.xml b/testing/it/http/pom.xml
@@ -45,8 +45,8 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.0</version>
                     <configuration>
-                        <source>${cq.java.version}</source>
-                        <target>${cq.java.version}</target>
+                        <source>${aem.java.version}</source>
+                        <target>${aem.java.version}</target>
                         <encoding>${project.build.sourceEncoding}</encoding>
                     </configuration>
                 </plugin>
@@ -149,7 +149,7 @@
         <granite.it.publish.url>http://localhost:4503</granite.it.publish.url>
         <sling.junit.core.version>1.0.28</sling.junit.core.version>
         <sling.testing.tools.version>1.0.8</sling.testing.tools.version>
-        <cq.java.version>11</cq.java.version>
+        <aem.java.version>11</aem.java.version>
         <test.thread.count>30</test.thread.count>
     </properties>