Author: oheger
Date: Sat Sep 16 14:51:18 2017
New Revision: 1808546
URL: http://svn.apache.org/viewvc?rev=1808546&view=rev
Log:
Added xmlunit tag lib to multi-module build.
Added:
commons/proper/jelly/trunk/jelly-tags/xmlunit/pom.xml
- copied, changed from r1808545,
commons/proper/jelly/trunk/jelly-tags/xmlunit/project.xml
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/ActualTag.java
- copied, changed from r1808545,
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/ActualTag.java
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/AssertDocumentsEqualTag.java
- copied, changed from r1808545,
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/AssertDocumentsEqualTag.java
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/ExpectedTag.java
- copied, changed from r1808545,
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/ExpectedTag.java
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/XMLUnitTagLibrary.java
- copied, changed from r1808545,
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/XMLUnitTagLibrary.java
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/XMLUnitTagSupport.java
- copied, changed from r1808545,
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/XMLUnitTagSupport.java
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/package.html
- copied, changed from r1808545,
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/package.html
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/java/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/java/org/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/java/org/apache/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/java/org/apache/commons/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/java/org/apache/commons/jelly/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/java/org/apache/commons/jelly/tags/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/java/org/apache/commons/jelly/tags/xmlunit/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/java/org/apache/commons/jelly/tags/xmlunit/TestJelly.java
- copied, changed from r1808545,
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/org/apache/commons/jelly/tags/xmlunit/TestJelly.java
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/resources/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/resources/org/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/resources/org/apache/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/resources/org/apache/commons/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/resources/org/apache/commons/jelly/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/resources/org/apache/commons/jelly/tags/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/resources/org/apache/commons/jelly/tags/xmlunit/
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/resources/org/apache/commons/jelly/tags/xmlunit/suite.jelly
- copied, changed from r1808545,
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/org/apache/commons/jelly/tags/xmlunit/suite.jelly
Removed:
commons/proper/jelly/trunk/jelly-tags/xmlunit/build.xml
commons/proper/jelly/trunk/jelly-tags/xmlunit/maven.xml
commons/proper/jelly/trunk/jelly-tags/xmlunit/project.properties
commons/proper/jelly/trunk/jelly-tags/xmlunit/project.xml
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/ActualTag.java
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/AssertDocumentsEqualTag.java
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/ExpectedTag.java
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/XMLUnitTagLibrary.java
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/XMLUnitTagSupport.java
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/package.html
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/org/apache/commons/jelly/tags/xmlunit/TestJelly.java
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/org/apache/commons/jelly/tags/xmlunit/suite.jelly
Modified:
commons/proper/jelly/trunk/jelly-tags/pom.xml
Modified: commons/proper/jelly/trunk/jelly-tags/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/pom.xml?rev=1808546&r1=1808545&r2=1808546&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/pom.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/pom.xml Sat Sep 16 14:51:18 2017
@@ -33,6 +33,7 @@
<module>log</module>
<module>util</module>
<module>xml</module>
+ <module>xmlunit</module>
</modules>
<build>
Copied: commons/proper/jelly/trunk/jelly-tags/xmlunit/pom.xml (from r1808545,
commons/proper/jelly/trunk/jelly-tags/xmlunit/project.xml)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/xmlunit/pom.xml?p2=commons/proper/jelly/trunk/jelly-tags/xmlunit/pom.xml&p1=commons/proper/jelly/trunk/jelly-tags/xmlunit/project.xml&r1=1808545&r2=1808546&rev=1808546&view=diff
==============================================================================
--- commons/proper/jelly/trunk/jelly-tags/xmlunit/project.xml (original)
+++ commons/proper/jelly/trunk/jelly-tags/xmlunit/pom.xml Sat Sep 16 14:51:18
2017
@@ -1,5 +1,4 @@
<?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
@@ -7,31 +6,29 @@
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
-
+
+ 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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </parent>
-<project>
- <extend>${basedir}/../tag-project.xml</extend>
<artifactId>commons-jelly-tags-xmlunit</artifactId>
+ <packaging>jar</packaging>
<name>commons-jelly-tags-xmlunit</name>
- <currentVersion>1.0.1-SNAPSHOT</currentVersion>
- <package>org.apache.commons.jelly.tags.xmlunit</package>
<description>This is a Jelly interface for unit testing XML
applications.</description>
- <shortDescription>Commons Jelly XMLUnit Tag Library</shortDescription>
- <versions>
- <version>
- <id>1.0</id>
- <name>1.0</name>
- <tag>COMMONS-JELLY-XMLUNIT-1_0</tag>
- </version>
- </versions>
+
<dependencies>
<!-- START for compilation -->
<dependency>
@@ -39,43 +36,29 @@
<artifactId>xmlunit</artifactId>
<version>1.0</version>
</dependency>
- <!-- for some reason I had to add this in or the 1.3.1 compiler barfed -->
-
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags-junit</artifactId>
+ <version>${project.version}</version>
</dependency>
+
<!-- END for compilation -->
+
<!-- START for testing -->
<dependency>
<groupId>commons-jelly</groupId>
- <artifactId>commons-jelly-tags-junit</artifactId>
- <version>1.0</version>
- <url>http://commons.apache.org/jelly/tags/junit/</url>
- <properties>
- <scope>test</scope>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
- <version>1.0</version>
- <properties>
- <scope>test</scope>
- </properties>
+ <version>1.1</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.3.1</version>
- <url>http://xml.apache.org/xalan-j/</url>
- <properties>
- <scope>test</scope>
- </properties>
+ <scope>test</scope>
</dependency>
- <!-- END for testing -->
+ <!-- END for testing -->
</dependencies>
</project>
Copied:
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/ActualTag.java
(from r1808545,
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/ActualTag.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/ActualTag.java?p2=commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/ActualTag.java&p1=commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/ActualTag.java&r1=1808545&r2=1808546&rev=1808546&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/AssertDocumentsEqualTag.java
(from r1808545,
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/AssertDocumentsEqualTag.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/AssertDocumentsEqualTag.java?p2=commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/AssertDocumentsEqualTag.java&p1=commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/AssertDocumentsEqualTag.java&r1=1808545&r2=1808546&rev=1808546&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/ExpectedTag.java
(from r1808545,
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/ExpectedTag.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/ExpectedTag.java?p2=commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/ExpectedTag.java&p1=commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/ExpectedTag.java&r1=1808545&r2=1808546&rev=1808546&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/XMLUnitTagLibrary.java
(from r1808545,
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/XMLUnitTagLibrary.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/XMLUnitTagLibrary.java?p2=commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/XMLUnitTagLibrary.java&p1=commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/XMLUnitTagLibrary.java&r1=1808545&r2=1808546&rev=1808546&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/XMLUnitTagSupport.java
(from r1808545,
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/XMLUnitTagSupport.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/XMLUnitTagSupport.java?p2=commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/XMLUnitTagSupport.java&p1=commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/XMLUnitTagSupport.java&r1=1808545&r2=1808546&rev=1808546&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/package.html
(from r1808545,
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/package.html)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/package.html?p2=commons/proper/jelly/trunk/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/package.html&p1=commons/proper/jelly/trunk/jelly-tags/xmlunit/src/java/org/apache/commons/jelly/tags/xmlunit/package.html&r1=1808545&r2=1808546&rev=1808546&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/java/org/apache/commons/jelly/tags/xmlunit/TestJelly.java
(from r1808545,
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/org/apache/commons/jelly/tags/xmlunit/TestJelly.java)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/java/org/apache/commons/jelly/tags/xmlunit/TestJelly.java?p2=commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/java/org/apache/commons/jelly/tags/xmlunit/TestJelly.java&p1=commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/org/apache/commons/jelly/tags/xmlunit/TestJelly.java&r1=1808545&r2=1808546&rev=1808546&view=diff
==============================================================================
(empty)
Copied:
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/resources/org/apache/commons/jelly/tags/xmlunit/suite.jelly
(from r1808545,
commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/org/apache/commons/jelly/tags/xmlunit/suite.jelly)
URL:
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/resources/org/apache/commons/jelly/tags/xmlunit/suite.jelly?p2=commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/resources/org/apache/commons/jelly/tags/xmlunit/suite.jelly&p1=commons/proper/jelly/trunk/jelly-tags/xmlunit/src/test/org/apache/commons/jelly/tags/xmlunit/suite.jelly&r1=1808545&r2=1808546&rev=1808546&view=diff
==============================================================================
(empty)
