commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r1031195 - in /commons/proper/vfs/trunk: dist/pom.xml pom.xml
Date Thu, 04 Nov 2010 19:58:19 GMT
Author: rgoers
Date: Thu Nov  4 19:58:19 2010
New Revision: 1031195

URL: http://svn.apache.org/viewvc?rev=1031195&view=rev
Log:
Add dist project to 'normal' build

Modified:
    commons/proper/vfs/trunk/dist/pom.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=1031195&r1=1031194&r2=1031195&view=diff
==============================================================================
--- commons/proper/vfs/trunk/dist/pom.xml (original)
+++ commons/proper/vfs/trunk/dist/pom.xml Thu Nov  4 19:58:19 2010
@@ -17,129 +17,129 @@ See the License for the specific languag
 limitations under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <name>Commons VFS Distribution</name>
+  <name>Commons VFS Distribution</name>
+  <groupId>org.apache.commons</groupId>
+  <artifactId>commons-vfs-distribution</artifactId>
+  <version>2.0-SNAPSHOT</version>
+  <description>VFS is a Virtual File System library - Distribution archives.</description>
+
+  <parent>
     <groupId>org.apache.commons</groupId>
-    <artifactId>commons-vfs-distribution</artifactId>
+    <artifactId>commons-vfs-project</artifactId>
     <version>2.0-SNAPSHOT</version>
-    <description>VFS is a Virtual File System library - Distribution archives.</description>
-
-    <parent>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-vfs-project</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
+    <relativePath>../</relativePath>
+  </parent>
 
-    <dependencies>
+  <profiles>
+    <profile>
+      <id>apache-release</id>
+      <dependencies>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-vfs</artifactId>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-vfs</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-vfs</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-vfs</artifactId>
+          <version>${project.version}</version>
+          <classifier>sources</classifier>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-vfs</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-vfs</artifactId>
+          <version>${project.version}</version>
+          <classifier>javadoc</classifier>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-vfs</artifactId>
-            <version>${project.version}</version>
-            <classifier>tests</classifier>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-vfs</artifactId>
+          <version>${project.version}</version>
+          <classifier>tests</classifier>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-vfs</artifactId>
-            <version>${project.version}</version>
-            <classifier>test-sources</classifier>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-vfs</artifactId>
+          <version>${project.version}</version>
+          <classifier>test-sources</classifier>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-vfs-examples</artifactId>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-vfs-examples</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-vfs-examples</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-vfs-examples</artifactId>
+          <version>${project.version}</version>
+          <classifier>sources</classifier>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-vfs-examples</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-vfs-examples</artifactId>
+          <version>${project.version}</version>
+          <classifier>javadoc</classifier>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-vfs-sandbox</artifactId>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-vfs-sandbox</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-vfs-sandbox</artifactId>
-            <version>${project.version}</version>
-            <classifier>sources</classifier>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-vfs-sandbox</artifactId>
+          <version>${project.version}</version>
+          <classifier>sources</classifier>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-vfs-sandbox</artifactId>
-            <version>${project.version}</version>
-            <classifier>javadoc</classifier>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-vfs-sandbox</artifactId>
+          <version>${project.version}</version>
+          <classifier>javadoc</classifier>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-vfs-sandbox</artifactId>
-            <version>${project.version}</version>
-            <classifier>tests</classifier>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-vfs-sandbox</artifactId>
+          <version>${project.version}</version>
+          <classifier>tests</classifier>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-vfs-sandbox</artifactId>
-            <version>${project.version}</version>
-            <classifier>test-sources</classifier>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-vfs-sandbox</artifactId>
+          <version>${project.version}</version>
+          <classifier>test-sources</classifier>
         </dependency>
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apache-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>binary</id>
-                                <configuration>
-                                    <finalName>commons-vfs-${project.version}</finalName>
-                                    <descriptors>
-                                        <descriptor>src/assembly/bin.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                </configuration>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <phase>package</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>binary</id>
+                <configuration>
+                  <finalName>commons-vfs-${project.version}</finalName>
+                  <descriptors>
+                    <descriptor>src/assembly/bin.xml</descriptor>
+                  </descriptors>
+                  <tarLongFileMode>gnu</tarLongFileMode>
+                </configuration>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>

Modified: commons/proper/vfs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/pom.xml?rev=1031195&r1=1031194&r2=1031195&view=diff
==============================================================================
--- commons/proper/vfs/trunk/pom.xml (original)
+++ commons/proper/vfs/trunk/pom.xml Thu Nov  4 19:58:19 2010
@@ -40,6 +40,7 @@
     <module>core</module>
     <module>examples</module>
     <module>sandbox</module>
+    <module>dist</module>
   </modules>
 
   <issueManagement>
@@ -391,18 +392,10 @@
   <!-- Releasing VFS as a multi-module build with binary artifacts is somewhat
        painful. This profile hooks into the commons-parent and the apache-pom to
        get the build done and then uses the assembly to package it up.
-  -->  
+  -->
   <profiles>
     <profile>
       <id>apache-release</id>
-      <!-- The binary distribution must be built after all the submodules have been
-           built. So that happens in an additional sub-project which depends on all
-           the submodules to build. So the 'dist' submodule is only activated in the
-           release profile. Otherwise, there is nothing to see here.
-      -->
-      <modules>
-        <module>dist</module>
-      </modules>
       <build>
         <plugins>
           <!-- Activate the right profile for the actual release build. Make sure that
@@ -431,7 +424,7 @@
               </execution>
             </executions>
           </plugin>
-          <!-- Commons turns checksums on for installs in its 
+          <!-- Commons turns checksums on for installs in its
                parent pom. But vfs does not use the commons release
                profile. So we turn it on for the vfs release explicitly.
                remove when commons-parent 18 is released.



Mime
View raw message