Updated release assemblies

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@722577 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2008-12-02 19:14:41 +00:00
parent a412fd3bc8
commit 3f6765dd6e
9 changed files with 167 additions and 328 deletions

43
pom.xml
View File

@ -98,6 +98,9 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
@ -112,16 +115,42 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/main/assembly/bin-unix.xml</descriptor>
<descriptor>src/main/assembly/bin-win.xml</descriptor>
<descriptor>src/main/assembly/bin-with-deps-unix.xml</descriptor>
<descriptor>src/main/assembly/bin-with-deps-win.xml</descriptor>
<descriptor>src/main/assembly/src-unix.xml</descriptor>
<descriptor>src/main/assembly/src-win.xml</descriptor>
<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>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<tasks>
<ant antfile="src/main/assembly/build.xml" target="fixzip">
<property name="target" value="${project.build.directory}" />
<property name="package.zip" value="${pom.artifactId}-${pom.version}-bin.zip" />
</ant>
<ant antfile="src/main/assembly/build.xml" target="fixzip">
<property name="target" value="${project.build.directory}" />
<property name="package.zip" value="${pom.artifactId}-${pom.version}-osgi-bin.zip" />
</ant>
<ant antfile="src/main/assembly/build.xml" target="fixzip">
<property name="target" value="${project.build.directory}" />
<property name="package.zip" value="${pom.artifactId}-${pom.version}-bin-with-dependencies.zip" />
</ant>
<ant antfile="src/main/assembly/build.xml" target="fixzip">
<property name="target" value="${project.build.directory}" />
<property name="package.zip" value="${pom.artifactId}-${pom.version}-src.zip" />
</ant>
<ant antfile="src/main/assembly/build.xml" target="fixtar">
<property name="target" value="${project.build.directory}" />
<property name="package.tar" value="${pom.artifactId}-${pom.version}-bin-with-dependencies.tar.gz" />
</ant>
</tasks>
</configuration>
</plugin>
<plugin>
<artifactId>maven-clover-plugin</artifactId>
<configuration>

View File

@ -1,80 +0,0 @@
<!--
$HeadURL$
$Revision$
$Date$
====================================================================
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-win</id>
<formats>
<format>zip</format>
</formats>
<moduleSets>
<moduleSet>
<binaries>
<outputDirectory>/lib</outputDirectory>
<unpack>false</unpack>
<includeDependencies>true</includeDependencies>
</binaries>
</moduleSet>
</moduleSets>
<fileSets>
<fileSet>
<directory></directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*.txt</include>
</includes>
<lineEnding>crlf</lineEnding>
</fileSet>
<!-- Base module -->
<fileSet>
<directory>module-client/target/site/apidocs</directory>
<outputDirectory>javadoc/httpclient</outputDirectory>
</fileSet>
<fileSet>
<directory>module-client/src/examples/</directory>
<outputDirectory>examples</outputDirectory>
<lineEnding>crlf</lineEnding>
<includes>
<include>**/*.java</include>
</includes>
</fileSet>
<!-- HttpMime module -->
<fileSet>
<directory>module-httpmime/target/site/apidocs</directory>
<outputDirectory>javadoc/httpmime</outputDirectory>
</fileSet>
<fileSet>
<directory>module-httpmime/src/examples/</directory>
<outputDirectory>examples</outputDirectory>
<lineEnding>crlf</lineEnding>
<includes>
<include>**/*.java</include>
</includes>
</fileSet>
</fileSets>
</assembly>

View File

@ -1,7 +1,7 @@
<!--
$HeadURL$
$Revision$
$Date$
$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
@ -28,16 +28,20 @@
<http://www.apache.org/>.
-->
<assembly>
<id>bin-with-dependencies-unix</id>
<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>
<includeDependencies>true</includeDependencies>
<outputDirectory>/lib</outputDirectory>
<unpack>false</unpack>
<includeDependencies>true</includeDependencies>
</binaries>
</moduleSet>
</moduleSets>
@ -46,32 +50,29 @@
<directory></directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*.txt</include>
<include>README.txt</include>
<include>LICENSE.txt</include>
<include>NOTICE.txt</include>
<include>RELEASE_NOTES.txt</include>
</includes>
<lineEnding>lf</lineEnding>
</fileSet>
<!-- Javadocs -->
<fileSet>
<directory>target/site/apidocs</directory>
<outputDirectory>javadoc</outputDirectory>
</fileSet>
<!-- Base module -->
<fileSet>
<directory>module-client/target/site/apidocs</directory>
<outputDirectory>javadoc/httpclient</outputDirectory>
</fileSet>
<fileSet>
<directory>module-client/src/examples/</directory>
<outputDirectory>examples</outputDirectory>
<lineEnding>lf</lineEnding>
<includes>
<include>**/*.java</include>
</includes>
</fileSet>
<!-- HttpMime module -->
<fileSet>
<directory>module-httpmime/target/site/apidocs</directory>
<outputDirectory>javadoc/httpmime</outputDirectory>
</fileSet>
<fileSet>
<directory>module-httpmime/src/examples/</directory>
<outputDirectory>examples</outputDirectory>
<lineEnding>lf</lineEnding>
<includes>
<include>**/*.java</include>
</includes>

