cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject cxf git commit: Specify a version range for opensaml to try and get karaf 4 to resolve it
Date Mon, 11 May 2015 23:59:14 GMT
Repository: cxf
Updated Branches:
  refs/heads/master aecaf0106 -> 8ee1ce727


Specify a version range for opensaml to try and get karaf 4 to resolve it


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8ee1ce72
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8ee1ce72
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8ee1ce72

Branch: refs/heads/master
Commit: 8ee1ce727f04099b2bbeea4164ad38005de769b3
Parents: aecaf01
Author: Daniel Kulp <dkulp@apache.org>
Authored: Mon May 11 19:58:43 2015 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Mon May 11 19:59:09 2015 -0400

----------------------------------------------------------------------
 parent/pom.xml                                  | 3 ++-
 rt/rs/security/oauth-parent/oauth2-saml/pom.xml | 5 +++++
 rt/rs/security/sso/saml/pom.xml                 | 1 +
 rt/rs/security/xml/pom.xml                      | 5 +++++
 rt/security-saml/pom.xml                        | 2 +-
 rt/ws/security/pom.xml                          | 2 +-
 services/sts/sts-core/pom.xml                   | 3 ++-
 7 files changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/8ee1ce72/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2dc01cb..5426d81 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -127,6 +127,7 @@
         <cxf.oauth.version>20100527</cxf.oauth.version>
         <cxf.opensaml.version>3.1.0</cxf.opensaml.version>
         <cxf.opensaml.osgi.version>3.1.0_1</cxf.opensaml.osgi.version>
+        <cxf.opensaml.osgi.version.range>[3.1,4)</cxf.opensaml.osgi.version.range>
         <cxf.rhino.version>1.7R2</cxf.rhino.version>
         <cxf.servlet-api.group>org.apache.geronimo.specs</cxf.servlet-api.group>
         <cxf.servlet-api.artifact>geronimo-servlet_3.0_spec</cxf.servlet-api.artifact>
@@ -145,7 +146,7 @@
         <cxf.woodstox.core.version>4.4.1</cxf.woodstox.core.version>
         <cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version>
         <cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version>
-        <cxf.wss4j.version>2.1.0</cxf.wss4j.version>
+        <cxf.wss4j.version>2.1.1-SNAPSHOT</cxf.wss4j.version>
         <cxf.xerces.version>2.11.0</cxf.xerces.version>
         <cxf.xmlbeans.version>2.6.0</cxf.xmlbeans.version>
         <cxf.xmlschema.version>2.2.1</cxf.xmlschema.version>

http://git-wip-us.apache.org/repos/asf/cxf/blob/8ee1ce72/rt/rs/security/oauth-parent/oauth2-saml/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2-saml/pom.xml b/rt/rs/security/oauth-parent/oauth2-saml/pom.xml
index 15181ae..56600f0 100644
--- a/rt/rs/security/oauth-parent/oauth2-saml/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2-saml/pom.xml
@@ -30,6 +30,11 @@
         <version>3.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
+    <properties>
+        <cxf.osgi.import>
+            org.opensaml*;version="${cxf.opensaml.osgi.version.range}",
+        </cxf.osgi.import>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>

http://git-wip-us.apache.org/repos/asf/cxf/blob/8ee1ce72/rt/rs/security/sso/saml/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/pom.xml b/rt/rs/security/sso/saml/pom.xml
index ad21670..98aa1bb 100644
--- a/rt/rs/security/sso/saml/pom.xml
+++ b/rt/rs/security/sso/saml/pom.xml
@@ -34,6 +34,7 @@
         <cxf.osgi.import>
             javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
             net.sf.ehcache*;resolution:=optional;version="[2.5, 3.0.0)",
+            org.opensaml*;version="${cxf.opensaml.osgi.version.range}",
         </cxf.osgi.import>
     </properties>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/cxf/blob/8ee1ce72/rt/rs/security/xml/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/pom.xml b/rt/rs/security/xml/pom.xml
index 6aaacda..a0dd754 100644
--- a/rt/rs/security/xml/pom.xml
+++ b/rt/rs/security/xml/pom.xml
@@ -30,6 +30,11 @@
         <version>3.1.1-SNAPSHOT</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
+    <properties>
+        <cxf.osgi.import>
+            org.opensaml*;version="${cxf.opensaml.osgi.version.range}",
+        </cxf.osgi.import>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>junit</groupId>

http://git-wip-us.apache.org/repos/asf/cxf/blob/8ee1ce72/rt/security-saml/pom.xml
----------------------------------------------------------------------
diff --git a/rt/security-saml/pom.xml b/rt/security-saml/pom.xml
index 15f0417..25e21b7 100644
--- a/rt/security-saml/pom.xml
+++ b/rt/security-saml/pom.xml
@@ -32,7 +32,7 @@
     </parent>
     <properties>
         <cxf.osgi.import>
-            org.opensaml*,
+            org.opensaml*;resolution:=optional;version="${cxf.opensaml.osgi.version.range}",
         </cxf.osgi.import>
     </properties>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/cxf/blob/8ee1ce72/rt/ws/security/pom.xml
----------------------------------------------------------------------
diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml
index fb0e58d..5aa711e 100644
--- a/rt/ws/security/pom.xml
+++ b/rt/ws/security/pom.xml
@@ -33,7 +33,7 @@
     <properties>
         <cxf.osgi.import>
             net.sf.ehcache*;resolution:=optional;version="[2.5, 3.0.0)",
-            org.opensaml*;resolution:=optional,
+            org.opensaml*;resolution:=optional;version="${cxf.opensaml.osgi.version.range}",
         </cxf.osgi.import>
     </properties>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/cxf/blob/8ee1ce72/services/sts/sts-core/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index 44eafdb..3b26c1f 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -147,13 +147,14 @@
                             org.apache.cxf.sts.*;version=${project.version}
                         </Export-Package>
                         <Import-Package>
-                                javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
+                            javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
                             org.apache.cxf.sts.provider.*;version=${project.version},
                             !org.apache.cxf.sts.*,
                             org.apache.cxf.*;version=${project.version},
                             javax.xml.ws*;version="[0.0,3)",
                             org.springframework.ldap*;resolution:=optional,
                             net.sf.ehcache*;resolution:=optional;version="[2.5, 3.0.0)",
+                            org.opensaml*;version="${cxf.opensaml.osgi.version.range}",
                             *
                         </Import-Package>
                         <Bundle-SymbolicName>org.apache.cxf.services.sts.core</Bundle-SymbolicName>


Mime
View raw message