You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2014/09/15 22:25:49 UTC

svn commit: r1625155 - in /commons/proper/configuration/trunk/src/main/assembly: bin.xml src.xml

Author: oheger
Date: Mon Sep 15 20:25:48 2014
New Revision: 1625155

URL: http://svn.apache.org/r1625155
Log:
Tweaked assembly descriptors.

Copied the files from the 1.10 release.

Modified:
    commons/proper/configuration/trunk/src/main/assembly/bin.xml
    commons/proper/configuration/trunk/src/main/assembly/src.xml

Modified: commons/proper/configuration/trunk/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/assembly/bin.xml?rev=1625155&r1=1625154&r2=1625155&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/assembly/bin.xml (original)
+++ commons/proper/configuration/trunk/src/main/assembly/bin.xml Mon Sep 15 20:25:48 2014
@@ -15,26 +15,31 @@
  limitations under the License.
 -->
 <assembly>
-    <id>bin</id>
-    <formats>
-        <format>tar.gz</format>
-        <format>zip</format>
-    </formats>
-    <includeSiteDirectory>true</includeSiteDirectory>
-    <fileSets>
-        <fileSet>
-            <includes>
-                <include>LICENSE.txt</include>
-                <include>NOTICE.txt</include>
-                <include>RELEASE-NOTES.txt</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>target</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-        </fileSet>
-    </fileSets>
+  <id>bin</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <baseDirectory>${artifactId}-${commons.release.version}</baseDirectory>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+        <include>RELEASE-NOTES*</include>
+        <include>pom.xml</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target/site/apidocs</directory>
+      <outputDirectory>apidocs</outputDirectory>
+    </fileSet>
+  </fileSets>
 </assembly>

Modified: commons/proper/configuration/trunk/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/assembly/src.xml?rev=1625155&r1=1625154&r2=1625155&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/assembly/src.xml (original)
+++ commons/proper/configuration/trunk/src/main/assembly/src.xml Mon Sep 15 20:25:48 2014
@@ -15,29 +15,26 @@
  limitations under the License.
 -->
 <assembly>
-    <id>src</id>
-    <formats>
-        <format>tar.gz</format>
-        <format>zip</format>
-    </formats>
-    <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory>
-    <fileSets>
-        <fileSet>
-            <includes>
-                <include>build.xml</include>
-                <include>maven-build.properties</include>
-                <include>maven-build.xml</include>
-                <include>LICENSE.txt</include>
-                <include>NOTICE.txt</include>
-                <include>pom.xml</include>
-                <include>RELEASE-NOTES.txt</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>conf</directory>
-        </fileSet>
-        <fileSet>
-            <directory>src</directory>
-        </fileSet>
-    </fileSets>
+  <id>src</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <baseDirectory>${artifactId}-${commons.release.version}-src</baseDirectory>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+        <include>RELEASE-NOTES*</include>
+        <include>pom.xml</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>conf</directory>
+    </fileSet>
+    <fileSet>
+      <directory>src</directory>
+    </fileSet>
+  </fileSets>
 </assembly>