Skip to content

Commit

Permalink
Switch to filevault-package-maven-plugin
Browse files Browse the repository at this point in the history 
WIP, using latest SNAPSHOT version and some outstanding issues

This closes Adobe-Consulting-Services#2043
  • Loading branch information
@kwin
kwin committed Feb 17, 2020
1 parent 9d88196 commit 48c6946
Show file tree
Hide file tree
Showing 28 changed files with 78 additions and 747 deletions.
71 changes: 24 additions & 47 deletions content/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,71 +17,41 @@
<artifactId>acs-aem-commons-content</artifactId>
<name>ACS AEM Commons Package</name>
<packaging>content-package</packaging>
<description>ACS AEM Commons container content package which delivers acs-aem-commons-ui.apps and acs-aem-commons-ui.content.</description>

<build>
<resources>
<resource>
<directory>src/main/content/jcr_root</directory>
<excludes>
<exclude>**/.vlt</exclude>
<exclude>**/.vltignore</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/content/META-INF/vault/definition</directory>
<targetPath>../vault-work/META-INF/vault/definition</targetPath>
</resource>
<resource>
<directory>src/main/content/META-INF/vault</directory>
<includes>
<include>nodetypes.cnd</include>
<include>privileges.xml</include>
</includes>
<targetPath>../vault-work/META-INF/vault</targetPath>
</resource>
<resource>
<directory>src/main/resources/META-INF</directory>
<targetPath>../vault-work/META-INF</targetPath>
</resource>
</resources>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<includeEmptyDirs>true</includeEmptyDirs>
</configuration>
</plugin>

<plugin>
<groupId>com.day.jcr.vault</groupId>
<artifactId>content-package-maven-plugin</artifactId>
<extensions>true</extensions>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>filevault-package-maven-plugin</artifactId>
<configuration>
<group>adobe/consulting</group>
<properties>
<description>ACS AEM Commons container content package which delivers acs-aem-commons-ui.apps and acs-aem-commons-ui.content.</description>
</properties>
<filterSource>src/main/content/META-INF/vault/filter.xml</filterSource>
<targetURL>http://${crx.host}:${crx.port}${crx.contextRoot}/crx/packmgr/service.jsp</targetURL>
<packageType>container</packageType>
<embeddeds>
<embedded>
<artifactId>acs-aem-commons-bundle</artifactId>
<target>/apps/acs-commons/install</target>
<filter>true</filter>
<isAllVersionsFilter>true</isAllVersionsFilter>
</embedded>
</embeddeds>
</configuration>
<executions>
<execution>
<id>default-package</id>
<configuration>
<subPackages>
<subPackage>
<groupId>${project.groupId}</groupId>
<artifactId>acs-aem-commons-ui.apps</artifactId>
<scope>runtime</scope> <!-- this is hacky, but seems to be the easiest way to include the min artifacts since there's no way to specify a blank classifier -->
<classifier></classifier>
<filter>true</filter>
<isAllVersionsFilter>true</isAllVersionsFilter>
</subPackage>
<subPackage>
<groupId>${project.groupId}</groupId>
<artifactId>acs-aem-commons-ui.content</artifactId>
<scope>runtime</scope>
<classifier></classifier>
<filter>true</filter>
<isAllVersionsFilter>true</isAllVersionsFilter>
</subPackage>
</subPackages>
</configuration>
Expand All @@ -96,16 +66,17 @@
<finalName>${project.build.finalName}-min</finalName>
<subPackages>
<subPackage>
<groupId>${project.groupId}</groupId>
<artifactId>acs-aem-commons-ui.apps</artifactId>
<classifier>min</classifier>
<filter>true</filter>
<isAllVersionsFilter>true</isAllVersionsFilter>
</subPackage>
<subPackage>
<groupId>${project.groupId}</groupId>
<artifactId>acs-aem-commons-ui.content</artifactId>
<classifier>min</classifier>
<filter>true</filter>
<isAllVersionsFilter>true</isAllVersionsFilter>
</subPackage>
</subPackages>
</configuration>
Expand Down Expand Up @@ -292,6 +263,12 @@
<classifier>min</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>acs-aem-commons-bundle</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

<profiles>
Expand Down
77 changes: 0 additions & 77 deletions content/src/main/content/META-INF/vault/config.xml
View file

This file was deleted.

