This is an automated email from the ASF dual-hosted git repository.
cris pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-auth-saml2.git
The following commit(s) were added to refs/heads/master by this push:
new 08a2a45 Removed embeds for xmlsec, metrics-core,
velocity-engine-core, and commons-lang. These are now bundle dependencies
instead of embeded jars in the saml classpath
08a2a45 is described below
commit 08a2a4585f320e4f4691719208a77767e456c2cd
Author: Cris Rockwell <[email protected]>
AuthorDate: Tue Jun 29 17:54:49 2021 -0400
Removed embeds for xmlsec, metrics-core, velocity-engine-core, and
commons-lang. These are now bundle dependencies instead of embeded jars in the
saml classpath
---
bnd.bnd | 24 +++++++++++++---------
pom.xml | 18 ++++++++--------
.../org/apache/sling/auth/saml2/SamlHandlerIT.java | 4 ++++
3 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
index 39488d7..cf7c23f 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -4,16 +4,24 @@ Bundle-Activator: org.apache.sling.auth.saml2.Activator
Jaas-ModuleClass: org.apache.sling.auth.saml2.sp.Saml2LoginModule
-snapshot: SNAPSHOT
-noextraheaders: true
-Import-Package:!com.beust*,!antlr*,!org.apache.log.*,!org.apache.oro.text.perl*,!com.google.apphosting*,!com.google.appengine.api*,\
-!org.apache.tools.ant.*,!org.jdom*,!com.sun.org.apache.xerces.internal*,!sun.io,!org.bouncycastle.*,!javax.xml.bind.*,\
-!com.werken.xpath.*,!org.apache.xml.dtm.*,!org.apache.xml.utils.*,!org.apache.xpath.*,\
-!junit.framework*,!org.dom4j.*,!com.sun.msv.*,!sun.misc,javax.annotation;version=0.0.0,!org.relaxng.datatype.*,*
-removeheaders: Include-Resource, Private-Package
+Import-Package:\
+!com.beust*,\
+!javax.annotation*,\
+!javax.xml.bind.*,\
+!org.apache.xml.dtm.*,\
+!org.apache.xml.utils.*,\
+!org.apache.xpath.*,\
+!org.bouncycastle.*,\
+!sun.misc,\
+!com.google.apphosting*,\
+!com.google.appengine.api*,\
+*
-includeresource:\
-metrics-core-[0-9\.]+.jar;lib:=true,\
guava-[0-9\.]+-jre.jar;lib:=true,\
failureaccess-[0-9\.]+.jar;lib:=true,\
checker-qual-[0-9\.]+.jar;lib:=true,\
+error_prone_annotations-[0-9\.]+.jar;lib:=true,\
opensaml-core-[0-9\.]+.jar;lib:=true,\
opensaml-saml-impl-[0-9\.]+.jar;lib:=true,\
opensaml-saml-api-[0-9\.]+.jar;lib:=true,\
@@ -27,8 +35,4 @@ opensaml-messaging-api-[0-9\.]+.jar;lib:=true,\
opensaml-soap-api-[0-9\.]+.jar;lib:=true,\
opensaml-soap-impl-[0-9\.]+.jar;lib:=true,\
java-support-[0-9\.]+.jar;lib:=true,\
-velocity-[0-9\.]+.jar;lib:=true,\
-commons-lang-[0-9\.]+.jar;lib:=true,\
-error_prone_annotations-[0-9\.]+.jar;lib:=true,\
-xmlsec-[0-9\.]+.jar;lib:=true,\
-cryptacular-[0-9\.]+.jar;lib:=true,\
\ No newline at end of file
+cryptacular-[0-9\.]+.jar;lib:=true
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b35cd0c..809bfd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -327,9 +327,14 @@ which is licensed under the Apache-2.0 license.
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>28.2-jre</version>
+ <version>30.1.1-jre</version>
</dependency>
<dependency>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ <version>2.11.1</version>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>failureaccess</artifactId>
<version>1.0.1</version>
@@ -348,14 +353,9 @@ which is licensed under the Apache-2.0 license.
<!-- VELOCITY -->
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
+ <artifactId>velocity-engine-core</artifactId>
+ <version>2.3</version>
+ </dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
diff --git a/src/test/java/org/apache/sling/auth/saml2/SamlHandlerIT.java
b/src/test/java/org/apache/sling/auth/saml2/SamlHandlerIT.java
index d8e8fdf..9b3bc52 100644
--- a/src/test/java/org/apache/sling/auth/saml2/SamlHandlerIT.java
+++ b/src/test/java/org/apache/sling/auth/saml2/SamlHandlerIT.java
@@ -177,6 +177,10 @@ public class SamlHandlerIT extends TestSupport {
mavenBundle().groupId("net.bytebuddy").artifactId("byte-buddy").version("1.10.5"),
mavenBundle().groupId("net.bytebuddy").artifactId("byte-buddy-agent").version("1.10.5"),
mavenBundle().groupId("org.objenesis").artifactId("objenesis").version("2.6"),
+
mavenBundle().groupId("org.apache.santuario").artifactId("xmlsec").version("2.2.2"),
+
mavenBundle().groupId("io.dropwizard.metrics").artifactId("metrics-core").version("4.2.2"),
+
mavenBundle().groupId("org.apache.velocity").artifactId("velocity-engine-core").version("2.3"),
+
mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version("3.12.0"),
mavenBundle().groupId("org.bouncycastle").artifactId("bcprov-jdk15on").version("1.64"),
mavenBundle().groupId("org.bouncycastle").artifactId("bcpkix-jdk15on").version("1.64"),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.compiler").version(versionResolver),
