You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2008/09/09 23:09:34 UTC
svn commit: r693611 - in /httpcomponents/httpcore/trunk: ./
src/main/assembly/
Author: olegk
Date: Tue Sep 9 14:09:34 2008
New Revision: 693611
URL: http://svn.apache.org/viewvc?rev=693611&view=rev
Log:
Improved assembly descriptors
Added:
httpcomponents/httpcore/trunk/src/main/assembly/bin.xml (with props)
httpcomponents/httpcore/trunk/src/main/assembly/osgi-bin.xml (with props)
httpcomponents/httpcore/trunk/src/main/assembly/src.xml (with props)
Removed:
httpcomponents/httpcore/trunk/src/main/assembly/bin-unix.xml
httpcomponents/httpcore/trunk/src/main/assembly/bin-win.xml
httpcomponents/httpcore/trunk/src/main/assembly/src-unix.xml
httpcomponents/httpcore/trunk/src/main/assembly/src-win.xml
Modified:
httpcomponents/httpcore/trunk/pom.xml
Modified: httpcomponents/httpcore/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/pom.xml?rev=693611&r1=693610&r2=693611&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/pom.xml (original)
+++ httpcomponents/httpcore/trunk/pom.xml Tue Sep 9 14:09:34 2008
@@ -90,6 +90,9 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
@@ -102,14 +105,14 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2-beta-2</version>
<configuration>
<descriptors>
- <descriptor>src/main/assembly/bin-unix.xml</descriptor>
- <descriptor>src/main/assembly/bin-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/src.xml</descriptor>
</descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</plugin>
Added: httpcomponents/httpcore/trunk/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/src/main/assembly/bin.xml?rev=693611&view=auto
==============================================================================
--- httpcomponents/httpcore/trunk/src/main/assembly/bin.xml (added)
+++ httpcomponents/httpcore/trunk/src/main/assembly/bin.xml Tue Sep 9 14:09:34 2008
@@ -0,0 +1,81 @@
+<!--
+ $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</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <moduleSets>
+ <moduleSet>
+ <excludes>
+ <exclude>org.apache.httpcomponents:httpcore-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>
+ <!-- Examples: base module -->
+ <fileSet>
+ <directory>module-main/src/examples/</directory>
+ <outputDirectory>examples</outputDirectory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ <!-- Examples: NIO module -->
+ <fileSet>
+ <directory>module-nio/src/examples/</directory>
+ <outputDirectory>examples</outputDirectory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: httpcomponents/httpcore/trunk/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: httpcomponents/httpcore/trunk/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: httpcomponents/httpcore/trunk/src/main/assembly/osgi-bin.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/src/main/assembly/osgi-bin.xml?rev=693611&view=auto
==============================================================================
--- httpcomponents/httpcore/trunk/src/main/assembly/osgi-bin.xml (added)
+++ httpcomponents/httpcore/trunk/src/main/assembly/osgi-bin.xml Tue Sep 9 14:09:34 2008
@@ -0,0 +1,79 @@
+<!--
+ $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>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>
+ <!-- Examples: base module -->
+ <fileSet>
+ <directory>module-main/src/examples/</directory>
+ <outputDirectory>examples</outputDirectory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ <!-- Examples: NIO module -->
+ <fileSet>
+ <directory>module-nio/src/examples/</directory>
+ <outputDirectory>examples</outputDirectory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: httpcomponents/httpcore/trunk/src/main/assembly/osgi-bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/src/main/assembly/osgi-bin.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: httpcomponents/httpcore/trunk/src/main/assembly/osgi-bin.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: httpcomponents/httpcore/trunk/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/src/main/assembly/src.xml?rev=693611&view=auto
==============================================================================
--- httpcomponents/httpcore/trunk/src/main/assembly/src.xml (added)
+++ httpcomponents/httpcore/trunk/src/main/assembly/src.xml Tue Sep 9 14:09:34 2008
@@ -0,0 +1,50 @@
+<!--
+ $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</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <!-- Release materials -->
+ <fileSet>
+ <directory></directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>**/.*</exclude>
+ <exclude>**/bin/**</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/local/**</exclude>
+ <exclude>**/lib/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: httpcomponents/httpcore/trunk/src/main/assembly/src.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/src/main/assembly/src.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: httpcomponents/httpcore/trunk/src/main/assembly/src.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml