You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/11/19 15:24:29 UTC
svn commit: r1036870 - in /myfaces/extensions/cdi/trunk/test-modules:
pom.xml webapp-test-module/pom.xml
Author: jakobk
Date: Fri Nov 19 14:24:28 2010
New Revision: 1036870
URL: http://svn.apache.org/viewvc?rev=1036870&view=rev
Log:
add webapp-test-module only on -Pwebapptest, thus there is no Arquillian dependency in a normal build
Modified:
myfaces/extensions/cdi/trunk/test-modules/pom.xml
myfaces/extensions/cdi/trunk/test-modules/webapp-test-module/pom.xml
Modified: myfaces/extensions/cdi/trunk/test-modules/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/pom.xml?rev=1036870&r1=1036869&r2=1036870&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/test-modules/pom.xml Fri Nov 19 14:24:28 2010
@@ -36,8 +36,15 @@
<version>0.9.1-SNAPSHOT</version>
</parent>
- <modules>
- <module>webapp-test-module</module>
- </modules>
+ <profiles>
+
+ <!-- use mvn clean install -Pwebapptest to run the webapp-tests -->
+ <profile>
+ <id>webapptest</id>
+ <modules>
+ <module>webapp-test-module</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: myfaces/extensions/cdi/trunk/test-modules/webapp-test-module/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/test-modules/webapp-test-module/pom.xml?rev=1036870&r1=1036869&r2=1036870&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/test-modules/webapp-test-module/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/test-modules/webapp-test-module/pom.xml Fri Nov 19 14:24:28 2010
@@ -185,172 +185,105 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.6</version>
- <executions>
-
- <!-- skip the default-test execution -->
- <execution>
- <id>default-test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
-
- </executions>
- </plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+
+ <!-- run webapp-tests with myfaces and owb -->
+ <execution>
+ <id>test-tomcat-myfaces-owb</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+
+ <!--
+ fork for every test to circumvent OutOfMemoryError: PermGen space
+ (which occurs if there is too much classloading)
+ -->
+ <forkMode>always</forkMode>
+
+ <testNGArtifactName>none:none</testNGArtifactName>
+ <classpathDependencyExcludes>
+ <classpathDependencyExclude>org.apache.myfaces.extensions.cdi.core:myfaces-extcdi-core-impl</classpathDependencyExclude>
+ <classpathDependencyExclude>org.apache.myfaces.extensions.cdi.modules:myfaces-extcdi-jsf20-module-impl</classpathDependencyExclude>
+ <classpathDependencyExclude>org.apache.myfaces.extensions.cdi.modules:myfaces-extcdi-message-module-impl</classpathDependencyExclude>
+ <classpathDependencyExclude>org.apache.openwebbeans:openwebbeans-impl</classpathDependencyExclude>
+ <classpathDependencyExclude>org.apache.openwebbeans:openwebbeans-spi</classpathDependencyExclude>
+ <classpathDependencyExclude>org.apache.openwebbeans:openwebbeans-jsf</classpathDependencyExclude>
+ <classpathDependencyExclude>org.apache.openwebbeans:openwebbeans-resource</classpathDependencyExclude>
+ <classpathDependencyExclude>org.apache.openwebbeans:openwebbeans-web</classpathDependencyExclude>
+ </classpathDependencyExcludes>
+ </configuration>
+ </execution>
+ </executions>
+
+ <!--
+ The following dependencies need to be in the local repo in order to
+ make the tests work properly.
+ -->
+ <dependencies>
+ <!-- CODI impl dependencies -->
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
+ <artifactId>myfaces-extcdi-core-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
+ <artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- config-test dependencies-->
+ <!--dependency>
+ <groupId>org.os890.codi.addon</groupId>
+ <artifactId>web-xml-config</artifactId>
+ <version>${config.addon.version}</version>
+ <scope>test</scope>
+ </dependency-->
+
+ <!-- OWB impl dependencies -->
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <version>${owb.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ <version>${owb.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf</artifactId>
+ <version>${owb.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-resource</artifactId>
+ <version>${owb.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-web</artifactId>
+ <version>${owb.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
- <profiles>
-
- <!-- use mvn clean install -Pwebapptest to run the tests of this module -->
- <profile>
- <id>webapptest</id>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.6</version>
- <executions>
-
- <!-- run webapp-tests with myfaces and owb -->
- <execution>
- <id>test-tomcat-myfaces-owb</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
-
- <!--
- fork for every test to circumvent OutOfMemoryError: PermGen space
- (which occurs if there is too much classloading)
- -->
- <forkMode>always</forkMode>
-
- <testNGArtifactName>none:none</testNGArtifactName>
- <classpathDependencyExcludes>
- <classpathDependencyExclude>org.apache.myfaces.extensions.cdi.core:myfaces-extcdi-core-impl</classpathDependencyExclude>
- <classpathDependencyExclude>org.apache.myfaces.extensions.cdi.modules:myfaces-extcdi-jsf20-module-impl</classpathDependencyExclude>
- <classpathDependencyExclude>org.apache.myfaces.extensions.cdi.modules:myfaces-extcdi-message-module-impl</classpathDependencyExclude>
- <classpathDependencyExclude>org.apache.openwebbeans:openwebbeans-impl</classpathDependencyExclude>
- <classpathDependencyExclude>org.apache.openwebbeans:openwebbeans-spi</classpathDependencyExclude>
- <classpathDependencyExclude>org.apache.openwebbeans:openwebbeans-jsf</classpathDependencyExclude>
- <classpathDependencyExclude>org.apache.openwebbeans:openwebbeans-resource</classpathDependencyExclude>
- <classpathDependencyExclude>org.apache.openwebbeans:openwebbeans-web</classpathDependencyExclude>
- </classpathDependencyExcludes>
- </configuration>
- </execution>
- </executions>
-
- <!--
- The following dependencies need to be in the local repo in order to
- make the tests work properly.
- -->
- <dependencies>
- <!-- CODI impl dependencies -->
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
- <artifactId>myfaces-extcdi-core-impl</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- config-test dependencies-->
- <!--dependency>
- <groupId>org.os890.codi.addon</groupId>
- <artifactId>web-xml-config</artifactId>
- <version>${config.addon.version}</version>
- <scope>test</scope>
- </dependency-->
-
- <!-- OWB impl dependencies -->
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <version>${owb.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <version>${owb.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- <version>${owb.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-resource</artifactId>
- <version>${owb.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-web</artifactId>
- <version>${owb.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--profile>
- <id>jetty-embedded</id>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-jetty-embedded-6.1</artifactId>
- <version>${arquillian.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.12</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-plus</artifactId>
- <version>6.1.12</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-naming</artifactId>
- <version>6.1.12</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile-->
- </profiles>
-
<repositories>
<repository>
<id>jboss-public-repository-group</id>