diff --git a/README.md b/README.md index 834d8c36..2a0d9b21 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ wcm.io Maven Archetype for AEM ====== [![Build](https://github.com/wcm-io/io.wcm.maven.archetypes.aem/workflows/Build/badge.svg?branch=develop)](https://github.com/wcm-io/io.wcm.maven.archetypes.aem/actions?query=workflow%3ABuild+branch%3Adevelop) -[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.wcm.maven.archetypes/io.wcm.maven.archetypes.aem/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.wcm.maven.archetypes/io.wcm.maven.archetypes.aem) +[![Maven Central](https://img.shields.io/maven-central/v/io.wcm.maven.archetypes/io.wcm.maven.archetypes.aem)](https://repo1.maven.org/maven2/io/wcm/maven/archetypes/io.wcm.maven.archetypes.aem) Maven Archetype for creating new AEM projects. diff --git a/changes.xml b/changes.xml index 68f9b246..5e8b9429 100644 --- a/changes.xml +++ b/changes.xml @@ -23,6 +23,22 @@ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd"> + + + Add new parameter optionAemServicePackAPI which allows to configure independently from optionAemServicePack if an AEM 6.5 project should be set up to compile against latest AEM service pack API or not. + This option does not depend on the service pack binaries not available in Maven central. + + + AEM 6.5.13 is minimum version (due to Core Components). + + + Update dependencies. + + + Include acs-aem-commons-bundle in CONGA role/complete package as it is no longer included in acs-commons-ui.apps package since 3.5.0. + + + CONGA "all" package generation: Set runModeOptimization=ELIMINATE_DUPLICATES which produces only a single "all" package. diff --git a/pom.xml b/pom.xml index ba371b7b..03e6c916 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ io.wcm.maven.archetypes io.wcm.maven.archetypes.aem - 3.6.2 + 3.6.4 maven-archetype wcm.io Maven Archetype for AEM diff --git a/src/main/resources/META-INF/archetype-post-generate.groovy b/src/main/resources/META-INF/archetype-post-generate.groovy index d437b97d..dbeb2aa8 100644 --- a/src/main/resources/META-INF/archetype-post-generate.groovy +++ b/src/main/resources/META-INF/archetype-post-generate.groovy @@ -8,6 +8,8 @@ import groovy.util.XmlSlurper def rootDir = new File(request.getOutputDirectory() + "/" + request.getArtifactId()) def javaPackage = request.getProperties().get("package") def optionAemVersion = request.getProperties().get("optionAemVersion") +def optionAemServicePack = request.getProperties().get("optionAemServicePack") +def optionAemServicePackAPI = request.getProperties().get("optionAemServicePackAPI") def optionSlingInitialContentBundle = request.getProperties().get("optionSlingInitialContentBundle") def optionEditableTemplates = request.getProperties().get("optionEditableTemplates") def optionMultiBundleLayout = request.getProperties().get("optionMultiBundleLayout") @@ -28,8 +30,8 @@ def parentPom = new File(rootDir, "parent/pom.xml") def tests = new File(rootDir, "tests") // validate parameters - throw exceptions for invalid combinations -if (optionAemServicePack == "y" && optionAemVersion == "cloud") { - throw new RuntimeException("For AEMaaCS optionAemServicePack='y' is not allowed - there are no service packs for the cloud.") +if ((optionAemServicePack=="y" || optionAemServicePackAPI=="y") && optionAemVersion == "cloud") { + throw new RuntimeException("For AEMaaCS optionAemServicePack='y' or optionAemServicePackAPI='y' is not allowed - there are no service packs for the cloud.") } if (optionMultiBundleLayout == "y" && optionSlingInitialContentBundle == "n") { throw new RuntimeException("Parameter optionMultiBundleLayout='y' is only supported with optionSlingInitialContentBundle='y'.") diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml index 4fab63f4..8bbdd341 100644 --- a/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -77,11 +77,16 @@ cloud ^(6\.5|cloud)$ - + n ^(y|n)$ + + + n + ^(y|n)$ + diff --git a/src/main/resources/archetype-resources/archetype.properties b/src/main/resources/archetype-resources/archetype.properties index 1dc136de..51fa13c2 100644 --- a/src/main/resources/archetype-resources/archetype.properties +++ b/src/main/resources/archetype-resources/archetype.properties @@ -14,6 +14,7 @@ aemPublishPort=${aemPublishPort} optionAemVersion=${optionAemVersion} optionJavaVersion=${optionJavaVersion} optionAemServicePack=${optionAemServicePack} +optionAemServicePackAPI=${optionAemServicePackAPI} optionSlingModelsLatest=${optionSlingModelsLatest} optionSlingInitialContentBundle=${optionSlingInitialContentBundle} optionEditableTemplates=${optionEditableTemplates} diff --git a/src/main/resources/archetype-resources/bundles/core/pom.xml b/src/main/resources/archetype-resources/bundles/core/pom.xml index b13bb08a..d05d94d9 100644 --- a/src/main/resources/archetype-resources/bundles/core/pom.xml +++ b/src/main/resources/archetype-resources/bundles/core/pom.xml @@ -139,7 +139,7 @@ io.wcm.testing.aem-mock.junit5 test -#if ( $optionAemVersion == "6.5" && $optionAemServicePack=="y" ) +#if ( $optionAemVersion == "6.5" && ($optionAemServicePack=="y" || $optionAemServicePackAPI=="y") ) io.wcm io.wcm.testing.logging.logback @@ -211,7 +211,7 @@ com.adobe.aem uber-jar -#if ( $optionAemVersion == "6.5" && $optionAemServicePack=="n" ) +#if ( $optionAemVersion == "6.5" && $optionAemServicePack=="n" && $optionAemServicePackAPI=="n" ) apis #end provided diff --git a/src/main/resources/archetype-resources/config-definition/pom.xml b/src/main/resources/archetype-resources/config-definition/pom.xml index 30979090..f42c8af8 100644 --- a/src/main/resources/archetype-resources/config-definition/pom.xml +++ b/src/main/resources/archetype-resources/config-definition/pom.xml @@ -109,6 +109,13 @@ #end #if( $optionAcsCommons == "y" ) +#if ( $optionAemVersion == "cloud" ) + + com.adobe.acs + acs-aem-commons-bundle + compile + +#end com.adobe.acs acs-aem-commons-ui.apps diff --git a/src/main/resources/archetype-resources/config-definition/src/main/roles/__projectName__-aem-cms.yaml b/src/main/resources/archetype-resources/config-definition/src/main/roles/__projectName__-aem-cms.yaml index 7ff9da9b..5e3193f4 100644 --- a/src/main/resources/archetype-resources/config-definition/src/main/roles/__projectName__-aem-cms.yaml +++ b/src/main/resources/archetype-resources/config-definition/src/main/roles/__projectName__-aem-cms.yaml @@ -28,6 +28,10 @@ files: #end #if( $optionAcsCommons == "y" ) # ACS AEM Commons +#if ( $optionAemVersion == "cloud" ) +- url: mvn:com.adobe.acs/acs-aem-commons-bundle + dir: bundles +#end - url: mvn:com.adobe.acs/acs-aem-commons-ui.apps//zip dir: packages postProcessorOptions: diff --git a/src/main/resources/archetype-resources/content-packages/complete/pom.xml b/src/main/resources/archetype-resources/content-packages/complete/pom.xml index 48e9bad3..34f452d0 100644 --- a/src/main/resources/archetype-resources/content-packages/complete/pom.xml +++ b/src/main/resources/archetype-resources/content-packages/complete/pom.xml @@ -88,6 +88,15 @@ #end +#if ( $optionAcsCommons == "y" && $optionAemVersion != "cloud" ) + + + com.adobe.acs + acs-aem-commons-bundle + compile + + +#end @@ -161,6 +170,18 @@ jar #end +#end +#if( $optionAcsCommons == "y" && $optionAemVersion != "cloud" ) + + + + com.adobe.acs + + + acs-aem-commons-bundle + + jar + #end diff --git a/src/main/resources/archetype-resources/parent/pom.xml b/src/main/resources/archetype-resources/parent/pom.xml index 16b91fb4..27cb111c 100644 --- a/src/main/resources/archetype-resources/parent/pom.xml +++ b/src/main/resources/archetype-resources/parent/pom.xml @@ -5,7 +5,7 @@ io.wcm.maven io.wcm.maven.aem-global-parent - 2.0.10 + 2.0.12 @@ -37,10 +37,10 @@ #end #if ( $optionAemVersion != "cloud" ) - 2.19.2 + 2.20.2 #end #if( $optionAcsCommons == "y" ) - 5.3.0 + 5.3.2 #end @@ -162,7 +162,7 @@ io.wcm io.wcm.sling.commons - 1.4.0 + 1.5.0 io.wcm @@ -200,13 +200,13 @@ io.wcm io.wcm.wcm.ui.granite - 1.9.4 + 1.9.6 #if ( $optionAemVersion == "cloud" ) io.wcm io.wcm.wcm.ui.granite - 1.9.4 + 1.9.6 content zip @@ -289,13 +289,13 @@ io.wcm io.wcm.wcm.core.components - 1.11.0-2.19.0 + 1.12.0-2.20.0 #if ( $optionAemVersion == "cloud" ) io.wcm io.wcm.wcm.core.components - 1.11.0-2.19.0 + 1.12.0-2.20.0 content zip @@ -313,7 +313,7 @@ io.wcm.testing.aem-mock.junit5 5.0.0 -#if ( $optionAemVersion == "6.5" && $optionAemServicePack=="y" ) +#if ( $optionAemVersion == "6.5" && ($optionAemServicePack=="y" || $optionAemServicePackAPI=="y") ) io.wcm io.wcm.testing.logging.logback @@ -368,7 +368,7 @@ io.wcm.maven io.wcm.maven.aem-dependencies - #if($optionAemServicePack=="y")6.5.13.0000#{else}6.5.0.0005#end + #if($optionAemServicePack=="y" || $optionAemServicePackAPI=="y")6.5.13.0000#{else}6.5.0.0005#end pom import @@ -426,7 +426,7 @@ pom import -#set( $mockitoVersion = "4.5.1" ) +#set( $mockitoVersion = "4.6.1" ) org.mockito mockito-core diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md index 11101d88..93467ad5 100644 --- a/src/site/markdown/index.md +++ b/src/site/markdown/index.md @@ -3,7 +3,7 @@ About Maven Archetype for AEM Maven Archetype for creating new AEM projects. -[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.wcm.maven.archetypes/io.wcm.maven.archetypes.aem/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.wcm.maven.archetypes/io.wcm.maven.archetypes.aem) +[![Maven Central](https://img.shields.io/maven-central/v/io.wcm.maven.archetypes/io.wcm.maven.archetypes.aem)](https://repo1.maven.org/maven2/io/wcm/maven/archetypes/io.wcm.maven.archetypes.aem) ### Documentation @@ -18,7 +18,7 @@ The wcm.io Maven Archetype for AEM allows you to set up new Maven projects for d Features: -* Supports AEM 6.5 and AEM as a Cloud Service (AEMaaCS) +* Supports AEM 6.5 (with latest service pack) and AEM as a Cloud Service (AEMaaCS) * Supports Java 8 and Java 11 * Unit Tests based on JUnit 5 and [AEM Mocks][aem-mock] * Supports both Sling-Initial-Content JSON-style project layout and FileVault package layout diff --git a/src/site/markdown/usage.md.vm b/src/site/markdown/usage.md.vm index 7dd406a8..88864af6 100644 --- a/src/site/markdown/usage.md.vm +++ b/src/site/markdown/usage.md.vm @@ -31,7 +31,8 @@ ${symbol_pound}${symbol_pound}${symbol_pound} Archetype parameters | **aemPublishPort** | 4503 | Default port for local AEM publish instance | **optionJavaVersion** | 8 | Java version (8 or 11) | **optionAemVersion** | cloud | AEM major version (`6.5` or `cloud`) -| **optionAemServicePack** | n | Use latest service pack for AEM version - you need to deploy artifacts following [these conventions][aem-binaries-conventions] +| **optionAemServicePack** | n | Use latest service pack for AEM 6.5. You need to deploy artifacts following [these conventions][aem-binaries-conventions] +| **optionAemServicePackAPI** | n | Use AEM API from latest service pack for AEM 6.5. This is implicitly activated if optionAemServicePack = y. | **optionSlingInitialContentBundle** | y | **y**: AEM application projects is set up with scripts and content parts as JSON files within the OSGi bundle with Sling-Initial Content, suitable for [File System Resource Provider][fsresource-adaptto-talk]. _Works with all AEM versions._
**n**: Projects are set up with FileVault package layout, suitable for [AEM Developer Tools for Eclipse][aem-eclipse-ide] ([Sling IDE][sling-eclipse-ide]). | **optionSlingInitialContentBundleContentPackage** | n | If set to **'y'**: Generate application content package out of Sling-Initial-Content store in OSGi bundles as workaround in AEMaaCS e.g. if the bundle contains client libraries hookind into Page Editor, see https://wcm-io.atlassian.net/l/c/ECGe9qZT | **optionEditableTemplates** | y | Set up projects using editable templates. @@ -68,6 +69,7 @@ mvn org.apache.maven.plugins:maven-archetype-plugin:${project.properties['maven. -DoptionJavaVersion=11 \ -DoptionAemVersion=cloud \ -DoptionAemServicePack=n \ + -DoptionAemServicePackAPI=n \ -DoptionSlingInitialContentBundle=n \ -DoptionEditableTemplates=y \ -DoptionMultiBundleLayout=n \ @@ -99,6 +101,7 @@ mvn org.apache.maven.plugins:maven-archetype-plugin:${project.properties['maven. -DoptionJavaVersion=11 \ -DoptionAemVersion=6.5 \ -DoptionAemServicePack=n \ + -DoptionAemServicePackAPI=n \ -DoptionSlingInitialContentBundle=y \ -DoptionEditableTemplates=y \ -DoptionMultiBundleLayout=n \ diff --git a/src/test/resources/projects-github/alpha65-json-wcmio-caconfig-acscommons/archetype.properties b/src/test/resources/projects-github/alpha65-json-wcmio-caconfig-acscommons-sp/archetype.properties similarity index 96% rename from src/test/resources/projects-github/alpha65-json-wcmio-caconfig-acscommons/archetype.properties rename to src/test/resources/projects-github/alpha65-json-wcmio-caconfig-acscommons-sp/archetype.properties index 39f26e97..022df407 100644 --- a/src/test/resources/projects-github/alpha65-json-wcmio-caconfig-acscommons/archetype.properties +++ b/src/test/resources/projects-github/alpha65-json-wcmio-caconfig-acscommons-sp/archetype.properties @@ -12,6 +12,7 @@ aemPublishPort=45035 optionAemVersion=6.5 optionJavaVersion=11 optionAemServicePack=n +optionAemServicePackAPI=y optionSlingInitialContentBundle=y optionSlingInitialContentBundleContentPackage=n optionEditableTemplates=n diff --git a/src/test/resources/projects-github/alpha65-json-wcmio-caconfig-acscommons/goal.txt b/src/test/resources/projects-github/alpha65-json-wcmio-caconfig-acscommons-sp/goal.txt similarity index 100% rename from src/test/resources/projects-github/alpha65-json-wcmio-caconfig-acscommons/goal.txt rename to src/test/resources/projects-github/alpha65-json-wcmio-caconfig-acscommons-sp/goal.txt diff --git a/src/test/resources/projects-github/alphaCloud-json-wcmio-caconfig-acscommons-frontend/archetype.properties b/src/test/resources/projects-github/alphaCloud-json-wcmio-caconfig-acscommons-frontend/archetype.properties index 940cfecc..607ae8d0 100644 --- a/src/test/resources/projects-github/alphaCloud-json-wcmio-caconfig-acscommons-frontend/archetype.properties +++ b/src/test/resources/projects-github/alphaCloud-json-wcmio-caconfig-acscommons-frontend/archetype.properties @@ -12,6 +12,7 @@ aemPublishPort=4503 optionAemVersion=cloud optionJavaVersion=11 optionAemServicePack=n +optionAemServicePackAPI=n optionSlingInitialContentBundle=y optionSlingInitialContentBundleContentPackage=y optionEditableTemplates=n diff --git a/src/test/resources/projects-github/beta65-json-wcmio-editableTpl-caconfig-multibundle-frontend/archetype.properties b/src/test/resources/projects-github/beta65-json-wcmio-editableTpl-caconfig-multibundle-frontend-sp/archetype.properties similarity index 96% rename from src/test/resources/projects-github/beta65-json-wcmio-editableTpl-caconfig-multibundle-frontend/archetype.properties rename to src/test/resources/projects-github/beta65-json-wcmio-editableTpl-caconfig-multibundle-frontend-sp/archetype.properties index 75a6c7b5..b84d8e1b 100644 --- a/src/test/resources/projects-github/beta65-json-wcmio-editableTpl-caconfig-multibundle-frontend/archetype.properties +++ b/src/test/resources/projects-github/beta65-json-wcmio-editableTpl-caconfig-multibundle-frontend-sp/archetype.properties @@ -12,6 +12,7 @@ aemPublishPort=45035 optionAemVersion=6.5 optionJavaVersion=11 optionAemServicePack=n +optionAemServicePackAPI=y optionSlingInitialContentBundle=y optionSlingInitialContentBundleContentPackage=n optionEditableTemplates=y diff --git a/src/test/resources/projects-github/beta65-json-wcmio-editableTpl-caconfig-multibundle-frontend/goal.txt b/src/test/resources/projects-github/beta65-json-wcmio-editableTpl-caconfig-multibundle-frontend-sp/goal.txt similarity index 100% rename from src/test/resources/projects-github/beta65-json-wcmio-editableTpl-caconfig-multibundle-frontend/goal.txt rename to src/test/resources/projects-github/beta65-json-wcmio-editableTpl-caconfig-multibundle-frontend-sp/goal.txt diff --git a/src/test/resources/projects-github/betaCloud-json-wcmio-editableTpl-caconfig-multibundle/archetype.properties b/src/test/resources/projects-github/betaCloud-json-wcmio-editableTpl-caconfig-multibundle/archetype.properties index 9529fa41..fc4b20c2 100644 --- a/src/test/resources/projects-github/betaCloud-json-wcmio-editableTpl-caconfig-multibundle/archetype.properties +++ b/src/test/resources/projects-github/betaCloud-json-wcmio-editableTpl-caconfig-multibundle/archetype.properties @@ -12,6 +12,7 @@ aemPublishPort=4503 optionAemVersion=cloud optionJavaVersion=11 optionAemServicePack=n +optionAemServicePackAPI=n optionSlingInitialContentBundle=y optionSlingInitialContentBundleContentPackage=n optionEditableTemplates=y diff --git a/src/test/resources/projects-github/delta65-filevault-editableTpl-caconfig-frontend/archetype.properties b/src/test/resources/projects-github/delta65-filevault-editableTpl-caconfig-frontend-sp/archetype.properties similarity index 96% rename from src/test/resources/projects-github/delta65-filevault-editableTpl-caconfig-frontend/archetype.properties rename to src/test/resources/projects-github/delta65-filevault-editableTpl-caconfig-frontend-sp/archetype.properties index 97fd338f..60e7b71a 100644 --- a/src/test/resources/projects-github/delta65-filevault-editableTpl-caconfig-frontend/archetype.properties +++ b/src/test/resources/projects-github/delta65-filevault-editableTpl-caconfig-frontend-sp/archetype.properties @@ -12,6 +12,7 @@ aemPublishPort=45035 optionAemVersion=6.5 optionJavaVersion=11 optionAemServicePack=n +optionAemServicePackAPI=y optionSlingInitialContentBundle=n optionSlingInitialContentBundleContentPackage=n optionEditableTemplates=y diff --git a/src/test/resources/projects-github/delta65-filevault-editableTpl-caconfig-frontend/goal.txt b/src/test/resources/projects-github/delta65-filevault-editableTpl-caconfig-frontend-sp/goal.txt similarity index 100% rename from src/test/resources/projects-github/delta65-filevault-editableTpl-caconfig-frontend/goal.txt rename to src/test/resources/projects-github/delta65-filevault-editableTpl-caconfig-frontend-sp/goal.txt diff --git a/src/test/resources/projects-github/deltaCloud-filevault-editableTpl-caconfig/archetype.properties b/src/test/resources/projects-github/deltaCloud-filevault-editableTpl-caconfig/archetype.properties index e296173d..b5c2ace8 100644 --- a/src/test/resources/projects-github/deltaCloud-filevault-editableTpl-caconfig/archetype.properties +++ b/src/test/resources/projects-github/deltaCloud-filevault-editableTpl-caconfig/archetype.properties @@ -12,6 +12,7 @@ aemPublishPort=4503 optionAemVersion=cloud optionJavaVersion=8 optionAemServicePack=n +optionAemServicePackAPI=n optionSlingInitialContentBundle=n optionSlingInitialContentBundleContentPackage=n optionEditableTemplates=y diff --git a/src/test/resources/projects-github/epsilon65-filevault-editableTpl/archetype.properties b/src/test/resources/projects-github/epsilon65-filevault-editableTpl-sp/archetype.properties similarity index 96% rename from src/test/resources/projects-github/epsilon65-filevault-editableTpl/archetype.properties rename to src/test/resources/projects-github/epsilon65-filevault-editableTpl-sp/archetype.properties index 7285728c..ab366560 100644 --- a/src/test/resources/projects-github/epsilon65-filevault-editableTpl/archetype.properties +++ b/src/test/resources/projects-github/epsilon65-filevault-editableTpl-sp/archetype.properties @@ -12,6 +12,7 @@ aemPublishPort=45035 optionAemVersion=6.5 optionJavaVersion=11 optionAemServicePack=n +optionAemServicePackAPI=y optionSlingInitialContentBundle=n optionSlingInitialContentBundleContentPackage=n optionEditableTemplates=y diff --git a/src/test/resources/projects-github/epsilon65-filevault-editableTpl/goal.txt b/src/test/resources/projects-github/epsilon65-filevault-editableTpl-sp/goal.txt similarity index 100% rename from src/test/resources/projects-github/epsilon65-filevault-editableTpl/goal.txt rename to src/test/resources/projects-github/epsilon65-filevault-editableTpl-sp/goal.txt diff --git a/src/test/resources/projects-github/epsilonCloud-filevault-editableTpl/archetype.properties b/src/test/resources/projects-github/epsilonCloud-filevault-editableTpl/archetype.properties index fa752999..5d2189e4 100644 --- a/src/test/resources/projects-github/epsilonCloud-filevault-editableTpl/archetype.properties +++ b/src/test/resources/projects-github/epsilonCloud-filevault-editableTpl/archetype.properties @@ -12,6 +12,7 @@ aemPublishPort=4503 optionAemVersion=cloud optionJavaVersion=8 optionAemServicePack=n +optionAemServicePackAPI=n optionSlingInitialContentBundle=n optionSlingInitialContentBundleContentPackage=n optionEditableTemplates=y diff --git a/src/test/resources/projects-github/gamma65-filevault-wcmio-caconfig/archetype.properties b/src/test/resources/projects-github/gamma65-filevault-wcmio-caconfig-sp/archetype.properties similarity index 96% rename from src/test/resources/projects-github/gamma65-filevault-wcmio-caconfig/archetype.properties rename to src/test/resources/projects-github/gamma65-filevault-wcmio-caconfig-sp/archetype.properties index e7cf011a..5d58b8d9 100644 --- a/src/test/resources/projects-github/gamma65-filevault-wcmio-caconfig/archetype.properties +++ b/src/test/resources/projects-github/gamma65-filevault-wcmio-caconfig-sp/archetype.properties @@ -12,6 +12,7 @@ aemPublishPort=45035 optionAemVersion=6.5 optionJavaVersion=11 optionAemServicePack=n +optionAemServicePackAPI=y optionSlingInitialContentBundle=n optionSlingInitialContentBundleContentPackage=n optionEditableTemplates=n diff --git a/src/test/resources/projects-github/gamma65-filevault-wcmio-caconfig/goal.txt b/src/test/resources/projects-github/gamma65-filevault-wcmio-caconfig-sp/goal.txt similarity index 100% rename from src/test/resources/projects-github/gamma65-filevault-wcmio-caconfig/goal.txt rename to src/test/resources/projects-github/gamma65-filevault-wcmio-caconfig-sp/goal.txt diff --git a/src/test/resources/projects-github/gammaCloud-filevault-wcmio-caconfig/archetype.properties b/src/test/resources/projects-github/gammaCloud-filevault-wcmio-caconfig/archetype.properties index 6ded675c..a82a9c01 100644 --- a/src/test/resources/projects-github/gammaCloud-filevault-wcmio-caconfig/archetype.properties +++ b/src/test/resources/projects-github/gammaCloud-filevault-wcmio-caconfig/archetype.properties @@ -12,6 +12,7 @@ aemPublishPort=4503 optionAemVersion=cloud optionJavaVersion=8 optionAemServicePack=n +optionAemServicePackAPI=n optionSlingInitialContentBundle=n optionSlingInitialContentBundleContentPackage=n optionEditableTemplates=n diff --git a/src/test/resources/projects/alpha65-json-wcmio-caconfig-acscommons-sp/archetype.properties b/src/test/resources/projects/alpha65-json-wcmio-caconfig-acscommons-sp/archetype.properties index 4f960832..db5201cf 100644 --- a/src/test/resources/projects/alpha65-json-wcmio-caconfig-acscommons-sp/archetype.properties +++ b/src/test/resources/projects/alpha65-json-wcmio-caconfig-acscommons-sp/archetype.properties @@ -12,6 +12,7 @@ aemPublishPort=45035 optionAemVersion=6.5 optionJavaVersion=11 optionAemServicePack=y +optionAemServicePackAPI=y optionSlingInitialContentBundle=y optionSlingInitialContentBundleContentPackage=n optionEditableTemplates=n diff --git a/src/test/resources/projects/alphaCloud-json-wcmio-caconfig-acscommons-frontend/archetype.properties b/src/test/resources/projects/alphaCloud-json-wcmio-caconfig-acscommons-frontend/archetype.properties index e5110f89..538875ac 100644 --- a/src/test/resources/projects/alphaCloud-json-wcmio-caconfig-acscommons-frontend/archetype.properties +++ b/src/test/resources/projects/alphaCloud-json-wcmio-caconfig-acscommons-frontend/archetype.properties @@ -12,6 +12,7 @@ aemPublishPort=4503 optionAemVersion=cloud optionJavaVersion=11 optionAemServicePack=n +optionAemServicePackAPI=n optionSlingInitialContentBundle=y optionSlingInitialContentBundleContentPackage=y optionEditableTemplates=n diff --git a/src/test/resources/projects/beta65-json-wcmio-editableTpl-caconfig-multibundle-frontend-sp/archetype.properties b/src/test/resources/projects/beta65-json-wcmio-editableTpl-caconfig-multibundle-frontend-sp/archetype.properties index 301ec12c..fb4dcc11 100644 --- a/src/test/resources/projects/beta65-json-wcmio-editableTpl-caconfig-multibundle-frontend-sp/archetype.properties +++ b/src/test/resources/projects/beta65-json-wcmio-editableTpl-caconfig-multibundle-frontend-sp/archetype.properties @@ -12,6 +12,7 @@ aemPublishPort=45035 optionAemVersion=6.5 optionJavaVersion=11 optionAemServicePack=y +optionAemServicePackAPI=y optionSlingInitialContentBundle=y optionSlingInitialContentBundleContentPackage=n optionEditableTemplates=y diff --git a/src/test/resources/projects/betaCloud-json-wcmio-editableTpl-caconfig-multibundle/archetype.properties b/src/test/resources/projects/betaCloud-json-wcmio-editableTpl-caconfig-multibundle/archetype.properties index 9529fa41..fc4b20c2 100644 --- a/src/test/resources/projects/betaCloud-json-wcmio-editableTpl-caconfig-multibundle/archetype.properties +++ b/src/test/resources/projects/betaCloud-json-wcmio-editableTpl-caconfig-multibundle/archetype.properties @@ -12,6 +12,7 @@ aemPublishPort=4503 optionAemVersion=cloud optionJavaVersion=11 optionAemServicePack=n +optionAemServicePackAPI=n optionSlingInitialContentBundle=y optionSlingInitialContentBundleContentPackage=n optionEditableTemplates=y diff --git a/src/test/resources/projects/delta65-filevault-editableTpl-caconfig-frontend-sp/archetype.properties b/src/test/resources/projects/delta65-filevault-editableTpl-caconfig-frontend-sp/archetype.properties index f55eb1bd..4d3f9ae8 100644 --- a/src/test/resources/projects/delta65-filevault-editableTpl-caconfig-frontend-sp/archetype.properties +++ b/src/test/resources/projects/delta65-filevault-editableTpl-caconfig-frontend-sp/archetype.properties @@ -12,6 +12,7 @@ aemPublishPort=45035 optionAemVersion=6.5 optionJavaVersion=11 optionAemServicePack=y +optionAemServicePackAPI=y optionSlingInitialContentBundle=n optionSlingInitialContentBundleContentPackage=n optionEditableTemplates=y diff --git a/src/test/resources/projects/deltaCloud-filevault-editableTpl-caconfig/archetype.properties b/src/test/resources/projects/deltaCloud-filevault-editableTpl-caconfig/archetype.properties index e296173d..b5c2ace8 100644 --- a/src/test/resources/projects/deltaCloud-filevault-editableTpl-caconfig/archetype.properties +++ b/src/test/resources/projects/deltaCloud-filevault-editableTpl-caconfig/archetype.properties @@ -12,6 +12,7 @@ aemPublishPort=4503 optionAemVersion=cloud optionJavaVersion=8 optionAemServicePack=n +optionAemServicePackAPI=n optionSlingInitialContentBundle=n optionSlingInitialContentBundleContentPackage=n optionEditableTemplates=y diff --git a/src/test/resources/projects/epsilon65-filevault-editableTpl-sp/archetype.properties b/src/test/resources/projects/epsilon65-filevault-editableTpl-sp/archetype.properties index 61d78b46..b31639fa 100644 --- a/src/test/resources/projects/epsilon65-filevault-editableTpl-sp/archetype.properties +++ b/src/test/resources/projects/epsilon65-filevault-editableTpl-sp/archetype.properties @@ -12,6 +12,7 @@ aemPublishPort=45035 optionAemVersion=6.5 optionJavaVersion=11 optionAemServicePack=y +optionAemServicePackAPI=y optionSlingInitialContentBundle=n optionSlingInitialContentBundleContentPackage=n optionEditableTemplates=y diff --git a/src/test/resources/projects/epsilonCloud-filevault-editableTpl/archetype.properties b/src/test/resources/projects/epsilonCloud-filevault-editableTpl/archetype.properties index fa752999..5d2189e4 100644 --- a/src/test/resources/projects/epsilonCloud-filevault-editableTpl/archetype.properties +++ b/src/test/resources/projects/epsilonCloud-filevault-editableTpl/archetype.properties @@ -12,6 +12,7 @@ aemPublishPort=4503 optionAemVersion=cloud optionJavaVersion=8 optionAemServicePack=n +optionAemServicePackAPI=n optionSlingInitialContentBundle=n optionSlingInitialContentBundleContentPackage=n optionEditableTemplates=y diff --git a/src/test/resources/projects/gamma65-filevault-wcmio-caconfig-sp/archetype.properties b/src/test/resources/projects/gamma65-filevault-wcmio-caconfig-sp/archetype.properties index 2ce40507..16726fcd 100644 --- a/src/test/resources/projects/gamma65-filevault-wcmio-caconfig-sp/archetype.properties +++ b/src/test/resources/projects/gamma65-filevault-wcmio-caconfig-sp/archetype.properties @@ -12,6 +12,7 @@ aemPublishPort=45035 optionAemVersion=6.5 optionJavaVersion=11 optionAemServicePack=y +optionAemServicePackAPI=y optionSlingInitialContentBundle=n optionSlingInitialContentBundleContentPackage=n optionEditableTemplates=n diff --git a/src/test/resources/projects/gammaCloud-filevault-wcmio-caconfig/archetype.properties b/src/test/resources/projects/gammaCloud-filevault-wcmio-caconfig/archetype.properties index 6ded675c..a82a9c01 100644 --- a/src/test/resources/projects/gammaCloud-filevault-wcmio-caconfig/archetype.properties +++ b/src/test/resources/projects/gammaCloud-filevault-wcmio-caconfig/archetype.properties @@ -12,6 +12,7 @@ aemPublishPort=4503 optionAemVersion=cloud optionJavaVersion=8 optionAemServicePack=n +optionAemServicePackAPI=n optionSlingInitialContentBundle=n optionSlingInitialContentBundleContentPackage=n optionEditableTemplates=n