Skip to content

SLING-10398 embed classes with Bnd only #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kwin wants to merge 3 commits into
base: master
Choose a base branch
from
Open

SLING-10398 embed classes with Bnd only #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50ee487
SLING-10398 embed classes with Bnd only
kwin May 19, 2021
20e6bf1
explicitly ignore more imports used by embedded Jars
kwin May 19, 2021
71d38b5
tweak some more imports
kwin May 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 10 additions & 23 deletions bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,27 @@
# make sure to not import classes which are not actually used from the embedded JARs
Import-Package: !bsh, \
Copy link
Copy Markdown
Member Author

@kwin kwin May 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@raducotescu Not sure who you came up with this list initially, but not importing javax.servlet.jsp seems like a mistake as the library is depending on it (and all distributions for sure export it)

!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.*, \
!org.apache.commons.lang.*, \
!org.apache.commons.vfs2.*, \
!org.apache.tools.ant.taskdefs, \
!org.apache.xml.resolver.*, \
!org.apache.xmlgraphics.java2d.color, \
!org.apache.log, \
!org.apache.xerces.*, \
!org.apache.xml.*, \
!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, \
*
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!/*
63 changes: 0 additions & 63 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down