diff --git a/accesscontroltool-content-package/pom.xml b/accesscontroltool-content-package/pom.xml
index 8ede703c..926a84aa 100644
--- a/accesscontroltool-content-package/pom.xml
+++ b/accesscontroltool-content-package/pom.xml
@@ -52,7 +52,6 @@
com.day.jcr.vault
content-package-maven-plugin
-
diff --git a/accesscontroltool-oakindex-package/pom.xml b/accesscontroltool-oakindex-package/pom.xml
index c9937e18..98e85760 100644
--- a/accesscontroltool-oakindex-package/pom.xml
+++ b/accesscontroltool-oakindex-package/pom.xml
@@ -40,44 +40,6 @@
content
-
- cloud-generate-metadata
-
- generate-metadata
-
-
-
- application
- cloud
-
-
-
- cloud-package
-
- package
-
-
- cloud
-
-
-
- cloud-validate-package
-
- validate-package
-
-
-
- ${project.build.directory}/${project.build.finalName}-cloud.zip
-
-
-
-
- apps,libs,oak:index
-
-
-
-
-
default-validate-package
@@ -97,9 +59,6 @@
com.day.jcr.vault
content-package-maven-plugin
-
- http://${crx.host}:${crx.port}/crx/packmgr/service.jsp
-
@@ -163,4 +122,71 @@
+
+
+ cloud
+
+
+
+ env.CI
+
+
+
+
+
+
+ org.apache.jackrabbit
+ filevault-package-maven-plugin
+
+
+ cloud-generate-metadata
+
+ generate-metadata
+
+
+
+ application
+ cloud
+
+
+
+ cloud-package
+
+ package
+
+
+ cloud
+
+
+
+ cloud-validate-package
+
+ validate-package
+
+
+ cloud
+ true
+
+
+
+
+ apps,libs,oak:index
+
+
+
+
+
+
+
+
+ com.adobe.aem
+ aemanalyser-maven-plugin
+
+ cloud
+
+
+
+
+
+
diff --git a/accesscontroltool-package/pom.xml b/accesscontroltool-package/pom.xml
index bd1433d4..9f7683e3 100644
--- a/accesscontroltool-package/pom.xml
+++ b/accesscontroltool-package/pom.xml
@@ -55,7 +55,6 @@
aem-sdk-api
2021.5.5343.20210524T070738Z-210527
-
@@ -77,30 +76,7 @@
-
-
- maven-resources-plugin
-
-
- copy-cloud-package-resources
-
- process-resources
-
- copy-resources
-
-
- ${project.build.directory}/vault-work-cloud/jcr_root
-
-
- src/main/jcr_root-cloud
- false
-
-
-
-
-
-
-
+
org.apache.jackrabbit
filevault-package-maven-plugin
@@ -141,45 +117,6 @@
org.apache.sling:org.apache.sling.installer.provider.installhook:1.1.0
-
- cloud-generate-metadata
-
- generate-metadata
-
-
-
-
-
- accesscontroltool-bundle
-
-
- accesscontroltool-apps-package
-
-
- accesscontroltool-startuphook-bundle
- /apps/netcentric/actool/install/27
-
-
- cloud
-
-
-
- cloud-package
-
- package
-
-
- cloud
- false
-
-
-
- default-validate-package
-
-
- cloud
-
-
default-analyze-classes
invalid
@@ -193,10 +130,98 @@
com.adobe.aem
aemanalyser-maven-plugin
-
- cloud
-
+
+
+ cloud
+
+
+
+ env.CI
+
+
+
+
+
+
+ maven-resources-plugin
+
+
+ copy-cloud-package-resources
+
+ process-resources
+
+ copy-resources
+
+
+ ${project.build.directory}/vault-work-cloud/jcr_root
+
+
+ src/main/jcr_root-cloud
+ false
+
+
+
+
+
+
+
+
+ org.apache.jackrabbit
+ filevault-package-maven-plugin
+
+
+ cloud-generate-metadata
+
+ generate-metadata
+
+
+
+
+
+ accesscontroltool-bundle
+
+
+ accesscontroltool-apps-package
+
+
+ accesscontroltool-startuphook-bundle
+ /apps/netcentric/actool/install/27
+
+
+ cloud
+
+
+
+ cloud-package
+
+ package
+
+
+ cloud
+ false
+
+
+
+ default-validate-package
+
+
+ cloud
+
+
+
+
+
+ com.adobe.aem
+ aemanalyser-maven-plugin
+
+ cloud
+
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 33bc00f8..a468538b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,6 +88,8 @@
8
4.8.0
5.10.0
+
+ ${project.build.directory}/${project.build.finalName}.zip
@@ -301,7 +303,7 @@
org.apache.jackrabbit
filevault-package-maven-plugin
- 1.3.0
+ 1.3.6
true
Netcentric
@@ -389,6 +391,8 @@
true
${crx.username}
${crx.password}
+
+ ${contentPackageFile}
@@ -409,7 +413,7 @@
maven-release-plugin
3.0.0-M6
- release
+ release,cloud
true
@{project.version}
@@ -742,6 +746,20 @@
+
+
+ cloud
+
+
+
+ env.CI
+
+
+
+
+ ${project.build.directory}/${project.build.finalName}-cloud.zip
+
+