You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/06/21 21:02:15 UTC
svn commit: r1138138 - in /cxf/trunk:
distribution/karaf/features/src/main/resources/features.xml parent/pom.xml
Author: dkulp
Date: Tue Jun 21 19:02:15 2011
New Revision: 1138138
URL: http://svn.apache.org/viewvc?rev=1138138&view=rev
Log:
Update to newer version of velocity
Modified:
cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
cxf/trunk/parent/pom.xml
Modified: cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/karaf/features/src/main/resources/features.xml?rev=1138138&r1=1138137&r2=1138138&view=diff
==============================================================================
--- cxf/trunk/distribution/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/distribution/karaf/features/src/main/resources/features.xml Tue Jun 21 19:02:15 2011
@@ -104,7 +104,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${cxf.bcel.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${cxf.xalan.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${cxf.oro.bundle.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${cxf.velocity.bundle.version}</bundle>
+ <bundle>mvn:org.apache.velocity/velocity/${cxf.velocity.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${cxf.jdom.bundle.version}</bundle>
<bundle>mvn:org.apache.cxf/cxf-bundle/${project.version}</bundle>
Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1138138&r1=1138137&r2=1138138&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Tue Jun 21 19:02:15 2011
@@ -96,6 +96,7 @@
<cxf.opensaml.osgi.version>2.4.1_1</cxf.opensaml.osgi.version>
<cxf.opensaml.xmltooling.version>1.3.1</cxf.opensaml.xmltooling.version>
<cxf.neethi.version>3.0.0</cxf.neethi.version>
+ <cxf.velocity.version>1.7</cxf.velocity.version>
<cxf.geronimo.annotation.version>1.1.1</cxf.geronimo.annotation.version>
<cxf.geronimo.jms.version>1.1.1</cxf.geronimo.jms.version>
@@ -131,7 +132,6 @@
<cxf.bcel.bundle.version>5.2_3</cxf.bcel.bundle.version>
<cxf.xalan.bundle.version>2.7.1_3</cxf.xalan.bundle.version>
<cxf.oro.bundle.version>2.0.8_4</cxf.oro.bundle.version>
- <cxf.velocity.bundle.version>1.6.2_4</cxf.velocity.bundle.version>
<cxf.jdom.bundle.version>1.1_3</cxf.jdom.bundle.version>
<cxf.checkstyle.extension />
@@ -1041,7 +1041,7 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.6.4</version>
+ <version>${cxf.velocity.version}</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>