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/08/09 09:23:54 UTC
svn commit: r1512190 - in /httpcomponents/httpclient/branches/4.2.x:
httpclient-cache/pom.xml httpclient/pom.xml httpmime/pom.xml pom.xml
Author: olegk
Date: Fri Aug 9 07:23:53 2013
New Revision: 1512190
URL: http://svn.apache.org/r1512190
Log:
Upgraded parent pom to version 7; removed assembly plugin; removed clover2 plugin
Modified:
httpcomponents/httpclient/branches/4.2.x/httpclient-cache/pom.xml
httpcomponents/httpclient/branches/4.2.x/httpclient/pom.xml
httpcomponents/httpclient/branches/4.2.x/httpmime/pom.xml
httpcomponents/httpclient/branches/4.2.x/pom.xml
Modified: httpcomponents/httpclient/branches/4.2.x/httpclient-cache/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.2.x/httpclient-cache/pom.xml?rev=1512190&r1=1512189&r2=1512190&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.2.x/httpclient-cache/pom.xml (original)
+++ httpcomponents/httpclient/branches/4.2.x/httpclient-cache/pom.xml Fri Aug 9 07:23:53 2013
@@ -122,24 +122,6 @@
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <configuration>
- <flushPolicy>threaded</flushPolicy>
- <flushInterval>100</flushInterval>
- <targetPercentage>50%</targetPercentage>
- </configuration>
- <executions>
- <execution>
- <id>site</id>
- <phase>pre-site</phase>
- <goals>
- <goal>instrument</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
<configuration>
@@ -175,15 +157,6 @@
</plugin>
<plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <version>${clover.version}</version>
- <configuration>
- <jdk>1.5</jdk>
- </configuration>
- </plugin>
-
- <plugin>
<artifactId>maven-jxr-plugin</artifactId>
<version>${hc.jxr.version}</version>
</plugin>
Modified: httpcomponents/httpclient/branches/4.2.x/httpclient/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.2.x/httpclient/pom.xml?rev=1512190&r1=1512189&r2=1512190&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.2.x/httpclient/pom.xml (original)
+++ httpcomponents/httpclient/branches/4.2.x/httpclient/pom.xml Fri Aug 9 07:23:53 2013
@@ -111,24 +111,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <configuration>
- <flushPolicy>threaded</flushPolicy>
- <flushInterval>100</flushInterval>
- <targetPercentage>50%</targetPercentage>
- </configuration>
- <executions>
- <execution>
- <id>site</id>
- <phase>pre-site</phase>
- <goals>
- <goal>instrument</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
@@ -157,22 +139,13 @@
</plugin>
<plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <version>${clover.version}</version>
- <configuration>
- <jdk>1.5</jdk>
- </configuration>
- </plugin>
-
- <plugin>
<artifactId>maven-jxr-plugin</artifactId>
- <version>${hc.jxr.version}</version>
+ <version>${hc.jxr.version}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>${hc.surefire-report.version}</version>
+ <version>${hc.surefire-report.version}</version>
</plugin>
</plugins>
Modified: httpcomponents/httpclient/branches/4.2.x/httpmime/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.2.x/httpmime/pom.xml?rev=1512190&r1=1512189&r2=1512190&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.2.x/httpmime/pom.xml (original)
+++ httpcomponents/httpclient/branches/4.2.x/httpmime/pom.xml Fri Aug 9 07:23:53 2013
@@ -93,24 +93,6 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <configuration>
- <flushPolicy>threaded</flushPolicy>
- <flushInterval>100</flushInterval>
- <targetPercentage>50%</targetPercentage>
- </configuration>
- <executions>
- <execution>
- <id>site</id>
- <phase>pre-site</phase>
- <goals>
- <goal>instrument</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
@@ -139,15 +121,6 @@
</plugin>
<plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <version>${clover.version}</version>
- <configuration>
- <jdk>1.5</jdk>
- </configuration>
- </plugin>
-
- <plugin>
<artifactId>maven-jxr-plugin</artifactId>
<version>${hc.jxr.version}</version>
</plugin>
Modified: httpcomponents/httpclient/branches/4.2.x/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.2.x/pom.xml?rev=1512190&r1=1512189&r2=1512190&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.2.x/pom.xml (original)
+++ httpcomponents/httpclient/branches/4.2.x/pom.xml Fri Aug 9 07:23:53 2013
@@ -28,7 +28,7 @@
<parent>
<artifactId>project</artifactId>
<groupId>org.apache.httpcomponents</groupId>
- <version>6</version>
+ <version>7</version>
<relativePath>../project/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -221,13 +221,6 @@
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
- <id>javadoc-aggregate</id>
- <goals>
- <goal>aggregate</goal>
- </goals>
- <phase>pre-site</phase>
- </execution>
- <execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
@@ -248,37 +241,6 @@
<artifactId>maven-site-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/osgi-bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <tasks>
- <ant antfile="src/main/assembly/build.xml">
- <property name="target" value="${project.build.directory}" />
- <property name="package.name" value="${project.artifactId}-${project.version}-bin" />
- </ant>
- <ant antfile="src/main/assembly/build.xml">
- <property name="target" value="${project.build.directory}" />
- <property name="package.name" value="${project.artifactId}-${project.version}-osgi-bin" />
- </ant>
- <ant antfile="src/main/assembly/build.xml">
- <property name="target" value="${project.build.directory}" />
- <property name="package.name" value="${project.artifactId}-${project.version}-src" />
- </ant>
- </tasks>
- </configuration>
- </plugin>
- <plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
<dependencies>
@@ -358,13 +320,6 @@
<comparisonVersion>${api.comparison.version}</comparisonVersion>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
</plugins>
</build>