Author: bentmann
Date: Fri Mar 13 17:40:53 2009
New Revision: 753324
URL: http://svn.apache.org/viewvc?rev=753324&view=rev
Log:
o Moved repository declarations to settings
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3139/pom.xml
- copied, changed from r753224,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3139/pom-template.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3139/settings-template.xml
(with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3139/pom-template.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java?rev=753324&r1=753323&r2=753324&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java
Fri Mar 13 17:40:53 2009
@@ -48,21 +48,32 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-3139" );
+ // phase 1: get the metadata into the local repo
+
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng3139" );
- verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8",
verifier.newDefaultFilterProperties() );
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8",
verifier.newDefaultFilterProperties() );
verifier.setLogFileName( "log1.txt" );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ // phase 2: trigger blacklisting of repo (by invalid URL) and check
previously downloaded metadata is stil used
- verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8",
+ verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+
+ verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8",
Collections.singletonMap( "@baseurl@", "http://localhost:63412"; )
);
verifier.setLogFileName( "log2.txt" );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
-
verifier.resetStreams();
}
Copied:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3139/pom.xml
(from r753224,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3139/pom-template.xml)
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3139/pom.xml?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3139/pom.xml&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3139/pom-template.xml&r1=753224&r2=753324&rev=753324&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3139/pom-template.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3139/pom.xml
Fri Mar 13 17:40:53 2009
@@ -32,21 +32,6 @@
Test that locally cached metadata of blacklisted repositories is consulted
to resolve metaversions.
</description>
- <repositories>
- <repository>
- <id>maven-core-it</id>
- <url>@baseurl@/repo</url>
- <releases>
- <checksumPolicy>ignore</checksumPolicy>
- <!-- NOTE: Enforce update check to trigger trip to repo. -->
- <updatePolicy>always</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.maven.its.mng3139</groupId>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3139/settings-template.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3139/settings-template.xml?rev=753324&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3139/settings-template.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3139/settings-template.xml
Fri Mar 13 17:40:53 2009
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<settings>
+ <mirrors>
+ <mirror>
+ <!-- Make sure central isn't touched -->
+ <id>central</id>
+ <url>@baseurl@/null</url>
+ <mirrorOf>central</mirrorOf>
+ </mirror>
+ </mirrors>
+ <profiles>
+ <profile>
+ <id>maven-core-it-repo</id>
+ <repositories>
+ <repository>
+ <id>maven-core-it</id>
+ <url>@baseurl@/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ <!-- NOTE: Enforce update check to trigger trip to repo. -->
+ <updatePolicy>always</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
+ <activeProfiles>
+ <activeProfile>maven-core-it-repo</activeProfile>
+ </activeProfiles>
+</settings>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3139/settings-template.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3139/settings-template.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
