Skip to content

Commit 72a123a

Browse files
adamcinbuuhuu
andauthored
ASSETS-35923 create .cloudmanager/java-version for cloud projects, min 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 <[email protected]>
1 parent 4cc5eb3 commit 72a123a

File tree

12 files changed

+34
-1
lines changed

12 files changed

+34
-1
lines changed

pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,16 @@
174174
</properties>
175175
</profile>
176176
177+
<profile>
178+
<id>it-java8</id>
179+
<activation>
180+
<jdk>[1.8,11)</jdk>
181+
</activation>
182+
<properties>
183+
<archetype.test.projectsDirectory>${project.build.testOutputDirectory}/projects-1_8</archetype.test.projectsDirectory>
184+
</properties>
185+
</profile>
186+
177187
<profile>
178188
<!-- This is the release profile. -->
179189
<id>release</id>

src/main/archetype/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,17 @@
148148
<requireMavenVersion>
149149
<version>[3.3.9,)</version>
150150
</requireMavenVersion>
151+
#if ( $aemVersion == "cloud")
152+
<requireJavaVersion>
153+
<message>Maven must be executed with a Java 11 JRE or higher.</message>
154+
<version>11</version>
155+
</requireJavaVersion>
156+
#else
151157
<requireJavaVersion>
152158
<message>Maven must be executed with a Java 8 JRE or higher.</message>
153159
<version>1.8.0</version>
154160
</requireJavaVersion>
161+
#end
155162
</rules>
156163
</configuration>
157164
</execution>
@@ -162,8 +169,12 @@
162169
<groupId>org.apache.maven.plugins</groupId>
163170
<artifactId>maven-compiler-plugin</artifactId>
164171
<configuration>
172+
#if ( $aemVersion == "cloud")
173+
<release>11</release>
174+
#else
165175
<source>1.8</source>
166176
<target>1.8</target>
177+
#end
167178
</configuration>
168179
</plugin>
169180
</plugins>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@ if (aemVersion == "cloud") {
8888
}
8989
println "Using AEM as a Cloud Service SDK version: " + sdkVersion
9090
rootPom.text = rootPom.text.replaceAll('SDK_VERSION', sdkVersion.toString())
91+
def cloudManagerDir = new File(rootDir, ".cloudmanager");
92+
assert cloudManagerDir.mkdir();
93+
new File(cloudManagerDir, "java-version").write("11");
9194
}
9295

9396
buildContentSkeleton(uiContentPackage, uiAppsPackage, singleCountry, appId, language, country)
@@ -259,7 +262,7 @@ if (includeForms == "y" || includeFormsenrollment == "y" || includeFormscommunic
259262
}
260263
println "Using AEM Forms as a Cloud Service SDK version: " + sdkFormsVersion
261264
rootPom.text = rootPom.text.replaceAll('SDK_FORMS_VERSION', sdkFormsVersion.toString())
262-
265+
263266
}
264267

265268
// if config.publish folder ends up empty, remove it, otherwise the filevault-package-maven-plugin will throw

src/test/resources/projects-1_8/basic

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../projects/basic
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../projects/basic-6.5.0

src/test/resources/projects-1_8/cif

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../projects/cif
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../projects/forms-basic-6.5.0
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../projects/frontend-angular
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../projects/frontend-angular-ssr
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../projects/frontend-general

0 commit comments

Comments
 (0)