Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgraded parent pom to version 7; removed assembly plugin; removed clover profile 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1512192 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2013-08-09 07:24:29 +00:00
parent 2d17d461bb
commit 7005e49c57
6 changed files with 18 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fluent-hc/pom.xml
View File

@ -83,21 +83,6 @@
</includes> </includes>
</resource> </resource>
</resources> </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> </build>
<reporting> <reporting>
@ -127,12 +112,12 @@
<plugin> <plugin>
<artifactId>maven-jxr-plugin</artifactId> <artifactId>maven-jxr-plugin</artifactId>
<version>${hc.jxr.version}</version> <version>${hc.jxr.version}</version>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-surefire-report-plugin</artifactId> <artifactId>maven-surefire-report-plugin</artifactId>
<version>${hc.surefire-report.version}</version> <version>${hc.surefire-report.version}</version>
</plugin> </plugin>
</plugins> </plugins>

15
httpclient-cache/pom.xml
View File

@ -118,20 +118,9 @@
</execution> </execution>
</executions> </executions>
</plugin> </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> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -170,12 +159,12 @@
<plugin> <plugin>
<artifactId>maven-jxr-plugin</artifactId> <artifactId>maven-jxr-plugin</artifactId>
<version>${hc.jxr.version}</version> <version>${hc.jxr.version}</version>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-surefire-report-plugin</artifactId> <artifactId>maven-surefire-report-plugin</artifactId>
<version>${hc.surefire-report.version}</version> <version>${hc.surefire-report.version}</version>
</plugin> </plugin>
</plugins> </plugins>

26
httpclient-osgi/pom.xml
View File

@ -157,13 +157,6 @@
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId> <artifactId>clirr-maven-plugin</artifactId>
@ -175,23 +168,4 @@
<finalName>org.apache.httpcomponents.httpclient_${project.version}</finalName> <finalName>org.apache.httpcomponents.httpclient_${project.version}</finalName>
</build> </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> </project>

14
httpclient/pom.xml
View File

@ -98,16 +98,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </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> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<executions> <executions>
@ -147,12 +137,12 @@
<plugin> <plugin>
<artifactId>maven-jxr-plugin</artifactId> <artifactId>maven-jxr-plugin</artifactId>
<version>${hc.jxr.version}</version> <version>${hc.jxr.version}</version>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-surefire-report-plugin</artifactId> <artifactId>maven-surefire-report-plugin</artifactId>
<version>${hc.surefire-report.version}</version> <version>${hc.surefire-report.version}</version>
</plugin> </plugin>
</plugins> </plugins>

10
httpmime/pom.xml
View File

@ -91,16 +91,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </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> </plugins>
</build> </build>

105
pom.xml
View File

@ -28,7 +28,7 @@
<parent> <parent>
<artifactId>project</artifactId> <artifactId>project</artifactId>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<version>6</version> <version>7</version>
<relativePath>../project/pom.xml</relativePath> <relativePath>../project/pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -74,6 +74,7 @@
<junit.version>4.9</junit.version> <junit.version>4.9</junit.version>
<easymock.version>2.5.2</easymock.version> <easymock.version>2.5.2</easymock.version>
<mockito.version>1.8.5</mockito.version> <mockito.version>1.8.5</mockito.version>
<hc.stylecheck.version>1</hc.stylecheck.version>
<api.comparison.version>4.2</api.comparison.version> <api.comparison.version>4.2</api.comparison.version>
</properties> </properties>
@ -217,25 +218,18 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>javadoc-aggregate</id> <id>attach-javadocs</id>
<goals> <goals>
<goal>aggregate</goal> <goal>jar</goal>
</goals> </goals>
<phase>pre-site</phase> </execution>
</execution> </executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<configuration> <configuration>
<!-- reduce console output. Can override with -Dquiet=false --> <!-- reduce console output. Can override with -Dquiet=false -->
<quiet>true</quiet> <quiet>true</quiet>
<source>${maven.compile.source}</source> <source>${maven.compiler.source}</source>
<links> <links>
<link>http://download.oracle.com/javase/1.5.0/docs/api/</link> <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
<link>http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/</link> <link>http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/</link>
@ -245,37 +239,6 @@
<plugin> <plugin>
<artifactId>maven-site-plugin</artifactId> <artifactId>maven-site-plugin</artifactId>
</plugin> </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> <plugin>
<groupId>com.agilejava.docbkx</groupId> <groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId> <artifactId>docbkx-maven-plugin</artifactId>
@ -371,7 +334,7 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>hc-stylecheck</artifactId> <artifactId>hc-stylecheck</artifactId>
<version>1</version> <version>${hc.stylecheck.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<configuration> <configuration>
@ -458,48 +421,4 @@
</plugins> </plugins>
</reporting> </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> </project>