From ebb54d79b99c1a2c2b88c279aaa5af3f57d4225c Mon Sep 17 00:00:00 2001
From: Oleg Kalnichevski <olegk@apache.org>
Date: Thu, 2 Sep 2010 19:14:13 +0000
Subject: [PATCH] Added NOTICE and LICENSE resources to test and osgi jars

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@992065 13f79535-47bb-0310-9956-ffa450edef68
---
 httpclient-osgi/pom.xml | 31 +++++++++++++++++++++++++++++++
 httpclient/pom.xml      | 24 ++++++++++++++++++++++++
 pom.xml                 |  6 ------
 3 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/httpclient-osgi/pom.xml b/httpclient-osgi/pom.xml
index 82c86d703..7288b1820 100644
--- a/httpclient-osgi/pom.xml
+++ b/httpclient-osgi/pom.xml
@@ -78,6 +78,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>
diff --git a/httpclient/pom.xml b/httpclient/pom.xml
index 8f1b003a4..477d0a1bc 100644
--- a/httpclient/pom.xml
+++ b/httpclient/pom.xml
@@ -128,6 +128,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>
diff --git a/pom.xml b/pom.xml
index 63f230a1c..db09d214d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,12 +110,6 @@
       <plugin>
         <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>