You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2013/06/16 20:41:19 UTC
svn commit: r1493568 - in /httpcomponents/project/trunk: .gitignore pom.xml
Author: olegk
Date: Sun Jun 16 18:41:18 2013
New Revision: 1493568
URL: http://svn.apache.org/r1493568
Log:
Cleanup of HC parent pom; added optional Clover profile; dropped Maven 2.x support
Added:
httpcomponents/project/trunk/.gitignore
Modified:
httpcomponents/project/trunk/pom.xml
Added: httpcomponents/project/trunk/.gitignore
URL: http://svn.apache.org/viewvc/httpcomponents/project/trunk/.gitignore?rev=1493568&view=auto
==============================================================================
--- httpcomponents/project/trunk/.gitignore (added)
+++ httpcomponents/project/trunk/.gitignore Sun Jun 16 18:41:18 2013
@@ -0,0 +1 @@
+target
Modified: httpcomponents/project/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/project/trunk/pom.xml?rev=1493568&r1=1493567&r2=1493568&view=diff
==============================================================================
--- httpcomponents/project/trunk/pom.xml (original)
+++ httpcomponents/project/trunk/pom.xml Sun Jun 16 18:41:18 2013
@@ -364,10 +364,6 @@ Felix bundle plugin updated: 2.3.5 -> 2.
</archive>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- </plugin>
</plugins>
<pluginManagement>
@@ -486,6 +482,14 @@ Felix bundle plugin updated: 2.3.5 -> 2.
<version>2.0</version>
</dependency>
</dependencies>
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -516,6 +520,14 @@ Felix bundle plugin updated: 2.3.5 -> 2.
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
<version>2.0.13</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.docbook</groupId>
+ <artifactId>docbook-xml</artifactId>
+ <version>4.4</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -613,35 +625,6 @@ Felix bundle plugin updated: 2.3.5 -> 2.
</profile>
<!--
- Configure site plugin to support both Maven2 and Maven3, see:
- http://maven.apache.org/plugins/maven-site-plugin/maven-3.html#Using_the_same_version_of_maven-site-plugin_for_both_Maven_2_and_Maven_3
- -->
- <profile>
- <id>maven-3</id>
- <activation>
- <file>
- <!-- The basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
- <exists>${basedir}</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-descriptor</id>
- <goals>
- <goal>attach-descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Automatically run the buildnumber plugin unless the buildNumber.skip property is defined as true
-->
<profile>