You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2010/10/28 00:00:36 UTC
svn commit: r1028121 - /tapestry/tapestry5/trunk/tapestry-core/pom.xml
Author: hlship
Date: Wed Oct 27 22:00:36 2010
New Revision: 1028121
URL: http://svn.apache.org/viewvc?rev=1028121&view=rev
Log:
TAP5-1204: Change pom.xml to correctly build Groovy test classes as tests
Modified:
tapestry/tapestry5/trunk/tapestry-core/pom.xml
Modified: tapestry/tapestry5/trunk/tapestry-core/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/pom.xml?rev=1028121&r1=1028120&r2=1028121&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/pom.xml Wed Oct 27 22:00:36 2010
@@ -1,4 +1,5 @@
-<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-core</artifactId>
@@ -22,7 +23,7 @@
<!-- Some parts of GMaven vary for each major Groovy version -->
<gmaven-provider>1.7</gmaven-provider>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.tapestry</groupId>
@@ -36,10 +37,8 @@
<dependency>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-test</artifactId>
- <!--
- This would be test, but we provide a few base classes that depend on TestNG, which is
- provided by tapestry-test.
- -->
+ <!-- This would be test, but we provide a few base classes that depend on TestNG, which is provided
+ by tapestry-test. -->
<scope>provided</scope>
</dependency>
<dependency>
@@ -79,19 +78,14 @@
</dependencies>
<build>
- <resources>
- <resource>
- <!-- GMaven isn't smart enough to add this automatically. -->
+ <testResources>
+ <testResource>
<directory>src/test/groovy</directory>
- </resource>
- <resource>
- <!--
- Once you mention one resource directory, you have to be explicit about all of them,
- apparently.
- -->
- <directory>src/main/resources</directory>
- </resource>
- </resources>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
@@ -100,7 +94,7 @@
<configuration>
<providerSelection>${gmaven-provider}</providerSelection>
</configuration>
- <executions>
+ <executions>
<execution>
<goals>
<!-- generateStubs and compile omitted as no Groovy code in main code base -->
@@ -111,17 +105,6 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.codehaus.gmaven.runtime</groupId>
- <artifactId>gmaven-runtime-${gmaven-provider}</artifactId>
- <version>${gmaven-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy-version}</version>
@@ -151,10 +134,8 @@
<goal>antlr</goal>
</goals>
<configuration>
- <!--
- This is a hack so that the parser grammar can locate the tokens file generated by
- the lexer grammar.
- -->
+ <!-- This is a hack so that the parser grammar can locate the tokens file generated by
+ the lexer grammar. -->
<libDirectory>target/generated-sources/antlr/org/apache/tapestry5/internal/antlr
</libDirectory>
</configuration>
@@ -173,8 +154,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
- <!-- This gets the plugin to clean up the cobertura.ser file left
- in the root directory. -->
+ <!-- This gets the plugin to clean up the cobertura.ser file left in the root directory. -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
@@ -221,18 +201,10 @@
</configuration>
</plugin>
- <!-- Disabled - seems to have a problem working with generated classes (like org/apache/tapestry5/internal/antlr/*)-->
- <!--plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <configuration>
- <comparisonVersion>5.1.0.5</comparisonVersion>
- <excludes>
- <exclude>**/internal/**</exclude>
- <exclude>**/test/**</exclude>
- </excludes>
- </configuration>
- </plugin-->
+ <!-- Disabled - seems to have a problem working with generated classes (like org/apache/tapestry5/internal/antlr/*) -->
+ <!--plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>clirr-maven-plugin</artifactId> <configuration>
+ <comparisonVersion>5.1.0.5</comparisonVersion> <excludes> <exclude>**/internal/**</exclude> <exclude>**/test/**</exclude>
+ </excludes> </configuration> </plugin -->
</plugins>
</reporting>