You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2015/05/24 22:46:27 UTC

svn commit: r1681525 - in /webservices/axiom/trunk: distribution/pom.xml distribution/src/main/assembly/source-release.xml pom.xml

Author: veithen
Date: Sun May 24 20:46:27 2015
New Revision: 1681525

URL: http://svn.apache.org/r1681525
Log:
Let the distribution module (instead of the root project) build the source release together with the binary release.

Added:
    webservices/axiom/trunk/distribution/src/main/assembly/source-release.xml
      - copied, changed from r1681524, maven/resources/tags/apache-source-release-assembly-descriptor-1.0.5/src/main/resources/assemblies/source-shared.xml
Modified:
    webservices/axiom/trunk/distribution/pom.xml
    webservices/axiom/trunk/pom.xml

Modified: webservices/axiom/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/distribution/pom.xml?rev=1681525&r1=1681524&r2=1681525&view=diff
==============================================================================
--- webservices/axiom/trunk/distribution/pom.xml (original)
+++ webservices/axiom/trunk/distribution/pom.xml Sun May 24 20:46:27 2015
@@ -121,6 +121,7 @@
                         <configuration>
                             <descriptors>
                                 <descriptor>src/main/assembly/bin.xml</descriptor>
+                                <descriptor>src/main/assembly/source-release.xml</descriptor>
                             </descriptors>
                             <tarLongFileMode>gnu</tarLongFileMode>
                         </configuration>

Copied: webservices/axiom/trunk/distribution/src/main/assembly/source-release.xml (from r1681524, maven/resources/tags/apache-source-release-assembly-descriptor-1.0.5/src/main/resources/assemblies/source-shared.xml)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/distribution/src/main/assembly/source-release.xml?p2=webservices/axiom/trunk/distribution/src/main/assembly/source-release.xml&p1=maven/resources/tags/apache-source-release-assembly-descriptor-1.0.5/src/main/resources/assemblies/source-shared.xml&r1=1681524&r2=1681525&rev=1681525&view=diff
==============================================================================
--- maven/resources/tags/apache-source-release-assembly-descriptor-1.0.5/src/main/resources/assemblies/source-shared.xml (original)
+++ webservices/axiom/trunk/distribution/src/main/assembly/source-release.xml Sun May 24 20:46:27 2015
@@ -18,11 +18,16 @@
   under the License.
 -->
 
-<component>
+<assembly>
+  <id>source-release</id>
+  <baseDirectory>axiom-${project.version}</baseDirectory>
+  <formats>
+    <format>zip</format>
+  </formats>
   <fileSets>
     <!-- main project directory structure -->
     <fileSet>
-      <directory>.</directory>
+      <directory>..</directory>
       <outputDirectory>/</outputDirectory>
       <useDefaultExcludes>true</useDefaultExcludes>
       <excludes>
@@ -69,4 +74,4 @@
       <outputDirectory>/</outputDirectory>
     </fileSet>
   </fileSets>
-</component>
+</assembly>

Modified: webservices/axiom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1681525&r1=1681524&r2=1681525&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Sun May 24 20:46:27 2015
@@ -901,6 +901,18 @@
                         </configuration>
                     </plugin>
                     <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <!-- The source release is built by the distribution module -->
+                                <id>source-release-assembly</id>
+                                <configuration>
+                                    <skipAssembly>true</skipAssembly>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
                         <groupId>org.apache.rat</groupId>
                         <artifactId>apache-rat-plugin</artifactId>
                         <executions>