cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1138947 - in /cxf/branches/2.4.x-fixes: ./ distribution/karaf/features/src/main/resources/features.xml parent/pom.xml
Date Thu, 23 Jun 2011 15:48:27 GMT
Author: dkulp
Date: Thu Jun 23 15:48:26 2011
New Revision: 1138947

URL: http://svn.apache.org/viewvc?rev=1138947&view=rev
Log:
Merged revisions 1138138 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1138138 | dkulp | 2011-06-21 15:02:15 -0400 (Tue, 21 Jun 2011) | 1 line
  
  Update to newer version of velocity
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/distribution/karaf/features/src/main/resources/features.xml
    cxf/branches/2.4.x-fixes/parent/pom.xml

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 23 15:48:26 2011
@@ -1 +1 @@
-/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1134526,1135106,1135457,1135484,1135899,1136380,1136417,1136837,1136860,1136933,1136942-1136953,1136960,1137509,1137658-1137678,1137793,1137960,1137964,1138097,1138220,1138644,1138913,1138919
+/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1134526,1135106,1135457,1135484,1135899,1136380,1136417,1136837,1136860,1136933,1136942-1136953,1136960,1137509,1137658-1137678,1137793,1137960,1137964,1138097,1138138,1138220,1138644,1138913,1138919

Modified: cxf/branches/2.4.x-fixes/distribution/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/karaf/features/src/main/resources/features.xml?rev=1138947&r1=1138946&r2=1138947&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/karaf/features/src/main/resources/features.xml (original)
+++ cxf/branches/2.4.x-fixes/distribution/karaf/features/src/main/resources/features.xml Thu
Jun 23 15:48:26 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/branches/2.4.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1138947&r1=1138946&r2=1138947&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/parent/pom.xml Thu Jun 23 15:48:26 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>



Mime
View raw message