hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r722577 - in /httpcomponents/httpclient/trunk: ./ src/main/assembly/
Date Tue, 02 Dec 2008 19:14:42 GMT
Author: olegk
Date: Tue Dec  2 11:14:41 2008
New Revision: 722577

URL: http://svn.apache.org/viewvc?rev=722577&view=rev
Log:
Updated release assemblies

Added:
    httpcomponents/httpclient/trunk/src/main/assembly/bin-with-deps.xml
    httpcomponents/httpclient/trunk/src/main/assembly/bin.xml
    httpcomponents/httpclient/trunk/src/main/assembly/build.xml
    httpcomponents/httpclient/trunk/src/main/assembly/osgi-bin.xml
    httpcomponents/httpclient/trunk/src/main/assembly/src.xml
Removed:
    httpcomponents/httpclient/trunk/src/main/assembly/bin-unix.xml
    httpcomponents/httpclient/trunk/src/main/assembly/bin-win.xml
    httpcomponents/httpclient/trunk/src/main/assembly/bin-with-deps-unix.xml
    httpcomponents/httpclient/trunk/src/main/assembly/bin-with-deps-win.xml
    httpcomponents/httpclient/trunk/src/main/assembly/src-unix.xml
    httpcomponents/httpclient/trunk/src/main/assembly/src-win.xml
Modified:
    httpcomponents/httpclient/trunk/pom.xml

Modified: httpcomponents/httpclient/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/pom.xml?rev=722577&r1=722576&r2=722577&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/pom.xml (original)
+++ httpcomponents/httpclient/trunk/pom.xml Tue Dec  2 11:14:41 2008
@@ -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>

Added: httpcomponents/httpclient/trunk/src/main/assembly/bin-with-deps.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/src/main/assembly/bin-with-deps.xml?rev=722577&view=auto
==============================================================================
--- httpcomponents/httpclient/trunk/src/main/assembly/bin-with-deps.xml (added)
+++ httpcomponents/httpclient/trunk/src/main/assembly/bin-with-deps.xml Tue Dec  2 11:14:41
2008
@@ -0,0 +1,81 @@
+<!-- 
+   $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>
+            <includeDependencies>true</includeDependencies>
+            <outputDirectory>/lib</outputDirectory>
+            <unpack>false</unpack>
+          </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>
+          </includes>
+        </fileSet>
+        <!-- Javadocs -->
+        <fileSet>
+          <directory>target/site/apidocs</directory>
+          <outputDirectory>javadoc</outputDirectory>
+        </fileSet>
+        <!-- Base module -->
+        <fileSet>
+          <directory>module-client/src/examples/</directory>
+          <outputDirectory>examples</outputDirectory>
+          <includes>
+            <include>**/*.java</include>
+          </includes>
+        </fileSet>
+        <!-- HttpMime module -->
+        <fileSet>
+          <directory>module-httpmime/src/examples/</directory>
+          <outputDirectory>examples</outputDirectory>
+          <includes>
+            <include>**/*.java</include>
+          </includes>
+        </fileSet>
+    </fileSets>
+</assembly>

Added: httpcomponents/httpclient/trunk/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/src/main/assembly/bin.xml?rev=722577&view=auto
==============================================================================
--- httpcomponents/httpclient/trunk/src/main/assembly/bin.xml (added)
+++ httpcomponents/httpclient/trunk/src/main/assembly/bin.xml Tue Dec  2 11:14:41 2008
@@ -0,0 +1,81 @@
+<!-- 
+   $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
+   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</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>
+          </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>
+          </includes>
+        </fileSet>
+        <!-- Javadocs -->
+        <fileSet>
+          <directory>target/site/apidocs</directory>
+          <outputDirectory>javadoc</outputDirectory>
+        </fileSet>
+        <!-- Base module -->
+        <fileSet>
+          <directory>module-client/src/examples/</directory>
+          <outputDirectory>examples</outputDirectory>
+          <includes>
+            <include>**/*.java</include>
+          </includes>
+        </fileSet>
+        <!-- HttpMime module -->
+        <fileSet>
+          <directory>module-httpmime/src/examples/</directory>
+          <outputDirectory>examples</outputDirectory>
+          <includes>
+            <include>**/*.java</include>
+          </includes>
+        </fileSet>
+    </fileSets>
+</assembly>

Added: httpcomponents/httpclient/trunk/src/main/assembly/build.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/src/main/assembly/build.xml?rev=722577&view=auto
==============================================================================
--- httpcomponents/httpclient/trunk/src/main/assembly/build.xml (added)
+++ httpcomponents/httpclient/trunk/src/main/assembly/build.xml Tue Dec  2 11:14:41 2008
@@ -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>

Added: httpcomponents/httpclient/trunk/src/main/assembly/osgi-bin.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/src/main/assembly/osgi-bin.xml?rev=722577&view=auto
==============================================================================
--- httpcomponents/httpclient/trunk/src/main/assembly/osgi-bin.xml (added)
+++ httpcomponents/httpclient/trunk/src/main/assembly/osgi-bin.xml Tue Dec  2 11:14:41 2008
@@ -0,0 +1,79 @@
+<!-- 
+   $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
+   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>osgi-bin</id>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+    <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>README.txt</include>
+            <include>LICENSE.txt</include>
+            <include>NOTICE.txt</include>
+            <include>RELEASE_NOTES.txt</include>
+          </includes>
+        </fileSet>
+        <!-- Javadocs -->
+        <fileSet>
+          <directory>target/site/apidocs</directory>
+          <outputDirectory>javadoc</outputDirectory>
+        </fileSet>
+        <!-- Base module -->
+        <fileSet>
+          <directory>module-client/src/examples/</directory>
+          <outputDirectory>examples</outputDirectory>
+          <includes>
+            <include>**/*.java</include>
+          </includes>
+        </fileSet>
+        <!-- HttpMime module -->
+        <fileSet>
+          <directory>module-httpmime/src/examples/</directory>
+          <outputDirectory>examples</outputDirectory>
+          <includes>
+            <include>**/*.java</include>
+          </includes>
+        </fileSet>
+    </fileSets>
+</assembly>

Added: httpcomponents/httpclient/trunk/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/src/main/assembly/src.xml?rev=722577&view=auto
==============================================================================
--- httpcomponents/httpclient/trunk/src/main/assembly/src.xml (added)
+++ httpcomponents/httpclient/trunk/src/main/assembly/src.xml Tue Dec  2 11:14:41 2008
@@ -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>



Mime
View raw message