cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf git commit: Update OpenSAML bundle, get STS itest working again
Date Wed, 09 Nov 2016 16:50:11 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 535358812 -> f12557bd4


Update OpenSAML bundle, get STS itest working again


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

Branch: refs/heads/master
Commit: f12557bd4323e5bb87b4678120f367dcce4b504e
Parents: 5353588
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed Nov 9 16:49:48 2016 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Nov 9 16:50:08 2016 +0000

----------------------------------------------------------------------
 osgi/karaf/features/src/main/resources/features.xml | 4 ++--
 parent/pom.xml                                      | 2 +-
 services/sts/systests/pom.xml                       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f12557bd/osgi/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index cfe8144..12eb1dc 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -66,8 +66,8 @@
         <bundle start-level="25">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
         <bundle start-level="25">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${cxf.xmlresolver.bundle.version}</bundle>
         <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${cxf.xerces.bundle.version}</bundle>
-        <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${cxf.bcel.bundle.version}</bundle>
-        <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${cxf.xalan.bundle.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${cxf.bcel.bundle.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${cxf.xalan.bundle.version}</bundle>
         <bundle start-level="30" dependency="true">mvn:org.apache.neethi/neethi/${cxf.neethi.version}</bundle>
         <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${cxf.jasypt.bundle.version}</bundle>
         <bundle start-level="30">mvn:org.apache.wss4j/wss4j-bindings/${cxf.wss4j.version}</bundle>

http://git-wip-us.apache.org/repos/asf/cxf/blob/f12557bd/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8fb17a3..88bdc6b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -134,7 +134,7 @@
         <cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
         <cxf.oauth.version>20100527</cxf.oauth.version>
         <cxf.opensaml.version>3.2.0</cxf.opensaml.version>
-        <cxf.opensaml.osgi.version>3.1.1_3</cxf.opensaml.osgi.version>
+        <cxf.opensaml.osgi.version>3.2.0_2</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.reflections.bundle.version>0.9.10_3</cxf.reflections.bundle.version>

http://git-wip-us.apache.org/repos/asf/cxf/blob/f12557bd/services/sts/systests/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/pom.xml b/services/sts/systests/pom.xml
index 07eff30..181986f 100644
--- a/services/sts/systests/pom.xml
+++ b/services/sts/systests/pom.xml
@@ -34,6 +34,6 @@
         <module>advanced</module>
         <module>sts-osgi</module>
         <module>sts-features</module>
-<!--        <module>sts-itests</module>-->
+        <module>sts-itests</module>
     </modules>
 </project>


Mime
View raw message