Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/maven-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven-sdk-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, macos-latest ]
java: [11]
java: [11,17,21]

outputs:
commit: ${{ steps.getCommit.outputs.commit }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 1 addition & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/main/archetype/it.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
18 changes: 3 additions & 15 deletions src/main/archetype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/archetype-post-generate.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion src/test/resources/projects-1_8/basic

This file was deleted.

1 change: 0 additions & 1 deletion src/test/resources/projects-1_8/basic-6.5.0

This file was deleted.

1 change: 0 additions & 1 deletion src/test/resources/projects-1_8/cif

This file was deleted.

1 change: 0 additions & 1 deletion src/test/resources/projects-1_8/forms-basic-6.5.0

This file was deleted.

1 change: 0 additions & 1 deletion src/test/resources/projects-1_8/frontend-angular

This file was deleted.

1 change: 0 additions & 1 deletion src/test/resources/projects-1_8/frontend-angular-ssr

This file was deleted.

1 change: 0 additions & 1 deletion src/test/resources/projects-1_8/frontend-general

This file was deleted.

1 change: 0 additions & 1 deletion src/test/resources/projects-1_8/frontend-react

This file was deleted.

1 change: 0 additions & 1 deletion src/test/resources/projects-1_8/frontend-react-ssr

This file was deleted.

Loading