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 2008/09/05 17:49:29 UTC
svn commit: r692468 - in /cxf/branches/2.1.x-fixes: ./ buildtools/pom.xml
parent/pom.xml
Author: dkulp
Date: Fri Sep 5 08:49:28 2008
New Revision: 692468
URL: http://svn.apache.org/viewvc?rev=692468&view=rev
Log:
Merged revisions 692466 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r692466 | dkulp | 2008-09-05 11:46:16 -0400 (Fri, 05 Sep 2008) | 2 lines
Update version of plexus-velocity stuff that the checkstyle plugin will use to remove an [ERROR] message off the build
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/buildtools/pom.xml
cxf/branches/2.1.x-fixes/parent/pom.xml
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 5 08:49:28 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,691295,691355,691488,691602,691646,691706,691728,692116,692157
+/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,691355,691488,691602,691646,691706,691728,692116,692157,692466
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/buildtools/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/buildtools/pom.xml?rev=692468&r1=692467&r2=692468&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/buildtools/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/buildtools/pom.xml Fri Sep 5 08:49:28 2008
@@ -37,13 +37,6 @@
</properties>
<dependencies>
-
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>20070324</version>
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
@@ -53,31 +46,31 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.4.1</version>
+ <version>1.4.4</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0.5</version>
+ <version>2.0.7</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>2.0.5</version>
+ <version>2.0.7</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0.5</version>
+ <version>2.0.7</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.0-alpha-15</version>
+ <version>1.1</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -86,43 +79,4 @@
<version>4.2</version>
</dependency>
</dependencies>
-
- <!--build>
- <plugins>
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-alpha-5</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-alpha-5</version>
- <configuration>
- <resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.1</resourceBundle>
- </resourceBundles>
- <properties>
- <addLicense>true</addLicense>
- <projectName>Apache CXF</projectName>
- </properties>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build-->
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/cxf/trunk/buildtools</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cxf/trunk/buildtools</developerConnection>
- </scm>
-
</project>
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=692468&r1=692467&r2=692468&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/parent/pom.xml Fri Sep 5 08:49:28 2008
@@ -181,6 +181,22 @@
<artifactId>cxf-buildtools</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-velocity</artifactId>
+ <version>1.1.3</version>
+ <exclusions>
+ <exclusion>
+ <!-- Use the version specified by checkstyle:checkstyle instead -->
+ <artifactId>commons-collections</artifactId>
+ <groupId>commons-collections</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>plexus-utils</artifactId>
+ <groupId>plexus</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<configuration>
<encoding>UTF-8</encoding>