Author: bentmann
Date: Fri Dec 17 16:06:59 2010
New Revision: 1050435
URL: http://svn.apache.org/viewvc?rev=1050435&view=rev
Log:
o Decoupled ITs from layout of local repo
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/dep-with-import/
- copied from r1050355,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/local-repository/org/apache/maven/it/mng4347/dep-with-import/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/dep-with-import/maven-metadata.xml
- copied unchanged from r1050355,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/local-repository/org/apache/maven/it/mng4347/dep-with-import/maven-metadata-local.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/managed-dep/
- copied from r1050355,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/local-repository/org/apache/maven/it/mng4347/managed-dep/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/managed-dep/maven-metadata.xml
- copied unchanged from r1050355,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/local-repository/org/apache/maven/it/mng4347/managed-dep/maven-metadata-local.xml
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/local-repository/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/dep-with-import/maven-metadata-local.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/import-dep/1-SNAPSHOT/import-dep-1-20090909.201000-1.pom.sha1
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/import-dep/1-SNAPSHOT/maven-metadata.xml.sha1
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/it/mng4347/managed-dep/maven-metadata-local.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/settings-template.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/pom.xml?rev=1050435&r1=1050434&r2=1050435&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/pom.xml Fri Dec 17
16:06:59 2010
@@ -229,6 +229,30 @@ under the License.
</build>
</profile>
<profile>
+ <id>maven-repo-local-layout</id>
+ <activation>
+ <property>
+ <name>maven.repo.local.layout</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties combine.children="append">
+ <property>
+ <!-- Pass this through to the tests (if set!) to have them
pick the right repository layout -->
+ <name>maven.repo.local.layout</name>
+ <value>${maven.repo.local.layout}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>embedded</id>
<build>
<plugins>
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java?rev=1050435&r1=1050434&r2=1050435&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java
Fri Dec 17 16:06:59 2010
@@ -208,7 +208,7 @@ public class MavenIT0108SnapshotUpdateTe
private File getMetadataFile( String groupId, String artifactId, String
version )
{
- return new File( verifier.localRepo, groupId + "/" + artifactId + "/"
+ version + "/maven-metadata-local.xml" );
+ return new File( verifier.getArtifactMetadataPath( groupId,
artifactId, version, "maven-metadata-local.xml" ) );
}
private void assertArtifactContents( String s )
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java?rev=1050435&r1=1050434&r2=1050435&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java
Fri Dec 17 16:06:59 2010
@@ -57,16 +57,17 @@ public class MavenITmng2790LastUpdatedMe
* Phase 1: Install initial snapshot into local repo.
*/
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- File metadataArtifactVersionFile =
- new File( verifier.getArtifactMetadataPath(
"org.apache.maven.its.mng2790", "project", "1.0-SNAPSHOT" ) );
- File metadataArtifactFile =
- new File( verifier.getArtifactMetadataPath(
"org.apache.maven.its.mng2790", "project" ) );
- FileUtils.deleteDirectory( metadataArtifactFile.getParentFile() );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng2790" );
verifier.setAutoclean( false );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ File metadataArtifactVersionFile =
+ new File( verifier.getArtifactMetadataPath(
"org.apache.maven.its.mng2790", "project", "1.0-SNAPSHOT" ) );
+ File metadataArtifactFile =
+ new File( verifier.getArtifactMetadataPath(
"org.apache.maven.its.mng2790", "project" ) );
+
Date artifactVersionLastUpdated1 = getLastUpdated(
metadataArtifactVersionFile );
Date artifactLastUpdated1 = getLastUpdated( metadataArtifactFile );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java?rev=1050435&r1=1050434&r2=1050435&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
Fri Dec 17 16:06:59 2010
@@ -55,12 +55,12 @@ public class MavenITmng2926PluginPrefixO
verifier.deleteArtifacts( "org.apache.maven.its.mng2926" );
verifier.deleteArtifacts( "org.apache.maven.plugins", "mng-2926",
"0.1" );
verifier.deleteArtifacts( "org.apache.maven.plugins", "mng-2926",
"0.1" );
- new File( verifier.localRepo,
"org/apache/maven/plugins/maven-metadata-maven-core-it.xml" ).delete();
- new File( verifier.localRepo,
"org/apache/maven/plugins/resolver-status.properties" ).delete();
+ new File( verifier.getArtifactMetadataPath(
"org.apache.maven.plugins", null, null, "maven-metadata-maven-core-it.xml" )
).delete();
+ new File( verifier.getArtifactMetadataPath(
"org.apache.maven.plugins", null, null, "resolver-status.properties" )
).delete();
verifier.deleteArtifacts( "org.codehaus.mojo", "mng-2926", "0.1" );
verifier.deleteArtifacts( "org.codehaus.mojo", "mng-2926", "0.1" );
- new File( verifier.localRepo,
"org/codehaus/mojo/maven-metadata-maven-core-it.xml" ).delete();
- new File( verifier.localRepo,
"org/codehaus/mojo/resolver-status.properties" ).delete();
+ new File( verifier.getArtifactMetadataPath( "org.codehaus.mojo", null,
null, "maven-metadata-maven-core-it.xml" ) ).delete();
+ new File( verifier.getArtifactMetadataPath( "org.codehaus.mojo", null,
null, "resolver-status.properties" ) ).delete();
verifier.resetStreams();
verifier = newVerifier( testDir.getAbsolutePath() );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java?rev=1050435&r1=1050434&r2=1050435&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
Fri Dec 17 16:06:59 2010
@@ -20,9 +20,7 @@ package org.apache.maven.it;
*/
import java.io.File;
-import java.io.IOException;
-import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
/**
@@ -126,7 +124,7 @@ public class MavenITmng3379ParallelArtif
private void assertArtifact( Verifier verifier, String gid, String aid,
String ver, String cls, String ext, String sha1 )
throws Exception
{
- File file = getFile( verifier, gid, aid, ver, cls, ext );
+ File file = new File( verifier.getArtifactPath( gid, aid, ver, ext,
cls ) );
assertTrue( file.getAbsolutePath(), file.isFile() );
assertEquals( sha1, ItUtils.calcHash( file, "SHA-1" ) );
}
@@ -134,8 +132,8 @@ public class MavenITmng3379ParallelArtif
private void assertMetadata( Verifier verifier, String gid, String aid,
String ver, String sha1 )
throws Exception
{
- File file = getFile( verifier, gid, aid, ver, "", "pom" );
- file = new File( file.getParent(), "maven-metadata-maven-core-it.xml"
);
+ String name = "maven-metadata-maven-core-it.xml";
+ File file = new File( verifier.getArtifactMetadataPath( gid, aid, ver,
name ) );
assertTrue( file.getAbsolutePath(), file.isFile() );
assertEquals( sha1, ItUtils.calcHash( file, "SHA-1" ) );
}
@@ -143,26 +141,10 @@ public class MavenITmng3379ParallelArtif
private void assertMetadata( Verifier verifier, String gid, String aid,
String sha1 )
throws Exception
{
- File file = getFile( verifier, gid, aid, "0.2", "", "pom" );
- file = new File( file.getParentFile().getParent(),
"maven-metadata-maven-core-it.xml" );
+ String name = "maven-metadata-maven-core-it.xml";
+ File file = new File( verifier.getArtifactMetadataPath( gid, aid,
null, name ) );
assertTrue( file.getAbsolutePath(), file.isFile() );
assertEquals( sha1, ItUtils.calcHash( file, "SHA-1" ) );
}
- private File getFile( Verifier verifier, String gid, String aid, String
ver, String cls, String ext )
- {
- StringBuffer buffer = new StringBuffer( 256 );
- buffer.append( verifier.localRepo );
- buffer.append( '/' ).append( gid.replace( '.', '/' ) );
- buffer.append( '/' ).append( aid );
- buffer.append( '/' ).append( ver );
- buffer.append( '/' ).append( aid ).append( '-' ).append( ver );
- if ( cls != null && cls.length() > 0 )
- {
- buffer.append( '-' ).append( cls );
- }
- buffer.append( '.' ).append( ext );
- return new File( buffer.toString() );
- }
-
}
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java?rev=1050435&r1=1050434&r2=1050435&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
Fri Dec 17 16:06:59 2010
@@ -27,7 +27,6 @@ import org.apache.maven.it.util.Resource
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Properties;
@@ -101,9 +100,7 @@ public class MavenITmng3415JunkRepositor
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3415" );
- File localRepo = new File( verifier.localRepo );
-
- setupDummyDependency( testDir, localRepo, true );
+ setupDummyDependency( verifier, testDir, true );
Properties filterProps = verifier.newDefaultFilterProperties();
filterProps.put( "@protocol@", "invalid" );
@@ -119,9 +116,9 @@ public class MavenITmng3415JunkRepositor
verifier.verifyErrorFreeLog();
- assertMetadataMissing( localRepo );
+ assertMetadataMissing( verifier );
- setupDummyDependency( testDir, localRepo, true );
+ setupDummyDependency( verifier, testDir, true );
verifier.setLogFileName( "log-" + methodName + "-secondBuild.txt" );
verifier.executeGoal( "validate" );
@@ -129,7 +126,7 @@ public class MavenITmng3415JunkRepositor
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- assertMetadataMissing( localRepo );
+ assertMetadataMissing( verifier );
}
private String getMethodName()
@@ -173,8 +170,6 @@ public class MavenITmng3415JunkRepositor
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3415" );
- File localRepo = new File( verifier.localRepo );
-
final List requestUris = new ArrayList();
Handler repoHandler = new AbstractHandler()
@@ -208,7 +203,7 @@ public class MavenITmng3415JunkRepositor
verifier.getCliOptions().add( "-s" );
verifier.getCliOptions().add( settings.getName() );
- setupDummyDependency( testDir, localRepo, true );
+ setupDummyDependency( verifier, testDir, true );
verifier.setLogFileName( "log-" + methodName + "-firstBuild.txt" );
verifier.executeGoal( "validate" );
@@ -220,10 +215,10 @@ public class MavenITmng3415JunkRepositor
requestUris.clear();
- File updateCheckFile = getUpdateCheckFile( localRepo );
+ File updateCheckFile = getUpdateCheckFile( verifier );
long firstLastMod = updateCheckFile.lastModified();
- setupDummyDependency( testDir, localRepo, false );
+ setupDummyDependency( verifier, testDir, false );
verifier.setLogFileName( "log-" + methodName + "-secondBuild.txt"
);
verifier.executeGoal( "validate" );
@@ -242,82 +237,68 @@ public class MavenITmng3415JunkRepositor
}
}
- private void assertMetadataMissing( File localRepo )
+ private void assertMetadataMissing( Verifier verifier )
+ throws IOException
{
- File metadata = getMetadataFile( localRepo );
+ File metadata = getMetadataFile( verifier );
assertFalse( "Metadata file should NOT be present in local repository:
"
+ metadata.getAbsolutePath(), metadata.exists() );
}
- private void setupDummyDependency( File testDir,
- File localRepo,
- boolean resetUpdateInterval )
+ private void setupDummyDependency( Verifier verifier, File testDir,
boolean resetUpdateInterval )
throws VerificationException, IOException
{
- File metadata = getMetadataFile( localRepo );
-
- if ( resetUpdateInterval && metadata.exists() )
- {
- System.out.println( "Deleting metadata file: " + metadata );
- metadata.delete();
- }
-
- File resolverStatus = new File( metadata.getParentFile(),
"resolver-status.properties" );
+ String gid = "org.apache.maven.its.mng3415";
+ String aid = "missing";
+ String version = "1.0-SNAPSHOT";
- if ( resetUpdateInterval && resolverStatus.exists() )
+ if ( resetUpdateInterval )
{
- System.out.println( "Deleting resolver-status.properties file
related to: " + metadata );
- resolverStatus.delete();
+ verifier.deleteArtifacts( gid );
}
- File dir = metadata.getParentFile();
-
- System.out.println( "Setting up dependency POM in: " + dir );
-
- File pom = new File( dir, "missing-1.0-SNAPSHOT.pom" );
-
- if ( pom.exists() )
- {
- System.out.println( "Deleting pre-existing POM: " + pom );
- pom.delete();
- }
+ File pom = new File( verifier.getArtifactPath( gid, aid, version,
"pom" ) );
File pomSrc = new File( testDir, "dependency-pom.xml" );
System.out.println( "Copying dependency POM\nfrom: " + pomSrc + "\nto:
" + pom );
-
FileUtils.copyFile( pomSrc, pom );
}
- private File getMetadataFile( File localRepo )
+ private File getMetadataFile( Verifier verifier )
+ throws IOException
{
- File dir = new File( localRepo,
"org/apache/maven/its/mng3415/missing/1.0-SNAPSHOT" );
+ String gid = "org.apache.maven.its.mng3415";
+ String aid = "missing";
+ String version = "1.0-SNAPSHOT";
+ String name = "maven-metadata-testing-repo.xml";
- dir.mkdirs();
-
- return new File( dir, "maven-metadata-testing-repo.xml" );
+ return new File( verifier.getArtifactMetadataPath( gid, aid, version,
name ) );
}
/**
* If the current maven version is < 3.0, we'll use the metadata file
itself (old maven-artifact code)...
* otherwise, use the new resolver-status.properties file (new artifact
code).
*/
- private File getUpdateCheckFile( File localRepo )
+ private File getUpdateCheckFile( Verifier verifier )
{
- File dir = new File( localRepo,
"org/apache/maven/its/mng3415/missing/1.0-SNAPSHOT" );
-
- dir.mkdirs();
+ String gid = "org.apache.maven.its.mng3415";
+ String aid = "missing";
+ String version = "1.0-SNAPSHOT";
+ String name;
// < 3.0 (including snapshots)
if ( matchesVersionRange( "(2.0.8,3.0-alpha-1)" ) )
{
- return new File( dir, "maven-metadata-testing-repo.xml" );
+ name = "maven-metadata-testing-repo.xml";
}
else
{
- return new File( dir, "resolver-status.properties" );
+ name = "resolver-status.properties";
}
+
+ return new File( verifier.getArtifactMetadataPath( gid, aid, version,
name ) );
}
}
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java?rev=1050435&r1=1050434&r2=1050435&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java
Fri Dec 17 16:06:59 2010
@@ -20,7 +20,6 @@ package org.apache.maven.it;
*/
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.FileUtils;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
@@ -51,15 +50,9 @@ public class MavenITmng4347ImportScopeWi
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- String localRepo = verifier.localRepo;
- File dest = new File( localRepo );
- File src = new File( testDir, "local-repository" );
-
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.it.mng4347" );
- FileUtils.copyDirectoryStructure( src, dest );
-
verifier.setAutoclean( false );
verifier.getCliOptions().add( "-s" );
@@ -72,4 +65,5 @@ public class MavenITmng4347ImportScopeWi
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
+
}
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java?rev=1050435&r1=1050434&r2=1050435&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java
Fri Dec 17 16:06:59 2010
@@ -100,7 +100,7 @@ public class MavenITmng4554PluginPrefixM
catch ( IOException e )
{
// expected when running test on Windows using embedded Maven
(JAR files locked by plugin class realm)
- assertFalse( new File( verifier.localRepo,
"org/apache.maven.its.mng4554/maven-metadata-mng4554.xml" ).exists() );
+ assertFalse( new File( verifier.getArtifactMetadataPath(
"org.apache.maven.its.mng4554", null, null, "maven-metadata-mng4554.xml" )
).exists() );
}
Properties filterProps = verifier.newDefaultFilterProperties();
filterProps.setProperty( "@port@", Integer.toString(
server.getConnectors()[0].getLocalPort() ) );
@@ -177,7 +177,7 @@ public class MavenITmng4554PluginPrefixM
catch ( IOException e )
{
// expected when running test on Windows using embedded Maven
(JAR files locked by plugin class realm)
- assertFalse( new File( verifier.localRepo,
"org/apache.maven.its.mng4554/maven-metadata-mng4554.xml" ).exists() );
+ assertFalse( new File( verifier.getArtifactMetadataPath(
"org.apache.maven.its.mng4554", null, null, "maven-metadata-mng4554.xml" )
).exists() );
}
Properties filterProps = verifier.newDefaultFilterProperties();
filterProps.setProperty( "@port@", Integer.toString(
server.getConnectors()[0].getLocalPort() ) );
@@ -257,7 +257,7 @@ public class MavenITmng4554PluginPrefixM
catch ( IOException e )
{
// expected when running test on Windows using embedded Maven
(JAR files locked by plugin class realm)
- assertFalse( new File( verifier.localRepo,
"org/apache.maven.its.mng4554/maven-metadata-mng4554.xml" ).exists() );
+ assertFalse( new File( verifier.getArtifactMetadataPath(
"org.apache.maven.its.mng4554", null, null, "maven-metadata-mng4554.xml" )
).exists() );
}
Properties filterProps = verifier.newDefaultFilterProperties();
filterProps.setProperty( "@port@", Integer.toString(
server.getConnectors()[0].getLocalPort() ) );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/settings-template.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/settings-template.xml?rev=1050435&r1=1050434&r2=1050435&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/settings-template.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4347/settings-template.xml
Fri Dec 17 16:06:59 2010
@@ -30,9 +30,11 @@ under the License.
<url>@baseurl@/remote-repository</url>
<releases>
<enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
</releases>
<snapshots>
<enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
</snapshots>
</repository>
</repositories>
@@ -42,9 +44,11 @@ under the License.
<url>@baseurl@/remote-repository</url>
<releases>
<enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
</releases>
<snapshots>
<enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
</snapshots>
</pluginRepository>
</pluginRepositories>
