You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by cs...@apache.org on 2013/10/22 11:56:14 UTC
svn commit: r1534577 - in /cxf/branches/2.7.x-fixes: api/
osgi/karaf/features/src/main/resources/features.xml parent/pom.xml rt/core/
rt/frontend/jaxws/ rt/security/ rt/security/pom.xml
Author: cschneider
Date: Tue Oct 22 09:56:13 2013
New Revision: 1534577
URL: http://svn.apache.org/r1534577
Log:
CXF-5313 Use only joda time 2.1
Modified:
cxf/branches/2.7.x-fixes/api/ (props changed)
cxf/branches/2.7.x-fixes/osgi/karaf/features/src/main/resources/features.xml
cxf/branches/2.7.x-fixes/parent/pom.xml
cxf/branches/2.7.x-fixes/rt/core/ (props changed)
cxf/branches/2.7.x-fixes/rt/frontend/jaxws/ (props changed)
cxf/branches/2.7.x-fixes/rt/security/ (props changed)
cxf/branches/2.7.x-fixes/rt/security/pom.xml
Propchange: cxf/branches/2.7.x-fixes/api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Oct 22 09:56:13 2013
@@ -16,3 +16,5 @@ eclipse-classes
*.iws
.pmdruleset
+
+.pmdruleset.xml
Modified: cxf/branches/2.7.x-fixes/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/osgi/karaf/features/src/main/resources/features.xml?rev=1534577&r1=1534576&r2=1534577&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/branches/2.7.x-fixes/osgi/karaf/features/src/main/resources/features.xml Tue Oct 22 09:56:13 2013
@@ -199,7 +199,7 @@
<feature name="cxf-databinding-jibx" version="${project.version}" resolver='(obr)'>
<feature version="${project.version}">cxf-core</feature>
<feature version="${project.version}">cxf-tools</feature>
- <bundle start-level='25' dependency="true">mvn:joda-time/joda-time/${cxf.joda.time.version2}</bundle>
+ <bundle start-level='25' dependency="true">mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle>
<bundle start-level='40' dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${cxf.xpp3.bundle.version}</bundle>
<bundle start-level='40' dependency='true'>mvn:org.jibx/jibx-run/${cxf.jibx.version}</bundle>
<bundle start-level='40' dependency='true'>mvn:org.jibx/jibx-bind/${cxf.jibx.version}</bundle>
Modified: cxf/branches/2.7.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/parent/pom.xml?rev=1534577&r1=1534576&r2=1534577&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/parent/pom.xml Tue Oct 22 09:56:13 2013
@@ -123,8 +123,7 @@
<cxf.jaxb.version>${cxf.jaxb21.version}</cxf.jaxb.version>
<cxf.jaxb.impl.version>${cxf.jaxb21.impl.version}</cxf.jaxb.impl.version>
<cxf.jaxb.xjc.version>${cxf.jaxb21.xjc.version}</cxf.jaxb.xjc.version>
- <cxf.joda.time.version>1.6.2</cxf.joda.time.version>
- <cxf.joda.time.version2>2.1</cxf.joda.time.version2>
+ <cxf.joda.time.version>2.1</cxf.joda.time.version>
<cxf.jdom.version>1.0</cxf.jdom.version>
<cxf.jettison.version>1.3.4</cxf.jettison.version>
<cxf.jetty.version>8.1.12.v20130726</cxf.jetty.version>
@@ -136,7 +135,7 @@
<cxf.neethi.version>3.0.2</cxf.neethi.version>
<cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
<cxf.opensaml.version>2.5.3</cxf.opensaml.version>
- <cxf.opensaml.osgi.version>2.5.3_1</cxf.opensaml.osgi.version>
+ <cxf.opensaml.osgi.version>2.5.3_3</cxf.opensaml.osgi.version>
<cxf.opensaml.xmltooling.version>1.3.4-1</cxf.opensaml.xmltooling.version>
<cxf.opensamlws.version>1.4.4-1</cxf.opensamlws.version>
<cxf.rhino.version>1.7R2</cxf.rhino.version>
Propchange: cxf/branches/2.7.x-fixes/rt/core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Oct 22 09:56:13 2013
@@ -14,3 +14,5 @@ eclipse-classes
*.ipr
*.iml
*.iws
+
+.pmdruleset.xml
Propchange: cxf/branches/2.7.x-fixes/rt/frontend/jaxws/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Oct 22 09:56:13 2013
@@ -14,3 +14,5 @@ eclipse-classes
*.ipr
*.iml
*.iws
+
+.pmdruleset.xml
Propchange: cxf/branches/2.7.x-fixes/rt/security/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Oct 22 09:56:13 2013
@@ -1 +1,9 @@
target
+
+.checkstyle
+
+.pmdruleset.xml
+
+.pmd
+
+.project
Modified: cxf/branches/2.7.x-fixes/rt/security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/security/pom.xml?rev=1534577&r1=1534576&r2=1534577&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/security/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/rt/security/pom.xml Tue Oct 22 09:56:13 2013
@@ -34,6 +34,7 @@
<properties>
<cxf.osgi.import>
org.opensaml*,
+ org.joda.time;version="[1.6,3)" <!-- Also accept joda time 2.x to avoid duplicate joda time in OSGi -->
</cxf.osgi.import>
</properties>