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:24:30 UTC
svn commit: r1512192 - in /httpcomponents/httpclient/trunk:
fluent-hc/pom.xml httpclient-cache/pom.xml httpclient-osgi/pom.xml
httpclient/pom.xml httpmime/pom.xml pom.xml
Author: olegk
Date: Fri Aug 9 07:24:29 2013
New Revision: 1512192
URL: http://svn.apache.org/r1512192
Log:
Upgraded parent pom to version 7; removed assembly plugin; removed clover profile
Modified:
httpcomponents/httpclient/trunk/fluent-hc/pom.xml
httpcomponents/httpclient/trunk/httpclient-cache/pom.xml
httpcomponents/httpclient/trunk/httpclient-osgi/pom.xml
httpcomponents/httpclient/trunk/httpclient/pom.xml
httpcomponents/httpclient/trunk/httpmime/pom.xml
httpcomponents/httpclient/trunk/pom.xml
Modified: httpcomponents/httpclient/trunk/fluent-hc/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/pom.xml?rev=1512192&r1=1512191&r2=1512192&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/pom.xml (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/pom.xml Fri Aug 9 07:24:29 2013
@@ -83,21 +83,6 @@
</includes>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${maven.compile.source}</source>
- <target>${maven.compile.target}</target>
- <optimize>${maven.compile.optimize}</optimize>
- <showDeprecations>${maven.compile.deprecation}</showDeprecations>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- </plugins>
</build>
<reporting>
@@ -127,12 +112,12 @@
<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/trunk/httpclient-cache/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/pom.xml?rev=1512192&r1=1512191&r2=1512192&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/pom.xml Fri Aug 9 07:24:29 2013
@@ -119,19 +119,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${maven.compile.source}</source>
- <target>${maven.compile.target}</target>
- <optimize>${maven.compile.optimize}</optimize>
- <showDeprecations>${maven.compile.deprecation}</showDeprecations>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
<executions>
<execution>
<goals>
@@ -170,12 +159,12 @@
<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/trunk/httpclient-osgi/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/pom.xml?rev=1512192&r1=1512191&r2=1512192&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/pom.xml Fri Aug 9 07:24:29 2013
@@ -158,13 +158,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
<configuration>
@@ -175,23 +168,4 @@
<finalName>org.apache.httpcomponents.httpclient_${project.version}</finalName>
</build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <version>${hc.clirr.version}</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
</project>
Modified: httpcomponents/httpclient/trunk/httpclient/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/pom.xml?rev=1512192&r1=1512191&r2=1512192&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient/pom.xml Fri Aug 9 07:24:29 2013
@@ -99,16 +99,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${maven.compile.source}</source>
- <target>${maven.compile.target}</target>
- <optimize>${maven.compile.optimize}</optimize>
- <showDeprecations>${maven.compile.deprecation}</showDeprecations>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
@@ -147,12 +137,12 @@
<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/trunk/httpmime/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/pom.xml?rev=1512192&r1=1512191&r2=1512192&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpmime/pom.xml Fri Aug 9 07:24:29 2013
@@ -91,16 +91,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${maven.compile.source}</source>
- <target>${maven.compile.target}</target>
- <optimize>${maven.compile.optimize}</optimize>
- <showDeprecations>${maven.compile.deprecation}</showDeprecations>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: httpcomponents/httpclient/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/pom.xml?rev=1512192&r1=1512191&r2=1512192&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/pom.xml (original)
+++ httpcomponents/httpclient/trunk/pom.xml Fri Aug 9 07:24:29 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>
@@ -74,6 +74,7 @@
<junit.version>4.9</junit.version>
<easymock.version>2.5.2</easymock.version>
<mockito.version>1.8.5</mockito.version>
+ <hc.stylecheck.version>1</hc.stylecheck.version>
<api.comparison.version>4.2</api.comparison.version>
</properties>
@@ -217,25 +218,18 @@
</plugin>
<plugin>
<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>
- </goals>
- </execution>
- </executions>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<!-- reduce console output. Can override with -Dquiet=false -->
<quiet>true</quiet>
- <source>${maven.compile.source}</source>
+ <source>${maven.compiler.source}</source>
<links>
<link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
<link>http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/</link>
@@ -246,37 +240,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>
@@ -371,7 +334,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>hc-stylecheck</artifactId>
- <version>1</version>
+ <version>${hc.stylecheck.version}</version>
</dependency>
</dependencies>
<configuration>
@@ -458,48 +421,4 @@
</plugins>
</reporting>
- <profiles>
- <profile>
- <id>clover</id>
- <build>
- <plugins>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <version>3.1.10.1</version>
- <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>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <version>3.1.10.1</version>
- <configuration>
- <jdk>1.5</jdk>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- </profile>
-
- </profiles>
-
</project>