View File

@ -1,7 +1,7 @@
<!--
$HeadURL$
$Revision$
$Date$
$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) $
====================================================================
Licensed to the Apache Software Foundation (ASF) under one
@ -28,16 +28,20 @@
<http://www.apache.org/>.
-->
<assembly>
<id>bin-unix</id>
<id>bin</id>
<formats>
<format>tar.gz</format>
<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>
<includeDependencies>false</includeDependencies>
</binaries>
</moduleSet>
</moduleSets>
@ -46,32 +50,29 @@
<directory></directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*.txt</include>
<include>README.txt</include>
<include>LICENSE.txt</include>
<include>NOTICE.txt</include>
<include>RELEASE_NOTES.txt</include>
</includes>
<lineEnding>lf</lineEnding>
</fileSet>
<!-- Javadocs -->
<fileSet>
<directory>target/site/apidocs</directory>
<outputDirectory>javadoc</outputDirectory>
</fileSet>
<!-- Base module -->
<fileSet>
<directory>module-client/target/site/apidocs</directory>
<outputDirectory>javadoc/httpclient</outputDirectory>
</fileSet>
<fileSet>
<directory>module-client/src/examples/</directory>
<outputDirectory>examples</outputDirectory>
<lineEnding>lf</lineEnding>
<includes>
<include>**/*.java</include>
</includes>
</fileSet>
<!-- HttpMime module -->
<fileSet>
<directory>module-httpmime/target/site/apidocs</directory>
<outputDirectory>javadoc/httpmime</outputDirectory>
</fileSet>
<fileSet>
<directory>module-httpmime/src/examples/</directory>
<outputDirectory>examples</outputDirectory>
<lineEnding>lf</lineEnding>
<includes>
<include>**/*.java</include>
</includes>

View File

@ -0,0 +1,20 @@
<project name="assembly-postprocess" default="fixzip" basedir=".">
<target name="fixzip">
<property name="tmp.dir" location="${target}/tmp"/>
<property name="zip.file" location="${target}/${package.zip}"/>
<delete dir="${tmp.dir}" />
<unzip src="${zip.file}" dest="${tmp.dir}"/>
<fixcrlf srcdir="${tmp.dir}" eol="dos" eof="remove"
includes="**/*.txt, **/*.xml, **/*.properties, **/*.java, **/*.html, **/*.css" />
<zip destfile="${zip.file}" basedir="${tmp.dir}" />
<delete dir="${tmp.dir}" />
</target>
<target name="fixtar">
<property name="tmp.dir" location="${target}/tmp"/>
<property name="tar.file" location="${target}/${package.tar}"/>
<delete dir="${tmp.dir}" />
<untar src="${tar.file}" dest="${tmp.dir}" compression="gzip" />
<tar destfile="${tar.file}" basedir="${tmp.dir}" compression="gzip" longfile="gnu" />
<delete dir="${tmp.dir}" />
</target>
</project>

View File

@ -1,7 +1,7 @@
<!--
$HeadURL$
$Revision$
$Date$
$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) $
====================================================================
Licensed to the Apache Software Foundation (ASF) under one
@ -28,50 +28,49 @@
<http://www.apache.org/>.
-->
<assembly>
<id>bin-win</id>
<id>osgi-bin</id>
<formats>
<format>tar.gz</format>
<format>zip</format>
</formats>
<moduleSets>
<moduleSet>
<binaries>
<outputDirectory>/lib</outputDirectory>
<unpack>false</unpack>
<includeDependencies>false</includeDependencies>
</binaries>
</moduleSet>
</moduleSets>
<fileSets>
<fileSet>
<directory>module-osgi-bundle/target</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
<excludes>
<exclude>*sources.jar</exclude>
</excludes>
</fileSet>
<fileSet>
<directory></directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*.txt</include>
<include>README.txt</include>
<include>LICENSE.txt</include>
<include>NOTICE.txt</include>
<include>RELEASE_NOTES.txt</include>
</includes>
<lineEnding>crlf</lineEnding>
</fileSet>
<!-- Javadocs -->
<fileSet>
<directory>target/site/apidocs</directory>
<outputDirectory>javadoc</outputDirectory>
</fileSet>
<!-- Base module -->
<fileSet>
<directory>module-client/target/site/apidocs</directory>
<outputDirectory>javadoc/httpclient</outputDirectory>
</fileSet>
<fileSet>
<directory>module-client/src/examples/</directory>
<outputDirectory>examples</outputDirectory>
<lineEnding>crlf</lineEnding>
<includes>
<include>**/*.java</include>
</includes>
</fileSet>
<!-- HttpMime module -->
<fileSet>
<directory>module-httpmime/target/site/apidocs</directory>
<outputDirectory>javadoc/httpmime</outputDirectory>
</fileSet>
<fileSet>
<directory>module-httpmime/src/examples/</directory>
<outputDirectory>examples</outputDirectory>
<lineEnding>crlf</lineEnding>
<includes>
<include>**/*.java</include>
</includes>

