servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject servicemix-bundles git commit: [SM-3126] Extend javax.annotation package version import in opensaml bundles
Date Mon, 31 Oct 2016 06:25:45 GMT
Repository: servicemix-bundles
Updated Branches:
  refs/heads/master 208c7e459 -> 2e00f33a4


[SM-3126] Extend javax.annotation package version import in opensaml bundles


Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/2e00f33a
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/2e00f33a
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/2e00f33a

Branch: refs/heads/master
Commit: 2e00f33a4196fce912fd328e00e0795eaba1ea44
Parents: 208c7e4
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Mon Oct 31 07:25:12 2016 +0100
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Mon Oct 31 07:25:12 2016 +0100

----------------------------------------------------------------------
 opensaml-3.1.0/pom.xml | 21 +--------------------
 opensaml-3.1.1/pom.xml | 21 +--------------------
 opensaml-3.2.0/pom.xml | 21 +--------------------
 pom.xml                |  3 +++
 4 files changed, 6 insertions(+), 60 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/2e00f33a/opensaml-3.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/opensaml-3.1.0/pom.xml b/opensaml-3.1.0/pom.xml
index 7097154..7c709e9 100644
--- a/opensaml-3.1.0/pom.xml
+++ b/opensaml-3.1.0/pom.xml
@@ -58,28 +58,9 @@
             org.cryptacular*;resolution:=optional,
             org.apache.http*;resolution:=optional,
             com.beust.jcommander*;resolution:=optional,
+            javax.annotation;version="[1,4)",
             *
         </servicemix.osgi.import.pkg>
-        <!--servicemix.osgi.import.pkg>
-            javax.crypto,
-            javax.net,
-            javax.net.ssl,
-            javax.security.auth.x500,
-
-            javax.xml.datatype,
-            javax.xml.namespace,
-            javax.xml.parsers,
-            javax.xml.transform,
-            javax.xml.transform.dom,
-            javax.xml.transform.stream,
-            javax.xml.validation,
-            net.jcip.annotations;resolution:=optional,
-            org.apache.xml.security*;version="[1.5,3)",
-            org.owasp.esapi*;resolution:=optional,
-            org.slf4j;resolution:=optional,
-            org.w3c.dom*,
-            org.xml.sax
-        </servicemix.osgi.import.pkg-->
         <servicemix.osgi.private.pkg>
             schema;-split-package:=merge-first,
             templates;-split-package:=merge-first,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/2e00f33a/opensaml-3.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/opensaml-3.1.1/pom.xml b/opensaml-3.1.1/pom.xml
index b3abcef..a395d4b 100644
--- a/opensaml-3.1.1/pom.xml
+++ b/opensaml-3.1.1/pom.xml
@@ -59,28 +59,9 @@
             org.cryptacular*;resolution:=optional,
             org.apache.http*;resolution:=optional,
             com.beust.jcommander*;resolution:=optional,
+            javax.annotation;version="[1,4)",
             *
         </servicemix.osgi.import.pkg>
-        <!--servicemix.osgi.import.pkg>
-            javax.crypto,
-            javax.net,
-            javax.net.ssl,
-            javax.security.auth.x500,
-
-            javax.xml.datatype,
-            javax.xml.namespace,
-            javax.xml.parsers,
-            javax.xml.transform,
-            javax.xml.transform.dom,
-            javax.xml.transform.stream,
-            javax.xml.validation,
-            net.jcip.annotations;resolution:=optional,
-            org.apache.xml.security*;version="[1.5,3)",
-            org.owasp.esapi*;resolution:=optional,
-            org.slf4j;resolution:=optional,
-            org.w3c.dom*,
-            org.xml.sax
-        </servicemix.osgi.import.pkg-->
         <servicemix.osgi.private.pkg>
             schema;-split-package:=merge-first,
             templates;-split-package:=merge-first,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/2e00f33a/opensaml-3.2.0/pom.xml
----------------------------------------------------------------------
diff --git a/opensaml-3.2.0/pom.xml b/opensaml-3.2.0/pom.xml
index 72ddaed..018e0bb 100644
--- a/opensaml-3.2.0/pom.xml
+++ b/opensaml-3.2.0/pom.xml
@@ -59,28 +59,9 @@
             org.cryptacular*;resolution:=optional,
             org.apache.http*;resolution:=optional,
             com.beust.jcommander*;resolution:=optional,
+            javax.annotation;version="[1,4)",
             *
         </servicemix.osgi.import.pkg>
-        <!--servicemix.osgi.import.pkg>
-            javax.crypto,
-            javax.net,
-            javax.net.ssl,
-            javax.security.auth.x500,
-
-            javax.xml.datatype,
-            javax.xml.namespace,
-            javax.xml.parsers,
-            javax.xml.transform,
-            javax.xml.transform.dom,
-            javax.xml.transform.stream,
-            javax.xml.validation,
-            net.jcip.annotations;resolution:=optional,
-            org.apache.xml.security*;version="[1.5,3)",
-            org.owasp.esapi*;resolution:=optional,
-            org.slf4j;resolution:=optional,
-            org.w3c.dom*,
-            org.xml.sax
-        </servicemix.osgi.import.pkg-->
         <servicemix.osgi.private.pkg>
             schema;-split-package:=merge-first,
             templates;-split-package:=merge-first,

http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/2e00f33a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 054aff2..be7a0f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,6 +62,9 @@
         <module>kafka_2.10-0.10.0.1</module>
         <module>saxon-9.7.0-10</module>
         <module>influxdb-java-2.4</module>
+        <module>opensaml-3.1.0</module>
+        <module>opensaml-3.1.1</module>
+        <module>opensaml-3.2.0</module>
     </modules>
 
 </project>


Mime
View raw message