You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2021/04/11 17:43:20 UTC
[servicemix-bundles] branch master updated: [SM-4727][opensaml]
mark javax.annotation import-package as optional
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git
The following commit(s) were added to refs/heads/master by this push:
new 9c3f2d7 [SM-4727][opensaml] mark javax.annotation import-package as optional
9c3f2d7 is described below
commit 9c3f2d7cbc9ee0327269dac3bd41b5674e087ab0
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Sun Apr 11 13:43:04 2021 -0400
[SM-4727][opensaml] mark javax.annotation import-package as optional
---
opensaml-3.4.6/pom.xml | 2 +-
opensaml-4.0.1/pom.xml | 2 +-
pom.xml | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/opensaml-3.4.6/pom.xml b/opensaml-3.4.6/pom.xml
index 64a799a..5040eaf 100644
--- a/opensaml-3.4.6/pom.xml
+++ b/opensaml-3.4.6/pom.xml
@@ -59,7 +59,7 @@
org.cryptacular*;resolution:=optional,
org.apache.http*;resolution:=optional,
com.beust.jcommander*;resolution:=optional,
- javax.annotation;version="[1,4)",
+ javax.annotation;version="[1,4)";resolution:=optional,
com.google.common*;version="0.0.0",
*
</servicemix.osgi.import.pkg>
diff --git a/opensaml-4.0.1/pom.xml b/opensaml-4.0.1/pom.xml
index df223b7..d800546 100644
--- a/opensaml-4.0.1/pom.xml
+++ b/opensaml-4.0.1/pom.xml
@@ -59,7 +59,7 @@
org.cryptacular*;resolution:=optional,
org.apache.http*;resolution:=optional,
com.beust.jcommander*;resolution:=optional,
- javax.annotation;version="[1,4)",
+ javax.annotation;version="[1,4);resolution:=optional",
com.google.common*;version="0.0.0",
*
</servicemix.osgi.import.pkg>
diff --git a/pom.xml b/pom.xml
index 79b1fb8..c5179c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,8 @@
<modules>
<module>kafka-clients-2.6.1</module>
+ <module>opensaml-4.0.1</module>
+ <module>opensaml-3.4.6</module>
</modules>
</project>