commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r1031287 - in /commons/proper/vfs/trunk: dist/pom.xml dist/src/assembly/src.xml pom.xml
Date Thu, 04 Nov 2010 22:03:30 GMT
Author: rgoers
Date: Thu Nov  4 22:03:29 2010
New Revision: 1031287

URL: http://svn.apache.org/viewvc?rev=1031287&view=rev
Log:
Build source in distribution project

Modified:
    commons/proper/vfs/trunk/dist/pom.xml
    commons/proper/vfs/trunk/dist/src/assembly/src.xml
    commons/proper/vfs/trunk/pom.xml

Modified: commons/proper/vfs/trunk/dist/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/dist/pom.xml?rev=1031287&r1=1031286&r2=1031287&view=diff
==============================================================================
--- commons/proper/vfs/trunk/dist/pom.xml (original)
+++ commons/proper/vfs/trunk/dist/pom.xml Thu Nov  4 22:03:29 2010
@@ -122,6 +122,26 @@ limitations under the License.
           <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
             <executions>
+              <!-- As the main Apache pom only builds source zip archives but
+                   commons wants both zip and tar.gz and because this is configured
+                   in the assembly, we need to use a specific assembly. That also allows
+                   naming the final artifact as -src not -source-release.
+              -->
+              <execution>
+                <id>vfs-source-release-assembly</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                    <finalName>commons-vfs-${project.version}</finalName>
+                  <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                  <descriptors>
+                      <descriptor>src/assembly/src.xml</descriptor>
+                  </descriptors>
+                  <tarLongFileMode>gnu</tarLongFileMode>
+                </configuration>
+              </execution>
               <execution>
                 <id>binary</id>
                 <configuration>

Modified: commons/proper/vfs/trunk/dist/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/dist/src/assembly/src.xml?rev=1031287&r1=1031286&r2=1031287&view=diff
==============================================================================
--- commons/proper/vfs/trunk/dist/src/assembly/src.xml (original)
+++ commons/proper/vfs/trunk/dist/src/assembly/src.xml Thu Nov  4 22:03:29 2010
@@ -27,25 +27,25 @@
   <fileSets>
     <!-- main project directory structure -->
     <fileSet>
-      <directory>.</directory>
+      <directory>..</directory>
       <outputDirectory>/</outputDirectory>
       <useDefaultExcludes>true</useDefaultExcludes>
       <excludes>
         <!-- build output -->
         <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude>
-        
-        <!-- NOTE: Most of the following excludes should not be required 
-             if the standard release process is followed. This is because the 
+
+        <!-- NOTE: Most of the following excludes should not be required
+             if the standard release process is followed. This is because the
              release plugin checks out project sources into a location like
              target/checkout, then runs the build from there. The result is
              a source-release archive that comes from a pretty clean directory
              structure.
-             
+
              HOWEVER, if the release plugin is configured to run extra goals
              or generate a project website, it's definitely possible that some
              of these files will be present. So, it's safer to exclude them.
         -->
-             
+
         <!-- IDEs -->
         <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude>
         <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude>
@@ -57,10 +57,10 @@
         <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude>
         <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude>
         <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude>
-        
+
         <!-- misc -->
         <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude>
-        
+
         <!-- release-plugin temp files -->
         <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
         <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>

Modified: commons/proper/vfs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/pom.xml?rev=1031287&r1=1031286&r2=1031287&view=diff
==============================================================================
--- commons/proper/vfs/trunk/pom.xml (original)
+++ commons/proper/vfs/trunk/pom.xml Thu Nov  4 22:03:29 2010
@@ -439,28 +439,7 @@
           <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
             <executions>
-              <!-- As the main Apache pom only builds source zip archives but
-                   commons wants both zip and tar.gz and because this is configured
-                   in the assembly, we need to use a specific assembly. That also allows
-                   nameing the final artifact as -src not -source-release.
-              -->
-              <execution>
-                <id>vfs-source-release-assembly</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                    <finalName>commons-vfs-${project.version}</finalName>
-                  <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                  <descriptors>
-                      <descriptor>dist/src/assembly/src.xml</descriptor>
-                  </descriptors>
-                  <tarLongFileMode>gnu</tarLongFileMode>
-                </configuration>
-              </execution>
-              <!-- But the original source build is still hooked up and would
-                   create a second source archive. Luckily, it can be turned off.
+              <!-- Don't build the source archives here. They are constructed in the dist
project
               -->
               <execution>
                 <id>source-release-assembly</id>



Mime
View raw message