diff --git a/README.md b/README.md index 48742f7e6..673597b38 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Maven template that creates a minimal, best-practices-based Adobe Experience Man To generate a project, adjust the following command line to your needs: * Set `aemVersion=cloud` for [AEM as a Cloud Service](https://experienceleague.adobe.com/docs/experience-manager-cloud-service/content/home.html); - Set `aemVersion=6.5.7` for [Adobe Managed Services](https://github.com/adobe/aem-project-archetype/tree/master/src/main/archetype/dispatcher.ams), or on-premise. + Set `aemVersion=6.5.8` for [Adobe Managed Services](https://github.com/adobe/aem-project-archetype/tree/master/src/main/archetype/dispatcher.ams), or on-premise. The Core Components dependency is only added for non cloud aem versions as the Core Components are provided OOTB for AEM as a Cloud Service. * Adjust `appTitle="My Site"` to define the website title and components groups. @@ -75,7 +75,7 @@ Name | Default | Description `groupId` | | Base Maven group ID (e.g. `"com.mysite"`). This value must be a [valid Java package name.](https://docs.oracle.com/javase/specs/jls/se6/html/packages.html#7.7) `package` | *`${groupId}`* | Java Source Package (e.g. `"com.mysite"`). `version` | `1.0-SNAPSHOT` | Project version (e.g. `1.0-SNAPSHOT`). -`aemVersion` | `cloud` | Target AEM version (can be `cloud` for [AEM as a Cloud Service](https://experienceleague.adobe.com/docs/experience-manager-cloud-service/content/home.html); or `6.5.5` for [Adobe Managed Services](https://github.com/adobe/aem-project-archetype/tree/master/src/main/archetype/dispatcher.ams) or on-premise). +`aemVersion` | `cloud` | Target AEM version (can be `cloud` for [AEM as a Cloud Service](https://experienceleague.adobe.com/docs/experience-manager-cloud-service/content/home.html); or `6.5.8` for [Adobe Managed Services](https://github.com/adobe/aem-project-archetype/tree/master/src/main/archetype/dispatcher.ams) or on-premise). `sdkVersion` | `latest` | When `aemVersion=cloud` an [SDK](https://experienceleague.adobe.com/docs/experience-manager-cloud-service/content/implementing/developing/aem-as-a-cloud-service-sdk.html) version can be specified (e.g. `2020.02.2265.20200217T222518Z-200130`). `includeDispatcherConfig` | `y` | Includes a dispatcher configuration either for cloud or for AMS/on-premise, depending of the value of `aemVersion` (can be `y` or `n`). `frontendModule` | `general` | Includes a Webpack frontend build module that generates the client libraries (can be `general` or `none` for regular sites; can be `angular`, `react` or `decoupled` for a Single Page App that implements the [SPA Editor.](https://experienceleague.adobe.com/docs/experience-manager-cloud-service/content/implementing/developing/aem-as-a-cloud-service-sdk.html) In the later case the project will be preconfigured to use the [AEM as a Cloud Service Frontend Pipeline](https://experienceleague.adobe.com/docs/experience-manager-cloud-service/content/sites/administering/site-creation/enable-front-end-pipeline.html)). diff --git a/src/main/archetype/pom.xml b/src/main/archetype/pom.xml index bea94d070..5e439d138 100644 --- a/src/main/archetype/pom.xml +++ b/src/main/archetype/pom.xml @@ -74,7 +74,7 @@ ${env.AIO_RUNTIME_NAMESPACE} ${env.AIO_RUNTIME_AUTH} #end - 2.23.4 + 2.24.6 #if ( $includeCif == "y" ) 2.12.6 9.1.0-magento242ee diff --git a/src/test/resources/projects/basic-6.5.0/archetype.properties b/src/test/resources/projects/basic-6.5.0/archetype.properties index 4820ebf5d..14a0e2dd6 100644 --- a/src/test/resources/projects/basic-6.5.0/archetype.properties +++ b/src/test/resources/projects/basic-6.5.0/archetype.properties @@ -4,7 +4,7 @@ appId=testing-basic package=it.pkg version=0.1-SNAPSHOT appTitle=Test Basic Project -aemVersion=6.5.0 +aemVersion=6.5.8 sdkVersion=latest language=en country=us diff --git a/src/test/resources/projects/basic/archetype.properties b/src/test/resources/projects/basic/archetype.properties index 8baac7de5..e9320d8e8 100644 --- a/src/test/resources/projects/basic/archetype.properties +++ b/src/test/resources/projects/basic/archetype.properties @@ -4,7 +4,7 @@ appId=testing-basic package=it.pkg version=0.1-SNAPSHOT appTitle=Test Basic Project -aemVersion=6.5.7 +aemVersion=6.5.8 sdkVersion=latest language=en country=us diff --git a/src/test/resources/projects/cif/archetype.properties b/src/test/resources/projects/cif/archetype.properties index 986c50431..9b61a1bff 100644 --- a/src/test/resources/projects/cif/archetype.properties +++ b/src/test/resources/projects/cif/archetype.properties @@ -4,7 +4,7 @@ appId=testing-cif package=it.pkg version=0.1-SNAPSHOT appTitle=Test CIF Project -aemVersion=6.5.7 +aemVersion=6.5.8 sdkVersion=latest language=en country=us diff --git a/src/test/resources/projects/frontend-angular-ssr/archetype.properties b/src/test/resources/projects/frontend-angular-ssr/archetype.properties index 255334542..8a78afbbe 100644 --- a/src/test/resources/projects/frontend-angular-ssr/archetype.properties +++ b/src/test/resources/projects/frontend-angular-ssr/archetype.properties @@ -4,7 +4,7 @@ appId=testing-frontend-angular package=it.pkg version=0.1-SNAPSHOT appTitle=Test Angular Frontend Project -aemVersion=6.5.7 +aemVersion=6.5.8 sdkVersion=latest language=en country=us diff --git a/src/test/resources/projects/frontend-angular/archetype.properties b/src/test/resources/projects/frontend-angular/archetype.properties index 5d238c58c..39fbb0fca 100644 --- a/src/test/resources/projects/frontend-angular/archetype.properties +++ b/src/test/resources/projects/frontend-angular/archetype.properties @@ -4,7 +4,7 @@ appId=testing-frontend-angular package=it.pkg version=0.1-SNAPSHOT appTitle=Test Angular Frontend Project -aemVersion=6.5.7 +aemVersion=6.5.8 sdkVersion=latest language=en country=us diff --git a/src/test/resources/projects/frontend-general/archetype.properties b/src/test/resources/projects/frontend-general/archetype.properties index 423f6f390..4da4cd7f3 100644 --- a/src/test/resources/projects/frontend-general/archetype.properties +++ b/src/test/resources/projects/frontend-general/archetype.properties @@ -4,7 +4,7 @@ appId=testing-frontend-general package=it.pkg version=0.1-SNAPSHOT appTitle=Test General Frontend Project -aemVersion=6.5.7 +aemVersion=6.5.8 sdkVersion=latest language=en country=us diff --git a/src/test/resources/projects/frontend-react-ssr/archetype.properties b/src/test/resources/projects/frontend-react-ssr/archetype.properties index 03a898eba..43a1d6a1b 100644 --- a/src/test/resources/projects/frontend-react-ssr/archetype.properties +++ b/src/test/resources/projects/frontend-react-ssr/archetype.properties @@ -4,7 +4,7 @@ appId=testing-frontend-react package=it.pkg version=0.1-SNAPSHOT appTitle=Test React Frontend Project -aemVersion=6.5.7 +aemVersion=6.5.8 sdkVersion=latest language=en country=us diff --git a/src/test/resources/projects/frontend-react/archetype.properties b/src/test/resources/projects/frontend-react/archetype.properties index f066a749f..7122eaf84 100644 --- a/src/test/resources/projects/frontend-react/archetype.properties +++ b/src/test/resources/projects/frontend-react/archetype.properties @@ -4,7 +4,7 @@ appId=testing-frontend-react package=it.pkg version=0.1-SNAPSHOT appTitle=Test React Frontend Project -aemVersion=6.5.7 +aemVersion=6.5.8 sdkVersion=latest language=en country=us