You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by dd...@apache.org on 2007/03/05 03:09:42 UTC

svn commit: r514522 - /portals/pluto/trunk/assembly/pom.xml

Author: ddewolf
Date: Sun Mar  4 18:09:41 2007
New Revision: 514522

URL: http://svn.apache.org/viewvc?view=rev&rev=514522
Log:
Fixing error during release;  Requiring two different profiles.  One to tag assembly, one to build assemblies

Modified:
    portals/pluto/trunk/assembly/pom.xml

Modified: portals/pluto/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/assembly/pom.xml?view=diff&rev=514522&r1=514521&r2=514522
==============================================================================
--- portals/pluto/trunk/assembly/pom.xml (original)
+++ portals/pluto/trunk/assembly/pom.xml Sun Mar  4 18:09:41 2007
@@ -1,130 +1,136 @@
-<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">
 
-    <parent>
-        <artifactId>pluto</artifactId>
-        <groupId>org.apache.pluto</groupId>
-        <version>1.2.0-SNAPSHOT</version>
-    </parent>
+  <parent>
+    <artifactId>pluto</artifactId>
+    <groupId>org.apache.pluto</groupId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>assembly</artifactId>
-    <name>Pluto Assembly Project</name>
-    <url>http://portals.apache.org/pluto/</url>
-    <inceptionYear>2001</inceptionYear>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>assembly</artifactId>
+  <name>Pluto Assembly Project</name>
+  <url>http://portals.apache.org/pluto/</url>
+  <inceptionYear>2001</inceptionYear>
 
-    <build>
+  <profiles>
+    <profile>
+      <id>build-assemblies</id>
+      <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <phase>compile</phase>
-                    </execution>
-                </executions>
-                <configuration>
-                    <tasks>
-                        <ant antfile="${basedir}/src/main/assembly/bundle-ant.xml" inheritRefs="true">
-                            <target name="package" />
-                        </ant>
-                    </tasks>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-antlr</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>antlr</groupId>
-                        <artifactId>antlrall</artifactId>
-                        <version>2.7.4</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.pluto</groupId>
-                <artifactId>maven-pluto-plugin</artifactId>
-                <version>${pom.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>install</goal>
-                        </goals>
-                        <phase>package</phase>
-                    </execution>
-                </executions>
-                <configuration>
-                    <installDir>${project.build.directory}/pluto-tomcat</installDir>
-                    <installationDirectory>${project.build.directory}/pluto-tomcat</installationDirectory>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.1</version>
-                <executions>
-                    <execution>
-                        <id>make-assemblies</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <descriptors>
-                        <descriptor>${basedir}/src/main/assembly/src.xml</descriptor>
-                        <descriptor>${basedir}/src/main/assembly/bin.xml</descriptor>
-                        <descriptor>${basedir}/src/main/assembly/container-bin.xml</descriptor>
-                        <descriptor>${basedir}/src/main/assembly/bundled.xml</descriptor>
-                    </descriptors>
-                    <finalName>pluto-${pom.version}</finalName>
-                    <outputDirectory>target/assembly/out</outputDirectory>
-                    <workDirectory>target/assembly/work</workDirectory>
-                </configuration>
-            </plugin>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <phase>compile</phase>
+              </execution>
+            </executions>
+            <configuration>
+              <tasks>
+                <ant antfile="${basedir}/src/main/assembly/bundle-ant.xml" inheritRefs="true">
+                  <target name="package"/>
+                </ant>
+              </tasks>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>ant</groupId>
+                <artifactId>ant-antlr</artifactId>
+                <version>1.6.5</version>
+              </dependency>
+              <dependency>
+                <groupId>antlr</groupId>
+                <artifactId>antlrall</artifactId>
+                <version>2.7.4</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>maven-pluto-plugin</artifactId>
+            <version>${pom.version}</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>install</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
+            <configuration>
+              <installDir>${project.build.directory}/pluto-tomcat</installDir>
+              <installationDirectory>${project.build.directory}/pluto-tomcat</installationDirectory>
+            </configuration>
+          </plugin>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <version>2.1</version>
+            <executions>
+              <execution>
+                <id>make-assemblies</id>
+                <phase>install</phase>
+                <goals>
+                  <goal>attached</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <descriptors>
+                <descriptor>${basedir}/src/main/assembly/src.xml</descriptor>
+                <descriptor>${basedir}/src/main/assembly/bin.xml</descriptor>
+                <descriptor>${basedir}/src/main/assembly/container-bin.xml</descriptor>
+                <descriptor>${basedir}/src/main/assembly/bundled.xml</descriptor>
+              </descriptors>
+              <finalName>pluto-${pom.version}</finalName>
+              <outputDirectory>target/assembly/out</outputDirectory>
+              <workDirectory>target/assembly/work</workDirectory>
+            </configuration>
+          </plugin>
         </plugins>
-    </build>
+      </build>
+    </profile>
+  </profiles>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto-descriptor-api</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto-descriptor-impl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto-container</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto-portal-driver</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto-portal-driver-impl</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto-portal</artifactId>
-            <type>war</type>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto-testsuite</artifactId>
-            <type>war</type>
-            <version>${pom.version}</version>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-descriptor-api</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-descriptor-impl</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-container</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-portal-driver</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-portal-driver-impl</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-portal</artifactId>
+      <type>war</type>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-testsuite</artifactId>
+      <type>war</type>
+      <version>${pom.version}</version>
+    </dependency>
+  </dependencies>
 </project>