From 50ee4877cbe11528001fdad40d49e44ac94b5ed9 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Wed, 19 May 2021 17:21:54 +0200
Subject: [PATCH 1/3] SLING-10398 embed classes with Bnd only

---
 bnd.bnd | 17 ++++------------
 pom.xml | 63 ---------------------------------------------------------
 2 files changed, 4 insertions(+), 76 deletions(-)

diff --git a/bnd.bnd b/bnd.bnd
index be4bc68..593228a 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -1,3 +1,4 @@
+# make sure to not import classes which are not actually used from the embedded JARs
 Import-Package: !bsh, \
                 !nu.xom, \
                 !org.apache.bcel.*, \
@@ -22,19 +23,9 @@ Import-Package: !bsh, \
                 !javax.mail.internet, \
                 !javax.servlet.jsp, \
                 !javax.servlet.jsp.tagext, \
+                !javax.swing.*, \
                 !javax.xml.*, \
                 !sun.io, \
                 *
-Private-Package: org.apache.sling.xss.impl, \
-                 org.apache.batik.*, \
-                 org.w3c.css.sac, \
-                 org.apache.xerces.*, \
-                 org.apache.xml.serialize, \
-                 org.apache.xml.serializer.*, \
-                 org.apache.commons.beanutils.*;-split-package:=merge-first, \
-                 org.apache.commons.configuration.*, \
-                 org.apache.commons.logging.impl, \
-                 org.cyberneko.html.*, \
-                 org.owasp.*, \
-                 javax.xml.parsers;-split-package:=merge-first, \
-                 javax.xml.transform;-split-package:=merge-first
+# embed full JARs in extracted form
+-includeresource: @antisamy-*.jar!/*,@esapi-*.jar!/*,@encoder-*.jar!/*,@xalan-*.jar!/*,@xml-apis-*.jar!/*
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1a19907..01372eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,69 +85,6 @@
                 <groupId>org.apache.sling</groupId>
                 <artifactId>sling-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/dependencies-classes</outputDirectory>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.owasp.antisamy</groupId>
-                                    <artifactId>antisamy</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.owasp.esapi</groupId>
-                                    <artifactId>esapi</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.owasp.encoder</groupId>
-                                    <artifactId>encoder</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>xalan</groupId>
-                                    <artifactId>xalan</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>xml-apis</groupId>
-                                    <artifactId>xml-apis</artifactId>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.1.0</version>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                        <!-- here the phase you need -->
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${project.build.directory}/dependencies-classes</directory>
-                                    <excludes>
-                                        <exclude>**/MANIFEST.MF</exclude>
-                                    </excludes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>

From 20e6bf14929f3d0383463f8af9a60a80efc72a99 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Wed, 19 May 2021 17:26:15 +0200
Subject: [PATCH 2/3] explicitly ignore more imports used by embedded Jars

---
 bnd.bnd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bnd.bnd b/bnd.bnd
index 593228a..e159c84 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -14,8 +14,8 @@ Import-Package: !bsh, \
                 !org.apache.commons.lang.*, \
                 !org.apache.commons.vfs2.*, \
                 !org.apache.tools.ant.taskdefs, \
-                !org.apache.xml.resolver.*, \
-                !org.apache.xmlgraphics.java2d.color, \
+                !org.apache.xerces.*, \
+                !org.apache.xml.*, \
                 !org.apache.log, \
                 !org.owasp.*, \
                 !org.xml.sax, \

From 71d38b56660317934aae0a7ee18c6fd0fb5756d5 Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Wed, 19 May 2021 17:41:45 +0200
Subject: [PATCH 3/3] tweak some more imports

---
 bnd.bnd | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/bnd.bnd b/bnd.bnd
index e159c84..91864ab 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -2,12 +2,12 @@
 Import-Package: !bsh, \
                 !nu.xom, \
                 !org.apache.bcel.*, \
-                !org.apache.log4j.spi, \
-                !org.apache.log4j.xml, \
-                !org.w3c.dom, \
                 !org.w3c.dom.*, \
                 !org.apache.avalon.framework.logger, \
+                !org.apache.batik.*, \
+                !org.apache.commons.beanutils.*, \
                 !org.apache.commons.collections.*, \
+                !org.apache.commons.configuration.*, \
                 !org.apache.commons.digester.*, \
                 !org.apache.commons.jexl2, \
                 !org.apache.commons.jxpath.*, \
@@ -16,13 +16,9 @@ Import-Package: !bsh, \
                 !org.apache.tools.ant.taskdefs, \
                 !org.apache.xerces.*, \
                 !org.apache.xml.*, \
-                !org.apache.log, \
+                !org.cyberneko.html.*, \
                 !org.owasp.*, \
-                !org.xml.sax, \
-                !org.xml.sax.*, \
                 !javax.mail.internet, \
-                !javax.servlet.jsp, \
-                !javax.servlet.jsp.tagext, \
                 !javax.swing.*, \
                 !javax.xml.*, \
                 !sun.io, \