Do not embed Snakeyaml as bundle as it conflicts with AEMaaCS (#513)

Only embed as private JAR inside the AC bundle improve bnd resolver checks (by not taking into account Maven dependencies) This fixes #512
Netcentric · Oct 27, 2020 · 92e60c6 · 92e60c6
1 parent b19bdeb
commit 92e60c6
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/accesscontroltool-bundle/pom.xml b/accesscontroltool-bundle/pom.xml
@@ -268,7 +268,7 @@ Bundle-SymbolicName: biz.netcentric.cq.tools.accesscontroltool.bundle
 # export all versioned packages by default
 -exportcontents: ${packages;VERSIONED}
 # Embed (https://groups.google.com/g/bndtools-users/c/NAdU0_X8OKY)
--includeresource: tomcat-el-api-[0-9.]*.jar;lib:=true,tomcat-jasper-el-[0-9.]*.jar;lib:=true
+-includeresource: tomcat-el-api-[0-9.]*.jar;lib:=true,tomcat-jasper-el-[0-9.]*.jar;lib:=true,snakeyaml-[0-9.]*.jar;lib:=true
 # broad version range for jackrabbit oak versions (as long as we need to support Oak < 1.7.12, see https://github.com/Netcentric/accesscontroltool/issues/435 and https://issues.apache.org/jira/browse/OAK-6945
 Import-Package: org.apache.jackrabbit.oak.spi.security.authentication.external;resolution:=optional;version="[0,3)",org.apache.jackrabbit.oak.spi.security.authentication.external.basic;resolution:=optional;version="[0,2)",org.apache.jackrabbit.oak.*;version="[0,2)",com.adobe.granite.crypto;resolution:=optional,com.adobe.granite.jmx.annotation;resolution:=optional,com.day.cq.security.util;resolution:=optional,* ]]></bnd>
                 </configuration>
@@ -303,6 +303,7 @@ Import-Package: org.apache.jackrabbit.oak.spi.security.authentication.external;r
                         </goals>
                         <phase>verify</phase>
                         <configuration>
+                            <useMavenDependencies>false</useMavenDependencies>
                             <bndruns>
                                 <include>minimum-aem.bndrun</include>
                             </bndruns>
@@ -315,6 +316,7 @@ Import-Package: org.apache.jackrabbit.oak.spi.security.authentication.external;r
                         </goals>
                         <phase>verify</phase>
                         <configuration>
+                            <useMavenDependencies>false</useMavenDependencies>
                             <bndruns>
                                 <include>maximum-aem.bndrun</include>
                             </bndruns>

diff --git a/accesscontroltool-package/pom.xml b/accesscontroltool-package/pom.xml
@@ -106,9 +106,6 @@
                             <artifactId>accesscontroltool-startuphook-bundle</artifactId>
                             <target>/apps/netcentric/actool/install/27</target>
                         </embedded>
-                        <embedded>
-                            <artifactId>snakeyaml</artifactId>
-                        </embedded>
                         <embedded>
                             <artifactId>bcprov-jdk15on</artifactId>
                         </embedded>

diff --git a/target-osgi-environment/maximum-environment/pom.xml b/target-osgi-environment/maximum-environment/pom.xml
@@ -253,6 +253,19 @@
             <version>1.2.4</version> <!-- uses Oak 1.3.7 -->
             <scope>provided</scope>
         </dependency>
+        <!-- OSGi bundles shipped with the ACTool package -->
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
+            <version>${bouncycastle.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <groupId>org.bouncycastle</groupId>
+            <version>${bouncycastle.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.adobe.aem</groupId>
             <artifactId>uber-jar</artifactId>

diff --git a/target-osgi-environment/minimum-environment/pom.xml b/target-osgi-environment/minimum-environment/pom.xml
@@ -234,6 +234,19 @@
             <version>2.1.6</version>
             <scope>provided</scope>
         </dependency>
+        <!-- OSGi bundles shipped with the ACTool package -->
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
+            <version>${bouncycastle.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <groupId>org.bouncycastle</groupId>
+            <version>${bouncycastle.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.adobe.aem</groupId>
             <artifactId>uber-jar</artifactId>