dion 2003/08/07 09:54:25
Modified: src/test/java/org/apache/maven Tag: MAVEN_RC1_STABLE
MavenUtilsTest.java
src/test/extend Tag: MAVEN_RC1_STABLE project-child.xml
src/test/java/org/apache/maven/project Tag: MAVEN_RC1_STABLE
ProjectInheritanceTest.java
Added: src/test/java/org/apache/maven/util Tag: MAVEN_RC1_STABLE
MavenToolTest.java DVSLFormatterTest.java
DVSLPathToolTest.java StringToolTest.java
Log:
Update from back ported fixes
Revision Changes Path
No revision
No revision
1.9.2.1 +5 -5 maven/src/test/java/org/apache/maven/MavenUtilsTest.java
Index: MavenUtilsTest.java
===================================================================
RCS file: /home/cvs/maven/src/test/java/org/apache/maven/MavenUtilsTest.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- MavenUtilsTest.java 13 Apr 2003 00:56:02 -0000 1.9
+++ MavenUtilsTest.java 7 Aug 2003 16:54:25 -0000 1.9.2.1
@@ -54,15 +54,15 @@
* <http://www.apache.org/>.
*/
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.maven.jelly.MavenJellyContext;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Locale;
-import java.util.Properties;
public class MavenUtilsTest
extends TestCase
No revision
No revision
1.5.2.1 +1 -1 maven/src/test/extend/project-child.xml
Index: project-child.xml
===================================================================
RCS file: /home/cvs/maven/src/test/extend/project-child.xml,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- project-child.xml 25 Jul 2003 14:47:50 -0000 1.5
+++ project-child.xml 7 Aug 2003 16:54:25 -0000 1.5.2.1
@@ -17,7 +17,7 @@
</dependencies>
<build>
-
+
<unitTest>
<includes>
<include>**/*Test*.java</include>
No revision
No revision
1.1.4.1 +2 -2 maven/src/test/java/org/apache/maven/util/MavenToolTest.java
Index: MavenToolTest.java
===================================================================
RCS file: /home/cvs/maven/src/test/java/org/apache/maven/util/MavenToolTest.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- MavenToolTest.java 30 Jul 2003 00:50:37 -0000 1.1
+++ MavenToolTest.java 7 Aug 2003 16:54:25 -0000 1.1.4.1
@@ -70,7 +70,7 @@
{
/** fragment to be resolved */
private static final String NEEDLE =
- "org/apache/maven/MavenTool.java";
+ "org/apache/maven/util/MavenTool.java";
/** where to search for the fragment */
private static final String[] HAYSTACK =
{
1.1.4.1 +0 -0 maven/src/test/java/org/apache/maven/util/DVSLFormatterTest.java
Index: DVSLFormatterTest.java
===================================================================
RCS file:
/home/cvs/maven/src/test/java/org/apache/maven/util/DVSLFormatterTest.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
1.1.4.1 +2 -2 maven/src/test/java/org/apache/maven/util/DVSLPathToolTest.java
Index: DVSLPathToolTest.java
===================================================================
RCS file: /home/cvs/maven/src/test/java/org/apache/maven/util/DVSLPathToolTest.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
1.1.4.1 +0 -0 maven/src/test/java/org/apache/maven/util/StringToolTest.java
Index: StringToolTest.java
===================================================================
RCS file: /home/cvs/maven/src/test/java/org/apache/maven/util/StringToolTest.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
No revision
No revision
1.34.2.1 +1 -1
maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
Index: ProjectInheritanceTest.java
===================================================================
RCS file:
/home/cvs/maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -u -r1.34 -r1.34.2.1
--- ProjectInheritanceTest.java 25 Jul 2003 14:56:16 -0000 1.34
+++ ProjectInheritanceTest.java 7 Aug 2003 16:54:25 -0000 1.34.2.1
@@ -121,7 +121,7 @@
assertEquals( "dom4j:dom4j",
( (Dependency) p.getDependencies().get( 1 ) ).getId() );
- assertEquals( "1.4-dev-8",
+ assertEquals( "1.4",
( (Dependency) p.getDependencies().get( 1 ) ).getVersion() );
baseDir = p.getContext().findVariable("basedir").toString();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
