You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2006/12/13 00:24:41 UTC
svn commit: r486408 - in /maven/continuum/trunk/continuum-data-management:
pom.xml
src/test/java/org/apache/maven/continuum/management/DataManagementToolTest.java
src/test/resources/expected.xml
Author: brett
Date: Tue Dec 12 15:24:38 2006
New Revision: 486408
URL: http://svn.apache.org/viewvc?view=rev&rev=486408
Log:
fix build on windows
Modified:
maven/continuum/trunk/continuum-data-management/pom.xml
maven/continuum/trunk/continuum-data-management/src/test/java/org/apache/maven/continuum/management/DataManagementToolTest.java
maven/continuum/trunk/continuum-data-management/src/test/resources/expected.xml
Modified: maven/continuum/trunk/continuum-data-management/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-data-management/pom.xml?view=diff&rev=486408&r1=486407&r2=486408
==============================================================================
--- maven/continuum/trunk/continuum-data-management/pom.xml (original)
+++ maven/continuum/trunk/continuum-data-management/pom.xml Tue Dec 12 15:24:38 2006
@@ -52,10 +52,16 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.1.0</version>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>1.1.1-dev</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xmlbeans-jsr173-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<build>
Modified: maven/continuum/trunk/continuum-data-management/src/test/java/org/apache/maven/continuum/management/DataManagementToolTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-data-management/src/test/java/org/apache/maven/continuum/management/DataManagementToolTest.java?view=diff&rev=486408&r1=486407&r2=486408
==============================================================================
--- maven/continuum/trunk/continuum-data-management/src/test/java/org/apache/maven/continuum/management/DataManagementToolTest.java (original)
+++ maven/continuum/trunk/continuum-data-management/src/test/java/org/apache/maven/continuum/management/DataManagementToolTest.java Tue Dec 12 15:24:38 2006
@@ -140,8 +140,22 @@
private static String removeTimestampVariance( String content )
{
- return removeTagContent(
- removeTagContent( removeTagContent( removeTagContent( content, "startTime" ), "endTime" ), "date" ), "id" );
+ return fixXmlQuotes( removeTagContent(
+ removeTagContent( removeTagContent( removeTagContent( content, "startTime" ), "endTime" ), "date" ), "id" ) );
+ }
+
+ private static String fixXmlQuotes( String s )
+ {
+ if ( s.startsWith( "<?xml version='1.0' encoding='UTF-8'?>"))
+ {
+ return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + s.substring( "<?xml version='1.0' encoding='UTF-8'?>".length() );
+ }
+ return cleanLineEndings( s );
+ }
+
+ private static String cleanLineEndings( String s )
+ {
+ return s.replaceAll( "\r\n", "\n" );
}
private static String removeTagContent( String content, String field )
Modified: maven/continuum/trunk/continuum-data-management/src/test/resources/expected.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-data-management/src/test/resources/expected.xml?view=diff&rev=486408&r1=486407&r2=486408
==============================================================================
--- maven/continuum/trunk/continuum-data-management/src/test/resources/expected.xml (original)
+++ maven/continuum/trunk/continuum-data-management/src/test/resources/expected.xml Tue Dec 12 15:24:38 2006
@@ -20,7 +20,7 @@
<workingDirectory>workingDirectory1</workingDirectory>
<buildResults>
<buildResult>
- <project id="1" />
+ <project id="1"></project>
<id>1</id>
<buildNumber>1</buildNumber>
<state>1</state>
@@ -77,7 +77,7 @@
</scmResult>
</buildResult>
<buildResult>
- <project id="1" />
+ <project id="1"></project>
<id>2</id>
<buildNumber>2</buildNumber>
<state>2</state>
@@ -152,7 +152,7 @@
<version>version2</version>
</dependency>
</dependencies>
- <projectGroup id="1" />
+ <projectGroup id="1"></projectGroup>
<notifiers>
<notifier>
<id>3</id>
@@ -171,16 +171,16 @@
<goals>goals11</goals>
<arguments>arguments11</arguments>
<buildFile>buildFile11</buildFile>
- <schedule id="2" />
- <profile id="2" />
+ <schedule id="2"></schedule>
+ <profile id="2"></profile>
</buildDefinition>
<buildDefinition>
<id>2</id>
<goals>goals12</goals>
<arguments>arguments12</arguments>
<buildFile>buildFile12</buildFile>
- <schedule id="1" />
- <profile id="2" />
+ <schedule id="1"></schedule>
+ <profile id="2"></profile>
</buildDefinition>
</buildDefinitions>
</project>
@@ -197,7 +197,7 @@
<workingDirectory>workingDirectory2</workingDirectory>
<buildResults>
<buildResult>
- <project id="2" />
+ <project id="2"></project>
<id>3</id>
<buildNumber>3</buildNumber>
<state>3</state>
@@ -275,7 +275,7 @@
<version>version3</version>
</dependency>
</dependencies>
- <projectGroup id="1" />
+ <projectGroup id="1"></projectGroup>
<notifiers>
<notifier>
<id>4</id>
@@ -306,8 +306,8 @@
<goals>goals13</goals>
<arguments>arguments13</arguments>
<buildFile>buildFile13</buildFile>
- <schedule id="1" />
- <profile id="1" />
+ <schedule id="1"></schedule>
+ <profile id="1"></profile>
</buildDefinition>
<buildDefinition>
<id>8</id>
@@ -345,8 +345,8 @@
<goals>goals1</goals>
<arguments>arguments1</arguments>
<buildFile>buildFile1</buildFile>
- <schedule id="1" />
- <profile id="1" />
+ <schedule id="1"></schedule>
+ <profile id="1"></profile>
</buildDefinition>
</buildDefinitions>
</projectGroup>
@@ -374,16 +374,16 @@
<goals>goals2</goals>
<arguments>arguments2</arguments>
<buildFile>buildFile2</buildFile>
- <schedule id="2" />
- <profile id="1" />
+ <schedule id="2"></schedule>
+ <profile id="1"></profile>
</buildDefinition>
<buildDefinition>
<id>6</id>
<goals>goals3</goals>
<arguments>arguments3</arguments>
<buildFile>buildFile3</buildFile>
- <schedule id="2" />
- <profile id="2" />
+ <schedule id="2"></schedule>
+ <profile id="2"></profile>
</buildDefinition>
<buildDefinition>
<id>7</id>
@@ -453,8 +453,8 @@
<description>description1</description>
<scmMode>1</scmMode>
<buildWithoutChanges>true</buildWithoutChanges>
- <jdk name="JDK 1.3" />
- <builder name="Maven 2.0 alpha 3" />
+ <jdk name="JDK 1.3"></jdk>
+ <builder name="Maven 2.0 alpha 3"></builder>
</profile>
<profile>
<id>2</id>
@@ -462,8 +462,8 @@
<name>name2</name>
<description>description2</description>
<scmMode>2</scmMode>
- <jdk name="JDK 1.4" />
- <builder name="Maven 2.0 alpha 3" />
+ <jdk name="JDK 1.4"></jdk>
+ <builder name="Maven 2.0 alpha 3"></builder>
</profile>
<profile>
<id>3</id>
@@ -471,8 +471,8 @@
<description>description3</description>
<scmMode>3</scmMode>
<buildWithoutChanges>true</buildWithoutChanges>
- <jdk name="JDK 1.4" />
- <builder name="Maven 2.0 alpha 3" />
+ <jdk name="JDK 1.4"></jdk>
+ <builder name="Maven 2.0 alpha 3"></builder>
</profile>
</profiles>
-</continuumDatabase>
\ No newline at end of file
+</continuumDatabase>