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 @@ -21,7 +21,7 @@ on: workflow_dispatch

jobs:
release:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
# Check out Git repository
- uses: actions/checkout@v2
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 @@ -28,7 +28,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ ubuntu-20.04, macos-latest, windows-latest ]
os: [ ubuntu-latest, macos-latest, windows-latest ]
java: [11,17,21]

steps:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ To generate a project, adjust the following command line to your needs:
mvn -B org.apache.maven.plugins:maven-archetype-plugin:3.3.1:generate \
-D archetypeGroupId=com.adobe.aem \
-D archetypeArtifactId=aem-project-archetype \
-D archetypeVersion=52\
-D archetypeVersion=53\
-D appTitle="My Site" \
-D appId="mysite" \
-D groupId="com.mysite"
Expand Down Expand Up @@ -101,7 +101,7 @@ mvn -B org.apache.maven.plugins:maven-archetype-plugin:3.3.1:generate \

| Archetype | AEM as a Cloud Service | AEM 6.5 | Java SE | Maven |
|--------------------------------------------------------------------------------------------|------------------------|-----------|---------|--------|
| [52](https://github.com/adobe/aem-project-archetype/releases/tag/aem-project-archetype-52) | Continual | 6.5.17.0+ | 11 | 3.3.9+ |
| [53](https://github.com/adobe/aem-project-archetype/releases/tag/aem-project-archetype-53) | Continual | 6.5.17.0+ | 11 | 3.3.9+ |

Setup your local development environment for [AEM as a Cloud Service SDK](https://experienceleague.adobe.com/docs/experience-manager-learn/cloud-service/local-development-environment-set-up/overview.html) or for [older versions of AEM.](https://experienceleague.adobe.com/docs/experience-manager-learn/foundation/development/set-up-a-local-aem-development-environment.html)

Expand Down
2 changes: 1 addition & 1 deletion VERSIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ Archetype Version | AEM Version
23 | 6.5, 6.4, 6.3 + SP3
24, 25, 26, 27 | 6.5.5, 6.4.8.1
28, 30, 31, 32, 33, 34, 35, 36, 37, 39, 40, 41, 42, 43, 44 | 6.5.7, AEM as a Cloud Service
45, 46, 47, 48, 49, 50, 51, 52 | 6.5.17, AEM as a Cloud Service
45, 46, 47, 48, 49, 50, 51, 52, 53 | 6.5.17, AEM as a Cloud Service
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<groupId>com.adobe.aem</groupId>
<artifactId>aem-project-archetype</artifactId>
<version>53-SNAPSHOT</version>
<version>54-SNAPSHOT</version>
<packaging>maven-archetype</packaging>

<name>AEM Multi-Module Archetype</name>
Expand Down
8 changes: 7 additions & 1 deletion src/main/archetype/ui.frontend.angular/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,13 @@ module.exports = function(config) {
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['ChromeHeadless'], // To be able to run tests in Docker
browsers: ['ChromeHeadlessNoSandbox'], // To be able to run tests in Docker
customLaunchers: {
ChromeHeadlessNoSandbox: {
base: 'ChromeHeadless',
flags: ['--no-sandbox']
}
},
// to avoid DISCONNECTED messages
browserDisconnectTimeout : 10000, // default 2000
browserDisconnectTolerance : 1, // default 0
Expand Down
Loading