Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
stefanseifert committed Mar 27, 2023
2 parents e1eac93 + 90116ee commit 959dbca
Showing 30 changed files with 84 additions and 304 deletions.
23 changes: 23 additions & 0 deletions changes.xml
Original file line number Diff line number Diff line change
@@ -23,6 +23,29 @@
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
<body>

<release version="3.7.2" date="2023-03-27">
<action type="update" dev="sseifert" issue="WTOOL-72">
AEMaaCS: Remove workaround for deploying "Sling-Initial-Content" for OSGi bundles via separate content packages for all OSGi bundles -
transforming Sling-Initial-Content to content packages now happens automatically as part of Cloud Manager deployment with the help of Sling feature cpconverter.
Remove parameter 'optionSlingInitialContentBundleContentPackage' which is now obsolete.
</action>
<action type="update" dev="sseifert">
Update to AEM 6.5 SP16.
</action>
<action type="update" dev="sseifert">
Include bundle io.wcm.sling.commons when option optionContextAwareConfig is activated.
</action>
<action type="update" dev="sseifert">
Update dependencies.
</action>
<action type="fix" dev="sseifert">
Sling-Initial-Content: Register non-standard JCR namespaces for conversion with cp2fm into enhanced DocView files.
</action>
<action type="fix" dev="sseifert"><![CDATA[
Disable reproducible builds for content packages as workaround for <a href="https://issues.apache.org/jira/browse/JCRVLT-699">JCRVLT-699</a>.
]]></action>
</release>

<release version="3.7.0" date="2023-01-12">
<action type="update" dev="sseifert">
Minimum Java Version supported is Java 11. Java 8 is no longer supported.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@

<groupId>io.wcm.maven.archetypes</groupId>
<artifactId>io.wcm.maven.archetypes.aem</artifactId>
<version>3.7.0</version>
<version>3.7.2</version>
<packaging>maven-archetype</packaging>

