diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index 852369f779..3d82bd6660 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -85,6 +85,7 @@ public class IntegrationTestSuite // suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class ); // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng4489MirroringOfExtensionRepoTest.class ); suite.addTestSuite( MavenITmng4488ValidateExternalParenPomLenientTest.class ); suite.addTestSuite( MavenITmng4482ForcePluginSnapshotUpdateTest.class ); suite.addTestSuite( MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java new file mode 100644 index 0000000000..c23c9db7a8 --- /dev/null +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java @@ -0,0 +1,113 @@ +package org.apache.maven.it; + +/* + * 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. + */ + +import org.apache.maven.it.Verifier; +import org.apache.maven.it.util.ResourceExtractor; + +import java.io.File; +import java.util.Properties; + +import org.mortbay.jetty.Server; +import org.mortbay.jetty.handler.DefaultHandler; +import org.mortbay.jetty.handler.HandlerList; +import org.mortbay.jetty.handler.ResourceHandler; +import org.mortbay.jetty.security.Constraint; +import org.mortbay.jetty.security.ConstraintMapping; +import org.mortbay.jetty.security.HashUserRealm; +import org.mortbay.jetty.security.SecurityHandler; + +/** + * This is a test set for MNG-4489. + * + * @author Benjamin Bentmann + */ +public class MavenITmng4489MirroringOfExtensionRepoTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng4489MirroringOfExtensionRepoTest() + { + super( "[2.0.3,3.0-alpha-1),[3.0-alpha-6,)" ); + } + + /** + * Test that repositories contributed by extension POMs during transitive dependency resolution are subject to + * mirror and authentication configuration. + */ + public void testit() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4489" ); + + Constraint constraint = new Constraint(); + constraint.setName( Constraint.__BASIC_AUTH ); + constraint.setRoles( new String[] { "user" } ); + constraint.setAuthenticate( true ); + + ConstraintMapping constraintMapping = new ConstraintMapping(); + constraintMapping.setConstraint( constraint ); + constraintMapping.setPathSpec( "/*" ); + + HashUserRealm userRealm = new HashUserRealm( "TestRealm" ); + userRealm.put( "testuser", "testtest" ); + userRealm.addUserToRole( "testuser", "user" ); + + SecurityHandler securityHandler = new SecurityHandler(); + securityHandler.setUserRealm( userRealm ); + securityHandler.setConstraintMappings( new ConstraintMapping[] { constraintMapping } ); + + ResourceHandler repoHandler = new ResourceHandler(); + repoHandler.setResourceBase( testDir.getAbsolutePath() ); + + HandlerList handlerList = new HandlerList(); + handlerList.addHandler( securityHandler ); + handlerList.addHandler( repoHandler ); + handlerList.addHandler( new DefaultHandler() ); + + Server server = new Server( 0 ); + server.setHandler( handlerList ); + server.start(); + + try + { + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng4489" ); + Properties filterProps = verifier.newDefaultFilterProperties(); + filterProps.setProperty( "@port@", Integer.toString( server.getConnectors()[0].getLocalPort() ) ); + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps ); + verifier.getCliOptions().add( "-s" ); + verifier.getCliOptions().add( "settings.xml" ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + verifier.assertArtifactPresent( "org.apache.maven.its.mng4489", "ext-dep", "0.1", "jar" ); + verifier.assertArtifactPresent( "org.apache.maven.its.mng4489", "ext-dep", "0.1", "pom" ); + } + finally + { + server.stop(); + } + } + +} diff --git a/its/core-it-suite/src/test/resources/mng-4489/pom.xml b/its/core-it-suite/src/test/resources/mng-4489/pom.xml new file mode 100644 index 0000000000..1eb33a747d --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4489/pom.xml @@ -0,0 +1,54 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4489 + test + 0.1 + + Maven Integration Test :: MNG-4489 + + Test that repositories contributed by extension POMs during transitive dependency resolution are subject to + mirror and authentication configuration. + + + + + + + org.apache.maven.its.mng4489 + ext + 0.1 + true + + + validate + + test + + + + + + + diff --git a/its/core-it-suite/src/test/resources/mng-4489/repo-a/org/apache/maven/its/mng4489/ext/0.1/ext-0.1.jar b/its/core-it-suite/src/test/resources/mng-4489/repo-a/org/apache/maven/its/mng4489/ext/0.1/ext-0.1.jar new file mode 100644 index 0000000000..768fe47226 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-4489/repo-a/org/apache/maven/its/mng4489/ext/0.1/ext-0.1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-4489/repo-a/org/apache/maven/its/mng4489/ext/0.1/ext-0.1.pom b/its/core-it-suite/src/test/resources/mng-4489/repo-a/org/apache/maven/its/mng4489/ext/0.1/ext-0.1.pom new file mode 100644 index 0000000000..28905b4e1d --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4489/repo-a/org/apache/maven/its/mng4489/ext/0.1/ext-0.1.pom @@ -0,0 +1,81 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4489 + ext + 0.1 + maven-plugin + + Maven Integration Test :: MNG-4489 + + + + maven-core-it + file:///${basedir}/repo + + + + + + org.apache.maven + maven-plugin-api + 2.0 + + + + org.apache.maven.its.mng4489 + ext-dep + 0.1 + + + + + + + maven-core-it-repo-b + http://bad.host/null + + ignore + + + false + + + + + + + + . + + pom.xml + src/** + + + + src/main/resources + + + + diff --git a/its/core-it-suite/src/test/resources/mng-4489/repo-a/org/apache/maven/its/mng4489/ext/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-4489/repo-a/org/apache/maven/its/mng4489/ext/maven-metadata.xml new file mode 100644 index 0000000000..f32469c8b6 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4489/repo-a/org/apache/maven/its/mng4489/ext/maven-metadata.xml @@ -0,0 +1,14 @@ + + + org.apache.maven.its.mng4489 + ext + 0.1 + + 0.1 + 0.1 + + 0.1 + + 20091210223136 + + diff --git a/its/core-it-suite/src/test/resources/mng-4489/repo-a/org/apache/maven/its/mng4489/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-4489/repo-a/org/apache/maven/its/mng4489/maven-metadata.xml new file mode 100644 index 0000000000..fd322c0709 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4489/repo-a/org/apache/maven/its/mng4489/maven-metadata.xml @@ -0,0 +1,10 @@ + + + + + Maven Integration Test :: MNG-4489 + ext + ext + + + diff --git a/its/core-it-suite/src/test/resources/mng-4489/repo-b/org/apache/maven/its/mng4489/ext-dep/0.1/ext-dep-0.1.jar b/its/core-it-suite/src/test/resources/mng-4489/repo-b/org/apache/maven/its/mng4489/ext-dep/0.1/ext-dep-0.1.jar new file mode 100644 index 0000000000..055d6c1257 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-4489/repo-b/org/apache/maven/its/mng4489/ext-dep/0.1/ext-dep-0.1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-4489/repo-b/org/apache/maven/its/mng4489/ext-dep/0.1/ext-dep-0.1.pom b/its/core-it-suite/src/test/resources/mng-4489/repo-b/org/apache/maven/its/mng4489/ext-dep/0.1/ext-dep-0.1.pom new file mode 100644 index 0000000000..1829cf1959 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4489/repo-b/org/apache/maven/its/mng4489/ext-dep/0.1/ext-dep-0.1.pom @@ -0,0 +1,38 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4489 + ext-dep + 0.1 + jar + + Maven Integration Test :: MNG-4489 + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-4489/repo-b/org/apache/maven/its/mng4489/ext-dep/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-4489/repo-b/org/apache/maven/its/mng4489/ext-dep/maven-metadata.xml new file mode 100644 index 0000000000..775c82973e --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4489/repo-b/org/apache/maven/its/mng4489/ext-dep/maven-metadata.xml @@ -0,0 +1,13 @@ + + + org.apache.maven.its.mng4489 + ext-dep + 0.1 + + 0.1 + + 0.1 + + 20091210222050 + + diff --git a/its/core-it-suite/src/test/resources/mng-4489/settings-template.xml b/its/core-it-suite/src/test/resources/mng-4489/settings-template.xml new file mode 100644 index 0000000000..95f044c621 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4489/settings-template.xml @@ -0,0 +1,86 @@ + + + + + + + + + it-mirror + maven-core-it-repo-b + http://bad.host/repo-b + + + central-mirror + central + @baseurl@/target/null + + + + + + true + http + localhost + @port@ + proxyuser + proxypass + + + + + it-mirror + testuser + testtest + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/repo-a + + ignore + + + false + + + + + + maven-core-it + @baseurl@/repo-a + + ignore + + + false + + + + + + + maven-core-it-repo + +