This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-xss.git
The following commit(s) were added to refs/heads/master by this push:
new 1cf0465 SLING-8847 - Upgrade to parent pom 35
1cf0465 is described below
commit 1cf046555fda1f9469ee34c8430283dd9693fe9e
Author: Radu Cotescu <[email protected]>
AuthorDate: Mon Nov 18 14:11:02 2019 +0100
SLING-8847 - Upgrade to parent pom 35
* inline dependencies before packaging, but skip overwriting the MANIFEST.MF
file
---
bnd.bnd | 2 ++
pom.xml | 27 ++++++++++++++++++++++++++-
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/bnd.bnd b/bnd.bnd
index ef96242..c1243e6 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -15,6 +15,7 @@ Import-Package: !bsh, \
!org.apache.xml.resolver.*, \
!org.apache.xmlgraphics.java2d.color, \
!org.apache.log, \
+ !org.owasp.*, \
!org.xml.sax, \
!org.xml.sax.*, \
!javax.mail.internet, \
@@ -32,5 +33,6 @@ Private-Package: org.apache.sling.xss.impl, \
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
diff --git a/pom.xml b/pom.xml
index 482a73e..d09b82c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
<goal>unpack</goal>
</goals>
<configuration>
-
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
+
<outputDirectory>${project.build.directory}/dependencies-classes</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.owasp.antisamy</groupId>
@@ -110,6 +110,31 @@
</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>
<configuration>
