You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by se...@apache.org on 2011/09/10 02:23:13 UTC
svn commit: r1167414 - /httpcomponents/project/pom.xml
Author: sebb
Date: Sat Sep 10 00:22:30 2011
New Revision: 1167414
URL: http://svn.apache.org/viewvc?rev=1167414&view=rev
Log:
Decouple parent pom version from child projects
Merge two versions of resources plugin config
Alphasort plugins
Modified:
httpcomponents/project/pom.xml
Modified: httpcomponents/project/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/project/pom.xml?rev=1167414&r1=1167413&r2=1167414&view=diff
==============================================================================
--- httpcomponents/project/pom.xml (original)
+++ httpcomponents/project/pom.xml Sat Sep 10 00:22:30 2011
@@ -33,7 +33,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>project</artifactId>
- <version>4.1.1</version>
+ <version>5-SNAPSHOT</version>
<packaging>pom</packaging>
<name>HttpComponents</name>
<url>http://hc.apache.org/</url>
@@ -369,6 +369,24 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/site/examples</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/examples</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -391,28 +409,6 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.7.1</version>
</plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4.3</version>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>pre-site</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/site/examples</outputDirectory>
- <resources>
- <resource>
- <directory>src/examples</directory>
- <filtering>false</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<!-- Other plugins, alpha order by groupId and artifactId -->
<plugin>
<groupId>com.agilejava.docbkx</groupId>
@@ -430,11 +426,6 @@
<version>2.3.4</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <version>2.2.3</version>
- </plugin>
- <plugin>
<artifactId>maven-notice-plugin</artifactId>
<groupId>org.apache.httpcomponents</groupId>
<version>0.0.2</version>
@@ -450,6 +441,11 @@
<projectTitle>Apache HttpComponents</projectTitle>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>2.2.3</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>