- Revision
- 409
- Author
- mauro
- Date
- 2007-11-21 06:24:53 -0600 (Wed, 21 Nov 2007)
Log Message
Updated to use latest (timestamped) 2.4-SNAPSHOT of surefire plugin to allow configuration of junitArtifactName: now using junit:junit-dep coming from jmock-junit4.
Modified Paths
Diff
Modified: trunk/pom.xml (408 => 409)
--- trunk/pom.xml 2007-11-20 15:39:09 UTC (rev 408) +++ trunk/pom.xml 2007-11-21 12:24:53 UTC (rev 409) @@ -8,11 +8,12 @@ <version>1.0-SNAPSHOT</version> <name>Waffle</name> <description> - Waffle is a Java action-based web framework that was built to support - enterprise-level business applications, with no mandatory - XML configuration (beyond the minimal web.xml required by any webapp) - and no proprietary UI markup language. Its guiding principles - are agility, simplicity, pluggability and interoperability. + Waffle is a Java action-based web framework that was built to + support enterprise-level business applications, with no mandatory + XML configuration (beyond the minimal web.xml required by any + webapp) and no proprietary UI markup language. Its guiding + principles are agility, simplicity, pluggability and + interoperability. </description> <url>http://waffle.codehaus.org</url> @@ -108,21 +109,8 @@ <groupId>org.jmock</groupId> <artifactId>jmock-junit4</artifactId> <version>2.4.0</version> - <exclusions> - <!-- Use junit:junit until issue fixed http://jira.codehaus.org/browse/SUREFIRE-370 --> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit-dep</artifactId> - </exclusion> - </exclusions> <scope>test</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - <scope>test</scope> - </dependency> </dependencies> </dependencyManagement> @@ -131,10 +119,6 @@ <groupId>org.jmock</groupId> <artifactId>jmock-junit4</artifactId> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> </dependencies> <build> @@ -164,8 +148,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.3</version> + <version>2.4-20071121.115034-16</version> + <!-- Using fixed snapshot until 2.4 released --> + <!-- Required to allow configuration of junitArtifactName --> <configuration> + <junitArtifactName>junit:junit-dep</junitArtifactName> <includes> <include>**/*Test.java</include> </includes> @@ -491,6 +478,14 @@ <pluginRepositories> <pluginRepository> + <id>apache-plugin-snapshot-repository</id> + <name>Apache Plugin Snapshot Repository</name> + <url>http://people.apache.org/repo/m2-snapshot-repository</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> <id>codehaus-plugin-repository</id> <name>Codehaus Plugin Repository</name> <url>http://repository.codehaus.org</url>
Modified: trunk/waffle-mock/pom.xml (408 => 409)
--- trunk/waffle-mock/pom.xml 2007-11-20 15:39:09 UTC (rev 408) +++ trunk/waffle-mock/pom.xml 2007-11-21 12:24:53 UTC (rev 409) @@ -21,13 +21,8 @@ <groupId>org.jmock</groupId> <artifactId>jmock-junit4</artifactId> <scope>compile</scope> - </dependency> + </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>compile</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </dependency>
To unsubscribe from this list please visit:
