[prev in list] [next in list] [prev in thread] [next in thread]
List: httpcomponents-commits
Subject: svn commit: r1522908 - in /httpcomponents/httpasyncclient/trunk: httpasyncclient-cache/pom.xml httpa
From: olegk () apache ! org
Date: 2013-09-13 12:58:20
Message-ID: 20130913125821.2B0CF23888E7 () eris ! apache ! org
[Download RAW message or body]
Author: olegk
Date: Fri Sep 13 12:58:20 2013
New Revision: 1522908
URL: http://svn.apache.org/r1522908
Log:
Cleaned up POMs
Modified:
httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/pom.xml
httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/pom.xml
httpcomponents/httpasyncclient/trunk/httpasyncclient/pom.xml
httpcomponents/httpasyncclient/trunk/pom.xml
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/pom.xml?rev=1522908&r1=1522907&r2=1522908&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/pom.xml (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/pom.xml Fri Sep 13 \
12:58:20 2013 @@ -33,7 +33,7 @@
<version>4.0-beta5-SNAPSHOT</version>
</parent>
<artifactId>httpasyncclient-cache</artifactId>
- <name>HttpAsyncClient Cache</name>
+ <name>Apache HttpAsyncClient Cache</name>
<description>
HttpComponents AsyncClient Cache
</description>
@@ -81,25 +81,10 @@
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
- <include>**/*.properties</include>
+ <include>**/*.properties</include>
</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>
@@ -109,7 +94,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${hc.javadoc.version}</version>
<configuration>
- <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>
@@ -126,6 +111,21 @@
</plugin>
<plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>${hc.project-info.version}</version>
+ <inherited>false</inherited>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ <report>dependency-info</report>
+ <report>summary</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+
+ <plugin>
<artifactId>maven-jxr-plugin</artifactId>
<version>${hc.jxr.version}</version>
</plugin>
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/pom.xml?rev=1522908&r1=1522907&r2=1522908&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/pom.xml (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient-osgi/pom.xml Fri Sep 13 \
12:58:20 2013 @@ -120,13 +120,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>
@@ -137,22 +130,32 @@
<finalName>org.apache.httpcomponents.httpasyncclient_${project.version}</finalName>
</build>
- <reports>
+ <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>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>${hc.project-info.version}</version>
+ <inherited>false</inherited>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ <report>dependency-info</report>
+ <report>summary</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+
</plugins>
- </reports>
+ </reporting>
+
</project>
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/pom.xml?rev=1522908&r1=1522907&r2=1522908&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/pom.xml (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/pom.xml Fri Sep 13 12:58:20 \
2013 @@ -33,9 +33,9 @@
<version>4.0-beta5-SNAPSHOT</version>
</parent>
<artifactId>httpasyncclient</artifactId>
- <name>HttpAsyncClient</name>
+ <name>Apache HttpAsyncClient</name>
<description>
- HttpComponents AsyncClient (base module)
+ HttpComponents AsyncClient
</description>
<url>http://hc.apache.org/httpcomponents-asyncclient</url>
<packaging>jar</packaging>
@@ -90,16 +90,6 @@
</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>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
@@ -128,7 +118,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${hc.javadoc.version}</version>
<configuration>
- <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>
@@ -145,6 +135,21 @@
</plugin>
<plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>${hc.project-info.version}</version>
+ <inherited>false</inherited>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ <report>dependency-info</report>
+ <report>summary</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+
+ <plugin>
<artifactId>maven-jxr-plugin</artifactId>
<version>${hc.jxr.version}</version>
</plugin>
Modified: httpcomponents/httpasyncclient/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/pom.xml?rev=1522908&r1=1522907&r2=1522908&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/pom.xml (original)
+++ httpcomponents/httpasyncclient/trunk/pom.xml Fri Sep 13 12:58:20 2013
@@ -33,7 +33,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>httpcomponents-asyncclient</artifactId>
- <name>HttpComponents AsyncClient</name>
+ <name>Apache HttpComponents AsyncClient</name>
<version>4.0-beta5-SNAPSHOT</version>
<description>Components to build asynchronous client side HTTP \
services</description> <url>http://hc.apache.org/httpcomponents-asyncclient</url>
@@ -73,6 +73,7 @@
<junit.version>4.8.1</junit.version>
<easymock.version>2.5.2</easymock.version>
<mockito.version>1.8.5</mockito.version>
+ <hc.stylecheck.version>1</hc.stylecheck.version>
</properties>
<dependencyManagement>
@@ -196,11 +197,11 @@
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <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-dev/httpcore/apidocs/</link>
- <link>http://hc.apache.org/httpcomponents-client-dev/httpclient/apidocs/</link>
+ <link>http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/</link>
+ <link>http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/</link>
</links>
</configuration>
</plugin>
@@ -208,37 +209,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>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
@@ -261,19 +231,13 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.9.1</version>
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>hc-stylecheck</artifactId>
- <version>1</version>
+ <version>${hc.stylecheck.version}</version>
</dependency>
</dependencies>
<configuration>
@@ -333,66 +297,24 @@
<reporting>
<plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${hc.project-info.version}</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>dependencies</report>
- <report>project-team</report>
- <report>issue-tracking</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>${hc.project-info.version}</version>
+ <inherited>false</inherited>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependency-management</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>scm</report>
+ <report>summary</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
</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>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic