Removed 'binary with dependencies' assembly; added dependencies to 'bin' assembly
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1056083 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski
parent
4fd34899f0
commit
1192bf0854
5
pom.xml
5
pom.xml
|
|
@ -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>
|
||||
|
|
@ -147,10 +146,6 @@
|
|||
<property name="target" value="${project.build.directory}" />
|
||||
<property name="package.name" value="${project.artifactId}-${project.version}-bin" />
|
||||
</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" />
|
||||
|
|
|
|||
|
|
@ -1,111 +0,0 @@
|
|||
<!--
|
||||
$HeadURL: http://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk/src/main/assembly/bin-with-deps-unix.xml $
|
||||
$Revision: 687166 $
|
||||
$Date: 2008-08-19 23:40:27 +0200 (Tue, 19 Aug 2008) $
|
||||
|
||||
====================================================================
|
||||
Licensed to the Apache Software Foundation (ASF) under one
|
||||
or more contributor license agreements. See the NOTICE file
|
||||
distributed with this work for additional information
|
||||
regarding copyright ownership. The ASF licenses this file
|
||||
to you under the Apache License, Version 2.0 (the
|
||||
"License"); you may not use this file except in compliance
|
||||
with the License. You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing,
|
||||
software distributed under the License is distributed on an
|
||||
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
KIND, either express or implied. See the License for the
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
====================================================================
|
||||
|
||||
This software consists of voluntary contributions made by many
|
||||
individuals on behalf of the Apache Software Foundation. For more
|
||||
information on the Apache Software Foundation, please see
|
||||
<http://www.apache.org/>.
|
||||
-->
|
||||
<assembly>
|
||||
<id>bin-with-dependencies</id>
|
||||
<formats>
|
||||
<format>tar.gz</format>
|
||||
<format>zip</format>
|
||||
</formats>
|
||||
<moduleSets>
|
||||
<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>
|
||||
<directory></directory>
|
||||
<outputDirectory></outputDirectory>
|
||||
<includes>
|
||||
<include>README.txt</include>
|
||||
<include>LICENSE.txt</include>
|
||||
<include>NOTICE.txt</include>
|
||||
<include>RELEASE_NOTES.txt</include>
|
||||
<include>NTLM_SUPPORT.txt</include>
|
||||
</includes>
|
||||
</fileSet>
|
||||
<!-- Javadocs -->
|
||||
<fileSet>
|
||||
<directory>target/site/apidocs</directory>
|
||||
<outputDirectory>javadoc</outputDirectory>
|
||||
</fileSet>
|
||||
<!-- Tutorial (HTML) -->
|
||||
<fileSet>
|
||||
<directory>target/docbkx/html</directory>
|
||||
<outputDirectory>tutorial/html</outputDirectory>
|
||||
</fileSet>
|
||||
<fileSet>
|
||||
<directory>src/docbkx/resources/css</directory>
|
||||
<outputDirectory>tutorial/html/css</outputDirectory>
|
||||
</fileSet>
|
||||
<fileSet>
|
||||
<directory>src/docbkx/resources/images</directory>
|
||||
<outputDirectory>tutorial/html/images</outputDirectory>
|
||||
</fileSet>
|
||||
<!-- Base module -->
|
||||
<fileSet>
|
||||
<directory>httpclient/src/examples/</directory>
|
||||
<outputDirectory>examples</outputDirectory>
|
||||
<includes>
|
||||
<include>**/*.java</include>
|
||||
</includes>
|
||||
</fileSet>
|
||||
<!-- HttpMime module -->
|
||||
<fileSet>
|
||||
<directory>httpmime/src/examples/</directory>
|
||||
<outputDirectory>examples</outputDirectory>
|
||||
<includes>
|
||||
<include>**/*.java</include>
|
||||
</includes>
|
||||
</fileSet>
|
||||
</fileSets>
|
||||
<files>
|
||||
<!-- Tutorial (PDF) -->
|
||||
<file>
|
||||
<source>target/docbkx/pdf/index.pdf</source>
|
||||
<outputDirectory>tutorial/pdf</outputDirectory>
|
||||
<destName>httpclient-tutorial.pdf</destName>
|
||||
</file>
|
||||
</files>
|
||||
</assembly>
|
||||
|
|
@ -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 -->
|
||||
|
|
|
|||
Loading…
Reference in New Issue