You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ol...@apache.org on 2012/01/11 15:37:13 UTC
svn commit: r1230067 - in /tomcat/maven-plugin/trunk/tomcat-maven-archetype:
pom.xml src/main/resources/archetype-resources/test-webapp-it/pom.xml
src/test/resources/projects/basic/goal.txt
Author: olamy
Date: Wed Jan 11 14:37:12 2012
New Revision: 1230067
URL: http://svn.apache.org/viewvc?rev=1230067&view=rev
Log:
add a headless profile to start xvfb if needed and will fix asf jenkins build
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/goal.txt
Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml?rev=1230067&r1=1230066&r2=1230067&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml Wed Jan 11 14:37:12 2012
@@ -38,6 +38,7 @@
<properties>
<archetypeVersion>2.2</archetypeVersion>
<tomcatPluginVersion>${project.version}</tomcatPluginVersion>
+ <archetypeItGoals>clean,verify</archetypeItGoals>
</properties>
<build>
@@ -47,6 +48,12 @@
<filtering>true</filtering>
</resource>
</resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<extensions>
<extension>
@@ -103,6 +110,12 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>headless</id>
+ <properties>
+ <archetypeItGoals>clean,verify,-Pheadless</archetypeItGoals>
+ </properties>
+ </profile>
</profiles>
</project>
Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml?rev=1230067&r1=1230066&r2=1230067&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml Wed Jan 11 14:37:12 2012
@@ -214,6 +214,26 @@
<seleniumBrowser>*iexplore</seleniumBrowser>
</properties>
</profile>
+ <profile>
+ <id>headless</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>xvfb</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>xvfb</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/goal.txt
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/goal.txt?rev=1230067&r1=1230066&r2=1230067&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/goal.txt (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/goal.txt Wed Jan 11 14:37:12 2012
@@ -1 +1 @@
-clean,verify
\ No newline at end of file
+${archetypeItGoals}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org