Author: dkulp
Date: Tue Sep 2 09:55:03 2008
New Revision: 691318
URL: http://svn.apache.org/viewvc?rev=691318&view=rev
Log:
Merged revisions 691295 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r691295 | dkulp | 2008-09-02 12:13:22 -0400 (Tue, 02 Sep 2008) | 2 lines
Update to latest velocity version
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/parent/pom.xml
cxf/branches/2.1.x-fixes/tools/common/pom.xml
cxf/branches/2.1.x-fixes/tools/eclipse-plugin/pom.xml
cxf/branches/2.1.x-fixes/tools/validator/pom.xml
cxf/branches/2.1.x-fixes/tools/wsdlto/core/pom.xml
cxf/branches/2.1.x-fixes/tools/wsdlto/misc/pom.xml
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 2 09:55:03 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Sep 2 09:55:03 2008
@@ -1 +1 @@
-/cxf/trunk:1-686342,686344-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,690638,691246,691271
+/cxf/trunk:1-686342,686344-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,690638,691246,691271,691295
Modified: cxf/branches/2.1.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/parent/pom.xml?rev=691318&r1=691317&r2=691318&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/parent/pom.xml Tue Sep 2 09:55:03 2008
@@ -773,14 +773,9 @@
<version>2.2.3</version>
</dependency>
<dependency>
- <groupId>velocity</groupId>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity-dep</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
Modified: cxf/branches/2.1.x-fixes/tools/common/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/common/pom.xml?rev=691318&r1=691317&r2=691318&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/common/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/tools/common/pom.xml Tue Sep 2 09:55:03 2008
@@ -49,7 +49,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>velocity</groupId>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
Modified: cxf/branches/2.1.x-fixes/tools/eclipse-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/eclipse-plugin/pom.xml?rev=691318&r1=691317&r2=691318&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/eclipse-plugin/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/tools/eclipse-plugin/pom.xml Tue Sep 2 09:55:03
2008
@@ -60,7 +60,7 @@
<artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
- <groupId>velocity</groupId>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</exclusion>
</exclusions>
@@ -116,14 +116,14 @@
<artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
- <groupId>velocity</groupId>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity-dep</artifactId>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
</dependency>
</dependencies>
Modified: cxf/branches/2.1.x-fixes/tools/validator/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/validator/pom.xml?rev=691318&r1=691317&r2=691318&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/validator/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/tools/validator/pom.xml Tue Sep 2 09:55:03 2008
@@ -54,7 +54,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>velocity</groupId>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
<dependency>
Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/core/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/core/pom.xml?rev=691318&r1=691317&r2=691318&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/core/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/core/pom.xml Tue Sep 2 09:55:03 2008
@@ -79,7 +79,7 @@
</dependency>
<dependency>
- <groupId>velocity</groupId>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
<dependency>
Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/misc/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/misc/pom.xml?rev=691318&r1=691317&r2=691318&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/misc/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/misc/pom.xml Tue Sep 2 09:55:03 2008
@@ -51,7 +51,7 @@
<dependency>
- <groupId>velocity</groupId>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