<name>wcm.io Maven Archetype for AEM</name>
3 changes: 0 additions & 3 deletions src/main/resources/META-INF/archetype-post-generate.groovy
Original file line number Diff line number Diff line change
@@ -36,9 +36,6 @@ if ((optionAemServicePack=="y" || optionAemServicePackAPI=="y") && optionAemVers
if (optionMultiBundleLayout == "y" && optionSlingInitialContentBundle == "n") {
throw new RuntimeException("Parameter optionMultiBundleLayout='y' is only supported with optionSlingInitialContentBundle='y'.")
}
if (optionSlingInitialContentBundleContentPackage == "y" && optionAemVersion != "cloud") {
throw new RuntimeException("Parameter optionSlingInitialContentBundleContentPackage='y' is only supported with optionAemVersion='cloud'.")
}
if (optionWcmioHandler == "y" && optionContextAwareConfig == "n") {
throw new RuntimeException("Parameter optionWcmioHandler='y' is only supported with optionContextAwareConfig='y'.")
}
5 changes: 0 additions & 5 deletions src/main/resources/META-INF/maven/archetype-metadata.xml
Original file line number Diff line number Diff line change
@@ -93,11 +93,6 @@
<defaultValue>y</defaultValue>
<validationRegex>^(y|n)$</validationRegex>
</requiredProperty>
<!-- 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 -->
<requiredProperty key="optionSlingInitialContentBundleContentPackage">
<defaultValue>n</defaultValue>
<validationRegex>^(y|n)$</validationRegex>
</requiredProperty>
<!-- Set up projects using editable templates. -->
<requiredProperty key="optionEditableTemplates">
<defaultValue>y</defaultValue>
Original file line number Diff line number Diff line change
@@ -46,6 +46,12 @@
<bnd>
Sling-Initial-Content: \
SLING-INF/clientlibs-root;overwrite:=true;ignoreImportProviders:=xml;path:=/apps/${projectName}/clientlibs

Sling-Namespaces: \
wcmio=http://wcm.io/ns,\
cq=http://www.day.com/jcr/cq/1.0,\
granite=http://www.adobe.com/jcr/granite/1.0,\
sling=http://sling.apache.org/jcr/sling/1.0
</bnd>
</configuration>
</plugin>
10 changes: 8 additions & 2 deletions src/main/resources/archetype-resources/bundles/core/pom.xml
Original file line number Diff line number Diff line change
@@ -260,10 +260,16 @@

Sling-Initial-Content: \
#if ( $optionMultiBundleLayout == "n" )
SLING-INF/clientlibs-root;overwrite:=true;ignoreImportProviders:=xml;path:=/apps/${projectName}/clientlibs, \
SLING-INF/clientlibs-root;overwrite:=true;ignoreImportProviders:=xml;path:=/apps/${projectName}/clientlibs,\
#end
SLING-INF/app-root;overwrite:=true;ignoreImportProviders:=xml;path:=/apps/${projectName}/core, \
SLING-INF/app-root;overwrite:=true;ignoreImportProviders:=xml;path:=/apps/${projectName}/core,\
SLING-INF/app-i18n;overwrite:=true;ignoreImportProviders:=json;path:=/apps/${projectName}/core/i18n

Sling-Namespaces: \
wcmio=http://wcm.io/ns,\
cq=http://www.day.com/jcr/cq/1.0,\
granite=http://www.adobe.com/jcr/granite/1.0,\
sling=http://sling.apache.org/jcr/sling/1.0
#end
#if ( $optionWcmioHandler == "y" )

Original file line number Diff line number Diff line change
@@ -64,16 +64,7 @@ public static AemContextBuilder newAemContextBuilder() {
*/
public static AemContextBuilder newAemContextBuilder(@NotNull ResourceResolverType resourceResolverType) {
return new AemContextBuilder(resourceResolverType)
#if ( $optionContextAwareConfig == "y" )
.plugin(CACONFIG)
#end
#if ( $optionWcmioHandler == "y" )
.plugin(CORE_COMPONENTS, WCMIO_SLING, WCMIO_WCM, WCMIO_CACONFIG, WCMIO_HANDLER)
#elseif ( $optionContextAwareConfig == "y" )
.plugin(CORE_COMPONENTS, WCMIO_CACONFIG)
#else
.plugin(CORE_COMPONENTS)
#end
.plugin(CORE_COMPONENTS#if($optionContextAwareConfig=="y"), CACONFIG, WCMIO_CACONFIG#{end}#if($optionWcmioHandler=="y"), WCMIO_SLING, WCMIO_WCM, WCMIO_HANDLER#{end})
.afterSetUp(SETUP_CALLBACK);
}

92 changes: 1 addition & 91 deletions src/main/resources/archetype-resources/config-definition/pom.xml
Original file line number Diff line number Diff line change
@@ -51,26 +51,6 @@
<scope>compile</scope>
</dependency>
#end
#if ( $optionSlingInitialContentBundle == "y" && $optionSlingInitialContentBundleContentPackage == "y" && $optionAemVersion == "cloud" )
<dependency>
<groupId>${groupId}</groupId>
<artifactId>${rootArtifactId}.core</artifactId>
<version>${version}</version>
<classifier>content</classifier>
<type>zip</type>
<scope>compile</scope>
</dependency>
#if ( $optionMultiBundleLayout == "y" )
<dependency>
<groupId>${groupId}</groupId>
<artifactId>${rootArtifactId}.clientlibs</artifactId>
<version>${version}</version>
<classifier>content</classifier>
<type>zip</type>
<scope>compile</scope>
</dependency>
#end
#end
#if ( $optionSlingInitialContentBundle == "n" )
<dependency>
<groupId>${groupId}</groupId>
@@ -145,18 +125,11 @@
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.caconfig.editor</artifactId>
<classifier>content</classifier>
<type>zip</type>
<artifactId>io.wcm.sling.commons</artifactId>
<scope>compile</scope>
</dependency>
#end
#if ( $optionWcmioHandler == "y" )
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.sling.commons</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.sling.models</artifactId>
@@ -167,47 +140,19 @@
<artifactId>io.wcm.wcm.commons</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.wcm.commons</artifactId>
<classifier>content</classifier>
<type>zip</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.wcm.parsys</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.wcm.parsys</artifactId>
<classifier>content</classifier>
<type>zip</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.wcm.ui.granite</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.wcm.ui.granite</artifactId>
<classifier>content</classifier>
<type>zip</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.wcm.ui.clientlibs</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.wcm.ui.clientlibs</artifactId>
<classifier>content</classifier>
<type>zip</type>
<scope>compile</scope>
</dependency>
<dependency>
@@ -220,61 +165,26 @@
<artifactId>io.wcm.handler.url</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.handler.url</artifactId>
<classifier>content</classifier>
<type>zip</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.handler.media</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.handler.media</artifactId>
<classifier>content</classifier>
<type>zip</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.handler.link</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.handler.link</artifactId>
<classifier>content</classifier>
<type>zip</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.handler.richtext</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.handler.richtext</artifactId>
<classifier>content</classifier>
<type>zip</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.wcm.core.components</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.wcm</groupId>
<artifactId>io.wcm.wcm.core.components</artifactId>
<classifier>content</classifier>
<type>zip</type>
<scope>compile</scope>
</dependency>
#end

#end
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ files:

#if ( $optionAemVersion == '6.5' && $optionAemServicePack == 'y' )
# AEM Service Pack
- url: mvn:adobe.binary.aem.65.servicepack/aem-service-pkg/6.5.15.0/zip
- url: mvn:adobe.binary.aem.65.servicepack/aem-service-pkg/6.5.16.0/zip
dir: packages
modelOptions:
delayAfterInstallSec: 30
@@ -86,52 +86,32 @@ files:
dir: bundles
- url: mvn:io.wcm/io.wcm.caconfig.editor
dir: bundles
- url: mvn:io.wcm/io.wcm.caconfig.editor//zip/content
dir: packages
#end
#if ( $optionWcmioHandler == "y" )
- url: mvn:io.wcm/io.wcm.sling.commons
dir: bundles
#end
#if ( $optionWcmioHandler == "y" )
- url: mvn:io.wcm/io.wcm.sling.models
dir: bundles
- url: mvn:io.wcm/io.wcm.wcm.commons
dir: bundles
- url: mvn:io.wcm/io.wcm.wcm.commons//zip/content
dir: packages
- url: mvn:io.wcm/io.wcm.wcm.parsys
dir: bundles
- url: mvn:io.wcm/io.wcm.wcm.parsys//zip/content
dir: packages
- url: mvn:io.wcm/io.wcm.wcm.ui.granite
dir: bundles
- url: mvn:io.wcm/io.wcm.wcm.ui.granite//zip/content
dir: packages
- url: mvn:io.wcm/io.wcm.wcm.ui.clientlibs
dir: bundles
- url: mvn:io.wcm/io.wcm.wcm.ui.clientlibs//zip/content
dir: packages
- url: mvn:io.wcm/io.wcm.handler.commons
dir: bundles
- url: mvn:io.wcm/io.wcm.handler.url
dir: bundles
- url: mvn:io.wcm/io.wcm.handler.url//zip/content
dir: packages
- url: mvn:io.wcm/io.wcm.handler.media
dir: bundles
- url: mvn:io.wcm/io.wcm.handler.media//zip/content
dir: packages
- url: mvn:io.wcm/io.wcm.handler.link
dir: bundles
- url: mvn:io.wcm/io.wcm.handler.link//zip/content
dir: packages
- url: mvn:io.wcm/io.wcm.handler.richtext
dir: bundles
- url: mvn:io.wcm/io.wcm.handler.richtext//zip/content
dir: packages
- url: mvn:io.wcm/io.wcm.wcm.core.components
dir: bundles
- url: mvn:io.wcm/io.wcm.wcm.core.components//zip/content
dir: packages
#end

#end
@@ -147,14 +127,6 @@ files:
- url: mvn:${groupId}/${rootArtifactId}.complete//zip
dir: packages
#end
#if ( $optionSlingInitialContentBundle == "y" && $optionSlingInitialContentBundleContentPackage == "y" && $optionAemVersion == "cloud" )
- url: mvn:${groupId}/${rootArtifactId}.core//zip/content
dir: packages
#if ( $optionMultiBundleLayout == "y" )
- url: mvn:${groupId}/${rootArtifactId}.clientlibs//zip/content
dir: packages
#end
#end
#if( $optionSlingInitialContentBundle == "n" )
- url: mvn:${groupId}/${rootArtifactId}.ui.apps//zip
dir: packages
Original file line number Diff line number Diff line change
@@ -20,6 +20,9 @@
<properties>
<contentPackage.name>${projectName}-conf-content</contentPackage.name>
<contentPackage.group>${packageGroupName}</contentPackage.group>

<!-- Disable reproducible builds for this package as workaround for https://issues.apache.org/jira/browse/JCRVLT-699 -->
<project.build.outputTimestamp></project.build.outputTimestamp>
</properties>

<build>
Original file line number Diff line number Diff line change
@@ -20,6 +20,9 @@
<properties>
<contentPackage.name>${projectName}-sample-content</contentPackage.name>
<contentPackage.group>${packageGroupName}</contentPackage.group>

<!-- Disable reproducible builds for this package as workaround for https://issues.apache.org/jira/browse/JCRVLT-699 -->
<project.build.outputTimestamp></project.build.outputTimestamp>
</properties>

<build>
Original file line number Diff line number Diff line change
@@ -20,6 +20,9 @@
<properties>
<contentPackage.name>${projectName}-ui.apps</contentPackage.name>
<contentPackage.group>${packageGroupName}</contentPackage.group>

<!-- Disable reproducible builds for this package as workaround for https://issues.apache.org/jira/browse/JCRVLT-699 -->
<project.build.outputTimestamp></project.build.outputTimestamp>
</properties>

<build>
Loading

0 comments on commit 959dbca

Please sign in to comment.