You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by so...@apache.org on 2008/08/13 10:35:57 UTC
svn commit: r685478 - in /myfaces/portlet-bridge/core/trunk:
assembly/pom.xml examples/assembly/pom.xml examples/pom.xml pom.xml
Author: sobryan
Date: Wed Aug 13 01:35:56 2008
New Revision: 685478
URL: http://svn.apache.org/viewvc?rev=685478&view=rev
Log:
Some pom updates to help streamline build
Modified:
myfaces/portlet-bridge/core/trunk/assembly/pom.xml
myfaces/portlet-bridge/core/trunk/examples/assembly/pom.xml
myfaces/portlet-bridge/core/trunk/examples/pom.xml
myfaces/portlet-bridge/core/trunk/pom.xml
Modified: myfaces/portlet-bridge/core/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/assembly/pom.xml?rev=685478&r1=685477&r2=685478&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/assembly/pom.xml (original)
+++ myfaces/portlet-bridge/core/trunk/assembly/pom.xml Wed Aug 13 01:35:56 2008
@@ -29,27 +29,12 @@
<artifactId>portlet-bridge</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.portlet-bridge</groupId>
- <artifactId>portlet-bridge-api</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.portlet-bridge</groupId>
- <artifactId>portlet-bridge-impl</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
+
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.0.1</version>
+ <!--version>2.0.1</version-->
<configuration>
<descriptors>
<descriptor>src/main/assembly/dep.xml</descriptor>
@@ -64,63 +49,93 @@
<plugin>
<groupId>org.apache.myfaces.maven</groupId>
<artifactId>wagon-maven-plugin</artifactId>
- <version>1.0.6</version>
+ <!--version>1.0.6</version-->
<configuration>
<id>myfaces-nightly-builds</id>
<url>scpexe://minotaur.apache.org/www/people.apache.org/builds/myfaces/nightly</url>
<inputDirectory>target/assembly/out</inputDirectory>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dependency-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-javadoc</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>portlet-bridge-api</artifactId>
- <version>${project.version}</version>
- <classifier>javadoc</classifier>
- <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
- <id>copy-source</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>portlet-bridge-api</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>portlet-bridge-impl</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/src
- </outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
- </build>
+ </build>
+
+ <!-- The project does nothing if dependencies are disabled. This helps with predeployment. -->
+ <profiles>
+ <profile>
+ <id>assemble</id>
+ <activation>
+ <property>
+ <name>!prepareRelease</name>
+ </property>
+ </activation>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.portlet-bridge</groupId>
+ <artifactId>portlet-bridge-api</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.portlet-bridge</groupId>
+ <artifactId>portlet-bridge-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>portlet-bridge-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-source</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>portlet-bridge-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>portlet-bridge-impl</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/src</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: myfaces/portlet-bridge/core/trunk/examples/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/assembly/pom.xml?rev=685478&r1=685477&r2=685478&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/assembly/pom.xml (original)
+++ myfaces/portlet-bridge/core/trunk/examples/assembly/pom.xml Wed Aug 13 01:35:56 2008
@@ -44,7 +44,7 @@
</configuration>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.myfaces.maven</groupId>
<artifactId>wagon-maven-plugin</artifactId>
<version>1.0.1</version>
@@ -54,62 +54,92 @@
<inputDirectory>target/assembly/out</inputDirectory>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dependency-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-example</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>portlet-bridge-demo</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </artifactItem>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>portlet-bridge-blank</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/webapp</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>copy-source</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>portlet-bridge-blank</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>portlet-bridge-demo</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/src
- </outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
+
+ <!-- The project does nothing if dependencies are disabled. This helps with predeployment. -->
+ <profiles>
+ <profile>
+ <id>assemble</id>
+ <activation>
+ <property>
+ <name>!prepareRelease</name>
+ </property>
+ </activation>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.portlet-bridge</groupId>
+ <artifactId>portlet-bridge-blank</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.portlet-bridge</groupId>
+ <artifactId>portlet-bridge-demo</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-example</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>portlet-bridge-demo</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>portlet-bridge-blank</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/webapp</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-source</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>portlet-bridge-blank</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>portlet-bridge-demo</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/src</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: myfaces/portlet-bridge/core/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/pom.xml?rev=685478&r1=685477&r2=685478&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/pom.xml (original)
+++ myfaces/portlet-bridge/core/trunk/examples/pom.xml Wed Aug 13 01:35:56 2008
@@ -34,6 +34,18 @@
<profiles>
<profile>
+ <id>prepare-release</id>
+ <activation>
+ <property>
+ <name>prepareRelease</name>
+ </property>
+ </activation>
+ <modules>
+ <module>assembly</module>
+ </modules>
+ </profile>
+
+ <profile>
<id>perform-release</id>
<activation>
<property>
Modified: myfaces/portlet-bridge/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/pom.xml?rev=685478&r1=685477&r2=685478&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/pom.xml (original)
+++ myfaces/portlet-bridge/core/trunk/pom.xml Wed Aug 13 01:35:56 2008
@@ -182,6 +182,20 @@
</reporting>
<profiles>
+ <!-- This profile is invoked by -DprepareRelease=true. This allows mvn release:prepare to
+ run successfully on the assembly projects. -->
+ <profile>
+ <id>prepare-release</id>
+ <activation>
+ <property>
+ <name>prepareRelease</name>
+ </property>
+ </activation>
+ <modules>
+ <module>assembly</module>
+ </modules>
+ </profile>
+
<profile>
<id>perform-release</id>
<activation>
@@ -224,4 +238,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>