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/05 15:28:48 UTC
svn commit: r1031582 - in /httpcomponents/httpclient/trunk: ./
httpclient-benchmark/pom.xml httpclient-cache/pom.xml
httpclient-contrib/pom.xml httpclient-osgi/pom.xml httpclient/pom.xml
httpmime/pom.xml pom.xml src/main/resources/
Author: olegk
Date: Fri Nov 5 14:28:48 2010
New Revision: 1031582
URL: http://svn.apache.org/viewvc?rev=1031582&view=rev
Log:
Generate LICENSE and NOTICE resources automatically using maven plugin; fixed javadoc links to external resources
Removed:
httpcomponents/httpclient/trunk/src/main/resources/
Modified:
httpcomponents/httpclient/trunk/ (props changed)
httpcomponents/httpclient/trunk/httpclient-benchmark/pom.xml
httpcomponents/httpclient/trunk/httpclient-cache/pom.xml
httpcomponents/httpclient/trunk/httpclient-contrib/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
Propchange: httpcomponents/httpclient/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 5 14:28:48 2010
@@ -1,2 +1,3 @@
/httpcomponents/httpclient/branches/4.0.x:950681-950688
/httpcomponents/httpclient/branches/branch_4_1:755593-811107
+/httpcomponents/httpclient/branches/notice-plugin-test:1024348-1031454
Modified: httpcomponents/httpclient/trunk/httpclient-benchmark/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-benchmark/pom.xml?rev=1031582&r1=1031581&r2=1031582&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-benchmark/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient-benchmark/pom.xml Fri Nov 5 14:28:48 2010
@@ -38,15 +38,7 @@
HttpComponents HttpClient - Benchmarks
</description>
<url>http://hc.apache.org/httpcomponents-client</url>
- <packaging>jar</packaging>
-
- <licenses>
- <license>
- <name>Apache License</name>
- <url>../LICENSE.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
@@ -126,7 +118,7 @@
<goal>java</goal>
</goals>
<configuration>
- <mainClass>org.apache.http.client.benchmark.Benchmark</mainClass>
+ <mainClass>org.apache.http.client.benchmark.Benchmark</mainClass>
</configuration>
</execution>
</executions>
Modified: httpcomponents/httpclient/trunk/httpclient-cache/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/pom.xml?rev=1031582&r1=1031581&r2=1031582&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/pom.xml Fri Nov 5 14:28:48 2010
@@ -40,13 +40,6 @@
<url>http://hc.apache.org/httpcomponents-client</url>
<packaging>jar</packaging>
- <licenses>
- <license>
- <name>Apache License</name>
- <url>../LICENSE.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
<repositories>
<repository>
<id>spy</id>
@@ -124,33 +117,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>
@@ -212,9 +183,9 @@
<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://hc.apache.org/httpcomponents-client/httpclient/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>
+ <link>http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/</link>
</links>
</configuration>
<reportSets>
Modified: httpcomponents/httpclient/trunk/httpclient-contrib/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-contrib/pom.xml?rev=1031582&r1=1031581&r2=1031582&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-contrib/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient-contrib/pom.xml Fri Nov 5 14:28:48 2010
@@ -38,15 +38,7 @@
HttpComponents HttpClient - Contributed Components
</description>
<url>http://hc.apache.org/httpcomponents-client</url>
- <packaging>jar</packaging>
-
- <licenses>
- <license>
- <name>Apache License</name>
- <url>../LICENSE.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
Modified: httpcomponents/httpclient/trunk/httpclient-osgi/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-osgi/pom.xml?rev=1031582&r1=1031581&r2=1031582&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-osgi/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient-osgi/pom.xml Fri Nov 5 14:28:48 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!--
====================================================================
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -39,7 +39,7 @@
HttpComponents Client (OSGi bundle)
</description>
<url>http://hc.apache.org/httpcomponents-client</url>
- <packaging>bundle</packaging>
+ <packaging>bundle</packaging>
<licenses>
<license>
@@ -81,33 +81,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>
Modified: httpcomponents/httpclient/trunk/httpclient/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/pom.xml?rev=1031582&r1=1031581&r2=1031582&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient/pom.xml Fri Nov 5 14:28:48 2010
@@ -38,15 +38,7 @@
HttpComponents Client (base module)
</description>
<url>http://hc.apache.org/httpcomponents-client</url>
- <packaging>jar</packaging>
-
- <licenses>
- <license>
- <name>Apache License</name>
- <url>../LICENSE.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
@@ -100,58 +92,12 @@
<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>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>false</filtering>
- <includes>
- <include>*</include>
- </includes>
- </testResource>
- <testResource>
- <directory>..</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE.txt</include>
- </includes>
- </testResource>
- <testResource>
- <directory>../src/main/resources</directory>
- <targetPath>META-INF</targetPath>
- <filtering>true</filtering>
- <includes>
- <include>NOTICE.txt</include>
- </includes>
- </testResource>
- </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -219,8 +165,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>
Modified: httpcomponents/httpclient/trunk/httpmime/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/pom.xml?rev=1031582&r1=1031581&r2=1031582&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpmime/pom.xml Fri Nov 5 14:28:48 2010
@@ -38,15 +38,7 @@
HttpComponents HttpClient - MIME coded entities
</description>
<url>http://hc.apache.org/httpcomponents-client</url>
- <packaging>jar</packaging>
-
- <licenses>
- <license>
- <name>Apache License</name>
- <url>../LICENSE.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
@@ -82,33 +74,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,8 +140,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>
Modified: httpcomponents/httpclient/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/pom.xml?rev=1031582&r1=1031581&r2=1031582&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/pom.xml (original)
+++ httpcomponents/httpclient/trunk/pom.xml Fri Nov 5 14:28:48 2010
@@ -87,6 +87,18 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-notice-plugin</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ <executions>
+ <execution>
+ <id>attach-notice-license</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
@@ -102,8 +114,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>
</plugin>
@@ -200,13 +212,13 @@
</goals>
<configuration>
<outputDirectory>${basedir}/target/site/examples</outputDirectory>
- <resources>
+ <resources>
<resource>
<directory>src/examples</directory>
<filtering>false</filtering>
</resource>
- </resources>
- </configuration>
+ </resources>
+ </configuration>
</execution>
</executions>
</plugin>