Author: dkulp
Date: Fri Sep 5 08:46:16 2008
New Revision: 692466
URL: http://svn.apache.org/viewvc?rev=692466&view=rev
Log:
Update version of plexus-velocity stuff that the checkstyle plugin will use to
remove an [ERROR] message off the build
Modified:
cxf/trunk/buildtools/pom.xml
cxf/trunk/parent/pom.xml
Modified: cxf/trunk/buildtools/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/buildtools/pom.xml?rev=692466&r1=692465&r2=692466&view=diff
==============================================================================
--- cxf/trunk/buildtools/pom.xml (original)
+++ cxf/trunk/buildtools/pom.xml Fri Sep 5 08:46:16 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/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=692466&r1=692465&r2=692466&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Fri Sep 5 08:46:16 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>