View File

@ -1,91 +0,0 @@
<!--
$HeadURL$
$Revision$
$Date$
====================================================================
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>src-unix</id>
<formats>
<format>tar.gz</format>
</formats>
<fileSets>
<!-- Release materials -->
<fileSet>
<directory></directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*.txt</include>
</includes>
<lineEnding>lf</lineEnding>
</fileSet>
<!-- Build files -->
<fileSet>
<directory></directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*.xml</include>
</includes>
<lineEnding>lf</lineEnding>
</fileSet>
<!-- Site and assembly descriptors -->
<fileSet>
<directory>src</directory>
<outputDirectory>src</outputDirectory>
<lineEnding>lf</lineEnding>
</fileSet>
<!-- Base module source and text resources -->
<fileSet>
<directory>module-client/src</directory>
<outputDirectory>module-client/src</outputDirectory>
<lineEnding>lf</lineEnding>
</fileSet>
<!-- Base module build files -->
<fileSet>
<directory>module-client</directory>
<outputDirectory>module-client</outputDirectory>
<lineEnding>lf</lineEnding>
<includes>
<include>*.xml</include>
</includes>
</fileSet>
<!-- HttpMime module source and text resources -->
<fileSet>
<directory>module-httpmime/src</directory>
<outputDirectory>module-httpmime/src</outputDirectory>
<lineEnding>lf</lineEnding>
</fileSet>
<!-- HttpMime module build files -->
<fileSet>
<directory>module-httpmime</directory>
<outputDirectory>module-httpmime</outputDirectory>
<lineEnding>lf</lineEnding>
<includes>
<include>*.xml</include>
</includes>
</fileSet>
</fileSets>
</assembly>

View File

@ -1,91 +0,0 @@
<!--
$HeadURL$
$Revision$
$Date$
====================================================================
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>src-win</id>
<formats>
<format>zip</format>
</formats>
<fileSets>
<!-- Release materials -->
<fileSet>
<directory></directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*.txt</include>
</includes>
<lineEnding>crlf</lineEnding>
</fileSet>
<!-- Build files -->
<fileSet>
<directory></directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*.xml</include>
</includes>
<lineEnding>crlf</lineEnding>
</fileSet>
<!-- Site and assembly descriptors -->
<fileSet>
<directory>src</directory>
<outputDirectory>src</outputDirectory>
<lineEnding>crlf</lineEnding>
</fileSet>
<!-- Base module source and text resources -->
<fileSet>
<directory>module-client/src</directory>
<outputDirectory>module-client/src</outputDirectory>
<lineEnding>crlf</lineEnding>
</fileSet>
<!-- Base module build files -->
<fileSet>
<directory>module-client</directory>
<outputDirectory>module-client</outputDirectory>
<lineEnding>crlf</lineEnding>
<includes>
<include>*.xml</include>
</includes>
</fileSet>
<!-- HttpMime module source and text resources -->
<fileSet>
<directory>module-httpmime/src</directory>
<outputDirectory>module-httpmime/src</outputDirectory>
<lineEnding>crlf</lineEnding>
</fileSet>
<!-- HttpMime module build files -->
<fileSet>
<directory>module-httpmime</directory>
<outputDirectory>module-httpmime</outputDirectory>
<lineEnding>crlf</lineEnding>
<includes>
<include>*.xml</include>
</includes>
</fileSet>
</fileSets>
</assembly>

51
src/main/assembly/src.xml Normal file
View File

@ -0,0 +1,51 @@
<!--
$HeadURL: http://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk/src/main/assembly/src-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>src</id>
<formats>
<format>tar.gz</format>
<format>zip</format>
</formats>
<fileSets>
<!-- Release materials -->
<fileSet>
<directory></directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>**/.*</exclude>
<exclude>**/.*/**</exclude>
<exclude>**/bin/**</exclude>
<exclude>**/target/**</exclude>
<exclude>**/local/**</exclude>
<exclude>**/lib/**</exclude>
</excludes>
</fileSet>
</fileSets>
</assembly>