hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1056083 - in /httpcomponents/httpclient/trunk: pom.xml src/main/assembly/bin-with-deps.xml src/main/assembly/bin.xml
Date Thu, 06 Jan 2011 21:17:19 GMT
Author: olegk
Date: Thu Jan  6 21:16:57 2011
New Revision: 1056083

URL: http://svn.apache.org/viewvc?rev=1056083&view=rev
Log:
Removed 'binary with dependencies' assembly; added dependencies to 'bin' assembly

Removed:
    httpcomponents/httpclient/trunk/src/main/assembly/bin-with-deps.xml
Modified:
    httpcomponents/httpclient/trunk/pom.xml
    httpcomponents/httpclient/trunk/src/main/assembly/bin.xml

Modified: httpcomponents/httpclient/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/pom.xml?rev=1056083&r1=1056082&r2=1056083&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/pom.xml (original)
+++ httpcomponents/httpclient/trunk/pom.xml Thu Jan  6 21:16:57 2011
@@ -132,7 +132,6 @@
           <descriptors>
             <descriptor>src/main/assembly/bin.xml</descriptor>
             <descriptor>src/main/assembly/osgi-bin.xml</descriptor>
-            <descriptor>src/main/assembly/bin-with-deps.xml</descriptor>
             <descriptor>src/main/assembly/src.xml</descriptor>
           </descriptors>
           <tarLongFileMode>gnu</tarLongFileMode>
@@ -149,10 +148,6 @@
             </ant>
             <ant antfile="src/main/assembly/build.xml">
               <property name="target" value="${project.build.directory}" />
-              <property name="package.name" value="${project.artifactId}-${project.version}-bin-with-dependencies"
/>
-            </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">

Modified: httpcomponents/httpclient/trunk/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/src/main/assembly/bin.xml?rev=1056083&r1=1056082&r2=1056083&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/src/main/assembly/bin.xml (original)
+++ httpcomponents/httpclient/trunk/src/main/assembly/bin.xml Thu Jan  6 21:16:57 2011
@@ -1,4 +1,4 @@
-<!-- 
+<!--
    $HeadURL: http://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk/src/main/assembly/bin-unix.xml
$
    $Revision: 687166 $
    $Date: 2008-08-19 23:40:27 +0200 (Tue, 19 Aug 2008) $
@@ -34,16 +34,24 @@
         <format>zip</format>
     </formats>
     <moduleSets>
-        <moduleSet>
-          <excludes>
-            <exclude>org.apache.httpcomponents:httpclient-osgi</exclude>
-          </excludes>
-          <binaries>
-            <includeDependencies>false</includeDependencies>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-          </binaries>
-        </moduleSet>
+      <moduleSet>
+        <excludes>
+          <exclude>org.apache.httpcomponents:httpclient-osgi</exclude>
+        </excludes>
+        <binaries>
+          <outputDirectory>lib</outputDirectory>
+          <unpack>false</unpack>
+          <dependencySets>
+            <dependencySet>
+              <excludes>
+                <exclude>net.sf.ehcache:*</exclude>
+                <exclude>spy:*</exclude>
+                <exclude>org.slf4j:*</exclude>
+              </excludes>
+            </dependencySet>
+          </dependencySets>
+        </binaries>
+      </moduleSet>
     </moduleSets>
     <fileSets>
         <fileSet>
@@ -54,7 +62,6 @@
             <include>LICENSE.txt</include>
             <include>NOTICE.txt</include>
             <include>RELEASE_NOTES.txt</include>
-            <include>NTLM_SUPPORT.txt</include>
           </includes>
         </fileSet>
         <!-- Javadocs -->



Mime
View raw message