cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject cxf git commit: Updates to get the new wss4j stuff installed in OSGi. (may not work yet)
Date Fri, 13 Mar 2015 18:14:59 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 99b13f1da -> d1c7f1f6b


Updates to get the new wss4j stuff installed in OSGi.  (may not work yet)


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

Branch: refs/heads/master
Commit: d1c7f1f6be4ce14bd0e99ec9672d9c1957515f35
Parents: 99b13f1
Author: Daniel Kulp <dkulp@apache.org>
Authored: Fri Mar 13 14:14:32 2015 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Fri Mar 13 14:14:53 2015 -0400

----------------------------------------------------------------------
 osgi/karaf/features/src/main/resources/features.xml | 1 +
 parent/pom.xml                                      | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/d1c7f1f6/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 74ca7fa..f7052ff 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -56,6 +56,7 @@
         <bundle start-level="25" dependency="true">mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle>
         <bundle start-level="25" dependency="true">mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle>
         <bundle start-level="25" dependency="true">mvn:org.apache.santuario/xmlsec/${cxf.xmlsec.bundle.version}</bundle>
+        <bundle start-level="25" dependency="true">mvn:com.google.guava/guava/${cxf.guava.version}</bundle>
         <bundle start-level="25" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${cxf.opensaml.osgi.version}</bundle>
         <bundle start-level="25">mvn:org.jvnet.staxex/stax-ex/${cxf.stax-ex.version}</bundle>
         <bundle start-level="25">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d1c7f1f6/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index bed6fc1..83a9de6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -81,6 +81,7 @@
         <cxf.derby.version>10.2.2.0</cxf.derby.version>
         <cxf.ehcache.version>2.9.0</cxf.ehcache.version>
         <cxf.fastinfoset.bundle.version>1.2.13_1</cxf.fastinfoset.bundle.version>
+        <cxf.guava.version>18.0</cxf.guava.version>
         <cxf.hazelcast.version>1.9.4</cxf.hazelcast.version>
         <cxf.httpcomponents.asyncclient.version>4.0.2</cxf.httpcomponents.asyncclient.version>
         <cxf.httpcomponents.asyncclient.version.range>[4.0,4.1)</cxf.httpcomponents.asyncclient.version.range>
@@ -106,7 +107,7 @@
         <cxf.jaxb.impl.version>${cxf.jaxb.version}</cxf.jaxb.impl.version>
         <cxf.jaxb.core.version>${cxf.jaxb.version}</cxf.jaxb.core.version>
         <cxf.jaxb.xjc.version>${cxf.jaxb.version}</cxf.jaxb.xjc.version>
-        <cxf.joda.time.version>2.2</cxf.joda.time.version>
+        <cxf.joda.time.version>2.7</cxf.joda.time.version>
         <cxf.jdom.version>1.0</cxf.jdom.version>
         <cxf.jettison.version>1.3.7</cxf.jettison.version>
         <cxf.jetty8.version>8.1.15.v20140411</cxf.jetty8.version>
@@ -124,7 +125,7 @@
         <cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
         <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>3.1.0_1-SNAPSHOT</cxf.opensaml.osgi.version>
         <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>


Mime
View raw message