You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/10/18 14:08:33 UTC
svn commit: r826418 - in
/maven/resources/trunk/apache-source-release-assembly-descriptor: ./
src/test/java/org/apache/its/util/ src/test/resources/basics/
src/test/resources/build-output-dir/ src/test/resources/ide-excludes/
src/test/resources/misc-ex...
Author: bentmann
Date: Sun Oct 18 12:08:33 2009
New Revision: 826418
URL: http://svn.apache.org/viewvc?rev=826418&view=rev
Log:
o Fixed ITs
Modified:
maven/resources/trunk/apache-source-release-assembly-descriptor/pom.xml
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/util/TestUtils.java
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/basics/pom.xml
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/build-output-dir/pom.xml
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/ide-excludes/pom.xml
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/pom.xml
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/pom.xml.releaseBackup
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/shared-resources/pom.xml
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/src-contains-output-dir-name/pom.xml
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/pom.xml?rev=826418&r1=826417&r2=826418&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/pom.xml (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/pom.xml Sun Oct 18 12:08:33 2009
@@ -124,15 +124,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.maven.its</groupId>
- <artifactId>maven-it-helper</artifactId>
- <version>2.1-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-verifier</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -154,7 +148,7 @@
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<executions>
<execution>
<id>install-descriptor</id>
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/util/TestUtils.java
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/util/TestUtils.java?rev=826418&r1=826417&r2=826418&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/util/TestUtils.java (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/util/TestUtils.java Sun Oct 18 12:08:33 2009
@@ -23,10 +23,7 @@
childPath = "/" + childPath;
}
- return ( artifactId + "-" + version + "/" + artifactId + "-" + childName + childPath ).replace( '\\',
- File.separatorChar )
- .replace( '/',
- File.separatorChar );
+ return ( artifactId + "-" + version + "/" + artifactId + "-" + childName + childPath );
}
public static String archivePathFromProject( String artifactId, String version, String path )
@@ -36,7 +33,7 @@
path = "/" + path;
}
- return ( artifactId + "-" + version + path ).replace( '\\', File.separatorChar ).replace( '/', File.separatorChar );
+ return ( artifactId + "-" + version + path );
}
// @SuppressWarnings( "unchecked" )
@@ -72,6 +69,8 @@
}
}
+ zf.close();
+
if ( !missing.isEmpty() || !banViolations.isEmpty() )
{
StringBuffer msg = new StringBuffer();
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/basics/pom.xml
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/basics/pom.xml?rev=826418&r1=826417&r2=826418&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/basics/pom.xml (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/basics/pom.xml Sun Oct 18 12:08:33 2009
@@ -18,7 +18,7 @@
<dependencies>
<dependency>
- <groupId>org.apache</groupId>
+ <groupId>org.apache.apache.resources</groupId>
<artifactId>apache-source-release-assembly-descriptor</artifactId>
<version>@project.version@</version>
</dependency>
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/build-output-dir/pom.xml
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/build-output-dir/pom.xml?rev=826418&r1=826417&r2=826418&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/build-output-dir/pom.xml (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/build-output-dir/pom.xml Sun Oct 18 12:08:33 2009
@@ -18,7 +18,7 @@
<dependencies>
<dependency>
- <groupId>org.apache</groupId>
+ <groupId>org.apache.apache.resources</groupId>
<artifactId>apache-source-release-assembly-descriptor</artifactId>
<version>@project.version@</version>
</dependency>
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/ide-excludes/pom.xml
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/ide-excludes/pom.xml?rev=826418&r1=826417&r2=826418&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/ide-excludes/pom.xml (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/ide-excludes/pom.xml Sun Oct 18 12:08:33 2009
@@ -18,7 +18,7 @@
<dependencies>
<dependency>
- <groupId>org.apache</groupId>
+ <groupId>org.apache.apache.resources</groupId>
<artifactId>apache-source-release-assembly-descriptor</artifactId>
<version>@project.version@</version>
</dependency>
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/pom.xml
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/pom.xml?rev=826418&r1=826417&r2=826418&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/pom.xml (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/pom.xml Sun Oct 18 12:08:33 2009
@@ -18,7 +18,7 @@
<dependencies>
<dependency>
- <groupId>org.apache</groupId>
+ <groupId>org.apache.apache.resources</groupId>
<artifactId>apache-source-release-assembly-descriptor</artifactId>
<version>@project.version@</version>
</dependency>
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/pom.xml.releaseBackup
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/pom.xml.releaseBackup?rev=826418&r1=826417&r2=826418&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/pom.xml.releaseBackup (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/pom.xml.releaseBackup Sun Oct 18 12:08:33 2009
@@ -18,7 +18,7 @@
<dependencies>
<dependency>
- <groupId>org.apache</groupId>
+ <groupId>org.apache.apache.resources</groupId>
<artifactId>apache-source-release-assembly-descriptor</artifactId>
<version>@project.version@</version>
</dependency>
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/shared-resources/pom.xml
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/shared-resources/pom.xml?rev=826418&r1=826417&r2=826418&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/shared-resources/pom.xml (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/shared-resources/pom.xml Sun Oct 18 12:08:33 2009
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
- <groupId>org.apache</groupId>
+ <groupId>org.apache.apache.resources</groupId>
<artifactId>apache-source-release-assembly-descriptor</artifactId>
<version>@project.version@</version>
</dependency>
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/src-contains-output-dir-name/pom.xml
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/src-contains-output-dir-name/pom.xml?rev=826418&r1=826417&r2=826418&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/src-contains-output-dir-name/pom.xml (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/src-contains-output-dir-name/pom.xml Sun Oct 18 12:08:33 2009
@@ -18,7 +18,7 @@
<dependencies>
<dependency>
- <groupId>org.apache</groupId>
+ <groupId>org.apache.apache.resources</groupId>
<artifactId>apache-source-release-assembly-descriptor</artifactId>
<version>@project.version@</version>
</dependency>