2 changes: 2 additions & 0 deletions content/src/main/content/META-INF/vault/filter.xml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<workspaceFilter version="1.0">
<filter root="/apps/acs-commons/config"/>
<filter root="/apps/acs-commons/config.author"/>
</workspaceFilter>
13 changes: 0 additions & 13 deletions content/src/main/content/META-INF/vault/properties.xml
View file

This file was deleted.

0 ...be.acs.commons.wcm.impl.QrCodeServlet.xml → ...be.acs.commons.wcm.impl.QrCodeServlet.xml
View file
File renamed without changes.
0 ...sers.impl.EnsureServiceUser-FileFetch.xml → ...sers.impl.EnsureServiceUser-FileFetch.xml
View file
File renamed without changes.
0 ...s.impl.EnsureServiceUser-RemoteAssets.xml → ...s.impl.EnsureServiceUser-RemoteAssets.xml
View file
File renamed without changes.
0 ...iceUserMapperImpl.amended-acs-commons.xml → ...iceUserMapperImpl.amended-acs-commons.xml
View file
File renamed without changes.
36 changes: 35 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,44 @@
<artifactId>maven-sling-plugin</artifactId>
<version>2.3.8</version>
</plugin>
<!-- creating content packages -->
<plugin>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>filevault-package-maven-plugin</artifactId>
<version>1.1.1-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
<group>adobe/consulting</group>
<filterSource>src/main/content/META-INF/vault/filter.xml</filterSource>
<validatorsSettings>
<jackrabbit-filter>
<options>
<severityForUncoveredFilterRootAncestors>WARN</severityForUncoveredFilterRootAncestors>
</options>
</jackrabbit-filter>
<jackrabbit-packagetype>
<options>
<allowComplexFilterRulesInApplicationPackages>true</allowComplexFilterRulesInApplicationPackages>
</options>
</jackrabbit-packagetype>
</validatorsSettings>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.jackrabbit.vault</groupId>
<artifactId>vault-validation</artifactId>
<version>3.4.3-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
<!-- deploying content packages -->
<plugin>
<groupId>com.day.jcr.vault</groupId>
<artifactId>content-package-maven-plugin</artifactId>
<version>0.0.24</version>
<version>1.0.2</version>
<configuration>
<targetURL>http://${crx.host}:${crx.port}${crx.contextRoot}/crx/packmgr/service.jsp</targetURL>
</configuration>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down
51 changes: 4 additions & 47 deletions ui.apps/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,70 +17,27 @@
<artifactId>acs-aem-commons-ui.apps</artifactId>
<name>ACS AEM Commons UI.Apps Package</name>
<packaging>content-package</packaging>
<description>ACS AEM Commons content package containing code (/apps).</description>

<build>
<resources>
<resource>
<directory>src/main/content/jcr_root</directory>
<excludes>
<exclude>**/.vlt</exclude>
<exclude>**/.vltignore</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/content/META-INF/vault/definition</directory>
<targetPath>../vault-work/META-INF/vault/definition</targetPath>
</resource>
<resource>
<directory>src/main/content/META-INF/vault</directory>
<includes>
<include>nodetypes.cnd</include>
<include>privileges.xml</include>
</includes>
<targetPath>../vault-work/META-INF/vault</targetPath>
</resource>
<resource>
<directory>src/main/resources/META-INF</directory>
<targetPath>../vault-work/META-INF</targetPath>
</resource>
</resources>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>filevault-package-maven-plugin</artifactId>
<configuration>
<includeEmptyDirs>true</includeEmptyDirs>
</configuration>
</plugin>

<plugin>
<groupId>com.day.jcr.vault</groupId>
<artifactId>content-package-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<group>adobe/consulting</group>
<packageType>application</packageType>
<properties>
<description>ACS AEM Commons content package containing code (/apps).</description>
<!-- overwrite rep:ACE nodes defining policies for acs-aem-commons-owned service principals -->
<acHandling>merge</acHandling>
</properties>
<filterSource>src/main/content/META-INF/vault/filter.xml</filterSource>
<embeddeds>
<embedded>
<groupId>${project.groupId}</groupId>
<artifactId>acs-aem-commons-bundle</artifactId>
<target>/apps/acs-commons/install</target>
</embedded>
</embeddeds>
<dependencies>
<dependency>
<group>day/cq60/product</group>
<name>cq-content</name>
<version>[6.3.64,)</version>
</dependency>
</dependencies>
<targetURL>http://${crx.host}:${crx.port}${crx.contextRoot}/crx/packmgr/service.jsp</targetURL>
</configuration>
</plugin>

Expand Down
Loading

0 comments on commit 48c6946

Please sign in to comment.