Author: baerrach
Date: Fri Oct 3 15:44:33 2008
New Revision: 701560
URL: http://svn.apache.org/viewvc?rev=701560&view=rev
Log:
[MANTRUN-68] Upgraded to ant-1.7.1
Added integration tests using echoxml (1.7 feature only)
Also upgraded to plexus-utils 1.5.6 which has FileUtils.contentEquals()
Added:
maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/
maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/echo.xml.expected
maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/pom.xml
(with props)
maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/verify.bsh
Modified:
maven/plugins/trunk/maven-antrun-plugin/pom.xml
Modified: maven/plugins/trunk/maven-antrun-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/pom.xml?rev=701560&r1=701559&r2=701560&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/pom.xml Fri Oct 3 15:44:33 2008
@@ -68,18 +68,18 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.1</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.6.5</version>
+ <version>1.7.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.6.5</version>
+ <version>1.7.1</version>
</dependency>
</dependencies>
Added:
maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/echo.xml.expected
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/echo.xml.expected?rev=701560&view=auto
==============================================================================
---
maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/echo.xml.expected
(added)
+++
maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/echo.xml.expected
Fri Oct 3 15:44:33 2008
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="foo">
+ <target name="foo">
+ <echo>foo</echo>
+ </target>
+</project>
Added: maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/pom.xml?rev=701560&view=auto
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/pom.xml
(added)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/pom.xml Fri
Oct 3 15:44:33 2008
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<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.maven.plugins.antrun</groupId>
+ <artifactId>antrun-plugin-test</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for MANTRUN-68</name>
+ <dependencies></dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>@pom.version@</version>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
+ <echoxml file="echo.xml">
+ <project default="foo">
+ <target name="foo">
+ <echo>foo</echo>
+ </target>
+ </project>
+ </echoxml>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/verify.bsh?rev=701560&view=auto
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/verify.bsh
(added)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/verify.bsh
Fri Oct 3 15:44:33 2008
@@ -0,0 +1,17 @@
+import java.io.*;
+import java.util.*;
+import java.util.regex.*;
+
+import org.codehaus.plexus.util.*;
+
+try
+{
+ File actual = new File( basedir, "echo.xml" );
+ File expected = new File( basedir, "echo.xml.expected" );
+ return FileUtils.contentEquals(expected, actual);
+}
+catch( Throwable t )
+{
+ t.printStackTrace();
+ return false;
+}
