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 2010/11/11 22:43:09 UTC
svn commit: r1034159 - in /httpcomponents/httpcore/trunk:
httpcore-ab/pom.xml httpcore-benchmark/pom.xml httpcore-contrib/pom.xml
httpcore-nio/pom.xml httpcore-osgi/pom.xml httpcore/pom.xml pom.xml
src/main/resources/
Author: olegk
Date: Thu Nov 11 21:43:09 2010
New Revision: 1034159
URL: http://svn.apache.org/viewvc?rev=1034159&view=rev
Log:
Updated pom files; use maven plugin to generate LiCENSE and NOTICE resources
Removed:
httpcomponents/httpcore/trunk/src/main/resources/
Modified:
httpcomponents/httpcore/trunk/httpcore-ab/pom.xml
httpcomponents/httpcore/trunk/httpcore-benchmark/pom.xml
httpcomponents/httpcore/trunk/httpcore-contrib/pom.xml
httpcomponents/httpcore/trunk/httpcore-nio/pom.xml
httpcomponents/httpcore/trunk/httpcore-osgi/pom.xml
httpcomponents/httpcore/trunk/httpcore/pom.xml
httpcomponents/httpcore/trunk/pom.xml
Modified: httpcomponents/httpcore/trunk/httpcore-ab/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/pom.xml?rev=1034159&r1=1034158&r2=1034159&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/pom.xml (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/pom.xml Thu Nov 11 21:43:09 2010
@@ -37,17 +37,9 @@
<description>
AB clone based on HttpCore
</description>
- <url>http://hc.apache.org/httpcomponents-core</url>
+ <url>http://hc.apache.org/httpcomponents-core-ga</url>
<packaging>jar</packaging>
- <licenses>
- <license>
- <name>Apache License</name>
- <url>../LICENSE.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Modified: httpcomponents/httpcore/trunk/httpcore-benchmark/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-benchmark/pom.xml?rev=1034159&r1=1034158&r2=1034159&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-benchmark/pom.xml (original)
+++ httpcomponents/httpcore/trunk/httpcore-benchmark/pom.xml Thu Nov 11 21:43:09 2010
@@ -40,14 +40,6 @@
<url>http://hc.apache.org/httpcomponents-core</url>
<packaging>jar</packaging>
- <licenses>
- <license>
- <name>Apache License</name>
- <url>../LICENSE.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Modified: httpcomponents/httpcore/trunk/httpcore-contrib/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-contrib/pom.xml?rev=1034159&r1=1034158&r2=1034159&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-contrib/pom.xml (original)
+++ httpcomponents/httpcore/trunk/httpcore-contrib/pom.xml Thu Nov 11 21:43:09 2010
@@ -37,17 +37,9 @@
<description>
HttpComponents HttpCore - Contributed Components
</description>
- <url>http://hc.apache.org/httpcomponents-core</url>
+ <url>http://hc.apache.org/httpcomponents-core-ga</url>
<packaging>jar</packaging>
- <licenses>
- <license>
- <name>Apache License</name>
- <url>../LICENSE.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Modified: httpcomponents/httpcore/trunk/httpcore-nio/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/pom.xml?rev=1034159&r1=1034158&r2=1034159&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/pom.xml (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/pom.xml Thu Nov 11 21:43:09 2010
@@ -36,19 +36,11 @@
<name>HttpCore NIO</name>
<inceptionYear>2005</inceptionYear>
<description>
- HttpComponents Core (NIO extensions)
+ HttpComponents Core (non-blocking I/O)
</description>
<url>http://hc.apache.org/httpcomponents-core/</url>
<packaging>jar</packaging>
- <licenses>
- <license>
- <name>Apache License</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -74,33 +66,11 @@
<resources>
<resource>
<directory>src/main/resources</directory>
- <filtering>false</filtering>
- <includes>
- <include>META-INF/*</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*.properties</include>
</includes>
</resource>
- <resource>
- <directory>..</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- <resource>
- <directory>../src/main/resources</directory>
- <targetPath>META-INF</targetPath>
- <filtering>true</filtering>
- <includes>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
</resources>
<plugins>
<plugin>
@@ -162,8 +132,8 @@
<configuration>
<source>1.5</source>
<links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://hc.apache.org/httpcomponents-core/httpcore/apidocs/</link>
+ <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
+ <link>http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/</link>
</links>
</configuration>
<reportSets>
@@ -176,19 +146,27 @@
</plugin>
<plugin>
- <artifactId>maven-jxr-plugin</artifactId>
+ <groupId>com.atlassian.maven.plugins</groupId>
+ <artifactId>maven-clover2-plugin</artifactId>
+ <configuration>
+ <jdk>1.5</jdk>
+ </configuration>
</plugin>
<plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <comparisonVersion>4.0</comparisonVersion>
+ </configuration>
</plugin>
<plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <configuration>
- <jdk>1.5</jdk>
- </configuration>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
</plugins>
Modified: httpcomponents/httpcore/trunk/httpcore-osgi/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-osgi/pom.xml?rev=1034159&r1=1034158&r2=1034159&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-osgi/pom.xml (original)
+++ httpcomponents/httpcore/trunk/httpcore-osgi/pom.xml Thu Nov 11 21:43:09 2010
@@ -38,17 +38,9 @@
<description>
HttpComponents Core (OSGi bundle)
</description>
- <url>http://hc.apache.org/httpcomponents-core/</url>
+ <url>http://hc.apache.org/httpcomponents-core-ga/</url>
<packaging>bundle</packaging>
- <licenses>
- <license>
- <name>Apache License</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Modified: httpcomponents/httpcore/trunk/httpcore/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/pom.xml?rev=1034159&r1=1034158&r2=1034159&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/pom.xml (original)
+++ httpcomponents/httpcore/trunk/httpcore/pom.xml Thu Nov 11 21:43:09 2010
@@ -36,19 +36,11 @@
<name>HttpCore</name>
<inceptionYear>2005</inceptionYear>
<description>
- HttpComponents Core (Java 1.3 compatible)
+ HttpComponents Core (blocking I/O)
</description>
- <url>http://hc.apache.org/httpcomponents-core/</url>
+ <url>http://hc.apache.org/httpcomponents-core-ga/</url>
<packaging>jar</packaging>
- <licenses>
- <license>
- <name>Apache License</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -75,33 +67,11 @@
<resources>
<resource>
<directory>src/main/resources</directory>
- <filtering>false</filtering>
- <includes>
- <include>META-INF/*</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*.properties</include>
</includes>
</resource>
- <resource>
- <directory>..</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- <resource>
- <directory>../src/main/resources</directory>
- <targetPath>META-INF</targetPath>
- <filtering>true</filtering>
- <includes>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
</resources>
<plugins>
<plugin>
@@ -170,7 +140,7 @@
<configuration>
<source>1.5</source>
<links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
</links>
</configuration>
<reportSets>
@@ -183,19 +153,27 @@
</plugin>
<plugin>
- <artifactId>maven-jxr-plugin</artifactId>
+ <groupId>com.atlassian.maven.plugins</groupId>
+ <artifactId>maven-clover2-plugin</artifactId>
+ <configuration>
+ <jdk>1.4</jdk>
+ </configuration>
</plugin>
<plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <comparisonVersion>4.0</comparisonVersion>
+ </configuration>
</plugin>
<plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <configuration>
- <jdk>1.4</jdk>
- </configuration>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
</plugins>
Modified: httpcomponents/httpcore/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/pom.xml?rev=1034159&r1=1034158&r2=1034159&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/pom.xml (original)
+++ httpcomponents/httpcore/trunk/pom.xml Thu Nov 11 21:43:09 2010
@@ -42,7 +42,7 @@
<packaging>pom</packaging>
<organization>
- <name>Apache Software Foundation</name>
+ <name>The Apache Software Foundation</name>
<url>http://www.apache.org/</url>
</organization>
@@ -91,6 +91,22 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-notice-plugin</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ <version>0.0.2-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>attach-notice-license</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <projectTitle>Apache HttpComponents</projectTitle>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
@@ -106,7 +122,7 @@
<configuration>
<source>1.5</source>
<links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
</links>
</configuration>
</plugin>
@@ -121,7 +137,6 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
@@ -154,7 +169,27 @@
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
- <configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.docbook</groupId>
+ <artifactId>docbook-xml</artifactId>
+ <version>4.4</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <includes>index.xml</includes>
+ <chunkedOutput>true</chunkedOutput>
+ <xincludeSupported>true</xincludeSupported>
+ <foCustomization>src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
+ <htmlCustomization>src/docbkx/resources/xsl/html_chunk.xsl</htmlCustomization>
+ <htmlStylesheet>css/hc-tutorial.css</htmlStylesheet>
+ <entities>
+ <entity>
+ <name>version</name>
+ <value>${project.version}</value>
+ </entity>
+ </entities>
<postProcess>
<copy todir="target/site/tutorial">
<fileset dir="target/docbkx">
@@ -174,6 +209,27 @@
</postProcess>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/site/examples</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/examples</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -195,14 +251,6 @@
</reportSets>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <configuration>
- <comparisonVersion>4.0</comparisonVersion>
- </configuration>
- </plugin>
-
</plugins>
</reporting>