You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/02/21 11:27:32 UTC
svn commit: r379412 - in /maven/components:
branches/maven-2.0.x/maven-core-it/it0088/
branches/maven-2.0.x/maven-core-it/it0088/src/test/java/org/apache/maven/it0088/
trunk/maven-core-it/it0088/
trunk/maven-core-it/it0088/src/test/java/org/apache/mave...
Author: brett
Date: Tue Feb 21 02:27:29 2006
New Revision: 379412
URL: http://svn.apache.org/viewcvs?rev=379412&view=rev
Log:
undo previous change to test. It seems this was working on 2 other windows boxes, so I must have something funky.
Modified:
maven/components/branches/maven-2.0.x/maven-core-it/it0088/pom.xml
maven/components/branches/maven-2.0.x/maven-core-it/it0088/src/test/java/org/apache/maven/it0088/PomInterpolationTest.java
maven/components/trunk/maven-core-it/it0088/pom.xml
maven/components/trunk/maven-core-it/it0088/src/test/java/org/apache/maven/it0088/PomInterpolationTest.java
Modified: maven/components/branches/maven-2.0.x/maven-core-it/it0088/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-core-it/it0088/pom.xml?rev=379412&r1=379411&r2=379412&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core-it/it0088/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-core-it/it0088/pom.xml Tue Feb 21 02:27:29 2006
@@ -11,12 +11,6 @@
<type>jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<resources>
Modified: maven/components/branches/maven-2.0.x/maven-core-it/it0088/src/test/java/org/apache/maven/it0088/PomInterpolationTest.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-core-it/it0088/src/test/java/org/apache/maven/it0088/PomInterpolationTest.java?rev=379412&r1=379411&r2=379412&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core-it/it0088/src/test/java/org/apache/maven/it0088/PomInterpolationTest.java (original)
+++ maven/components/branches/maven-2.0.x/maven-core-it/it0088/src/test/java/org/apache/maven/it0088/PomInterpolationTest.java Tue Feb 21 02:27:29 2006
@@ -6,10 +6,6 @@
import java.io.File;
import java.io.FileInputStream;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringInputStream;
-import org.codehaus.plexus.util.StringUtils;
-
public class PomInterpolationTest
extends TestCase
{
@@ -30,12 +26,7 @@
assertTrue( testPropertiesFile.exists() );
- String content = FileUtils.fileRead( testPropertiesFile );
-
- // Properties files need \\ escaped
- content = StringUtils.replace( content, "\\", "\\\\" );
-
- testProperties.load( new StringInputStream( content ) );
+ testProperties.load( new FileInputStream( testPropertiesFile ) );
File projectBuildDirectory = new File( basedir, "target" );
Modified: maven/components/trunk/maven-core-it/it0088/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0088/pom.xml?rev=379412&r1=379411&r2=379412&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/it0088/pom.xml (original)
+++ maven/components/trunk/maven-core-it/it0088/pom.xml Tue Feb 21 02:27:29 2006
@@ -11,12 +11,6 @@
<type>jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<resources>
Modified: maven/components/trunk/maven-core-it/it0088/src/test/java/org/apache/maven/it0088/PomInterpolationTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0088/src/test/java/org/apache/maven/it0088/PomInterpolationTest.java?rev=379412&r1=379411&r2=379412&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/it0088/src/test/java/org/apache/maven/it0088/PomInterpolationTest.java (original)
+++ maven/components/trunk/maven-core-it/it0088/src/test/java/org/apache/maven/it0088/PomInterpolationTest.java Tue Feb 21 02:27:29 2006
@@ -6,10 +6,6 @@
import java.io.File;
import java.io.FileInputStream;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringInputStream;
-import org.codehaus.plexus.util.StringUtils;
-
public class PomInterpolationTest
extends TestCase
{
@@ -30,12 +26,7 @@
assertTrue( testPropertiesFile.exists() );
- String content = FileUtils.fileRead( testPropertiesFile );
-
- // Properties files need \\ escaped
- content = StringUtils.replace( content, "\\", "\\\\" );
-
- testProperties.load( new StringInputStream( content ) );
+ testProperties.load( new FileInputStream( testPropertiesFile ) );
File projectBuildDirectory = new File( basedir, "target" );