You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/10/09 19:07:31 UTC
svn commit: r454429 - in /myfaces/tobago/trunk: build-nightly.sh
example/tobago-example-assembly/pom.xml tobago-assembly/pom.xml
tobago-tool/gendoc/pom.xml
Author: bommel
Date: Mon Oct 9 10:07:30 2006
New Revision: 454429
URL: http://svn.apache.org/viewvc?view=rev&rev=454429
Log:
fixed nightly build
generate assembly
Modified:
myfaces/tobago/trunk/build-nightly.sh
myfaces/tobago/trunk/example/tobago-example-assembly/pom.xml
myfaces/tobago/trunk/tobago-assembly/pom.xml
myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml
Modified: myfaces/tobago/trunk/build-nightly.sh
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/build-nightly.sh?view=diff&rev=454429&r1=454428&r2=454429
==============================================================================
--- myfaces/tobago/trunk/build-nightly.sh (original)
+++ myfaces/tobago/trunk/build-nightly.sh Mon Oct 9 10:07:30 2006
@@ -70,8 +70,8 @@
cd tobago
mvn -Djava14.home=$JAVA14_HOME -Pgenerate-assembly,jdk14retro -U clean install
cd tobago-assembly
-mvn clean assembly:assembly org.apache.myfaces.maven:wagon-maven-plugin:deploy
+mvn -Pgenerate-assembly clean assembly:assembly org.apache.myfaces.maven:wagon-maven-plugin:deploy
cd ../example/tobago-example-assembly
-mvn clean assembly:assembly org.apache.myfaces.maven:wagon-maven-plugin:deploy
+mvn -Pgenerate-assembly clean assembly:assembly org.apache.myfaces.maven:wagon-maven-plugin:deploy
cd ../../..
Modified: myfaces/tobago/trunk/example/tobago-example-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/tobago-example-assembly/pom.xml?view=diff&rev=454429&r1=454428&r2=454429
==============================================================================
--- myfaces/tobago/trunk/example/tobago-example-assembly/pom.xml (original)
+++ myfaces/tobago/trunk/example/tobago-example-assembly/pom.xml Mon Oct 9 10:07:30 2006
@@ -16,38 +16,6 @@
<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>tobago-example-demo</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </artifactItem>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>tobago-example-blank</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/webapp</outputDirectory>
- </configuration>
- </execution>
-
- </executions>
- </plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -74,5 +42,45 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>generate-assembly</id>
+ <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>tobago-example-demo</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tobago-example-blank</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/webapp</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: myfaces/tobago/trunk/tobago-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-assembly/pom.xml?view=diff&rev=454429&r1=454428&r2=454429
==============================================================================
--- myfaces/tobago/trunk/tobago-assembly/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-assembly/pom.xml Mon Oct 9 10:07:30 2006
@@ -79,8 +79,7 @@
<profiles>
<profile>
- <!--fixme: rename id-->
- <id>assembly-facelets-hotfix</id>
+ <id>generate-assembly</id>
<build>
<plugins>
<plugin>
Modified: myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml?view=diff&rev=454429&r1=454428&r2=454429
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml Mon Oct 9 10:07:30 2006
@@ -58,7 +58,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>