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/09/02 21:12:57 UTC
svn commit: r992063 - in /httpcomponents/httpclient/branches/4.0.x:
httpclient-osgi/pom.xml httpclient/pom.xml pom.xml
Author: olegk
Date: Thu Sep 2 19:12:57 2010
New Revision: 992063
URL: http://svn.apache.org/viewvc?rev=992063&view=rev
Log:
Added NOTICE and LICENSE resources to test and osgi jars
Modified:
httpcomponents/httpclient/branches/4.0.x/httpclient-osgi/pom.xml
httpcomponents/httpclient/branches/4.0.x/httpclient/pom.xml
httpcomponents/httpclient/branches/4.0.x/pom.xml
Modified: httpcomponents/httpclient/branches/4.0.x/httpclient-osgi/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.0.x/httpclient-osgi/pom.xml?rev=992063&r1=992062&r2=992063&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.0.x/httpclient-osgi/pom.xml (original)
+++ httpcomponents/httpclient/branches/4.0.x/httpclient-osgi/pom.xml Thu Sep 2 19:12:57 2010
@@ -80,6 +80,37 @@
</properties>
<build>
+ <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>
<groupId>org.apache.felix</groupId>
Modified: httpcomponents/httpclient/branches/4.0.x/httpclient/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.0.x/httpclient/pom.xml?rev=992063&r1=992062&r2=992063&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.0.x/httpclient/pom.xml (original)
+++ httpcomponents/httpclient/branches/4.0.x/httpclient/pom.xml Thu Sep 2 19:12:57 2010
@@ -113,6 +113,30 @@
</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>
Modified: httpcomponents/httpclient/branches/4.0.x/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.0.x/pom.xml?rev=992063&r1=992062&r2=992063&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.0.x/pom.xml (original)
+++ httpcomponents/httpclient/branches/4.0.x/pom.xml Thu Sep 2 19:12:57 2010
@@ -109,12 +109,6 @@
<artifactId>maven-site-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.apache.org/repos/asf/httpcomponents/httpclient/tags/</tagBase>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>