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 2515834696..a10874e404 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 @@ -290,6 +290,7 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng2739RequiredRepositoryElementsTest.class ); suite.addTestSuite( MavenITmng2720SiblingClasspathArtifactsTest.class ); suite.addTestSuite( MavenITmng2695OfflinePluginSnapshotsTest.class ); + suite.addTestSuite( MavenITmng2693SitePluginRealmTest.class ); suite.addTestSuite( MavenITmng2690MojoLoadingErrorsTest.class ); suite.addTestSuite( MavenITmng2668UsePluginDependenciesForSortingTest.class ); suite.addTestSuite( MavenITmng2605BogusProfileActivationTest.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java new file mode 100644 index 0000000000..82e7bc4499 --- /dev/null +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java @@ -0,0 +1,71 @@ +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; + +/** + * This is a test set for MNG-2693. + * + * @author Benjamin Bentmann + */ +public class MavenITmng2693SitePluginRealmTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng2693SitePluginRealmTest() + { + super( "(2.0.2,)" ); + } + + /** + * Verify that a plugin class/resource can be loaded from the plugin realm, also during the site lifecycle. + */ + public void testit() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2693" ); + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.executeGoal( "pre-site" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + Properties pclProps = verifier.loadProperties( "target/pcl.properties" ); + assertNotNull( pclProps.getProperty( "org.apache.maven.plugin.coreit.ClassA" ) ); + assertNotNull( pclProps.getProperty( "org.apache.maven.plugin.coreit.ClassB" ) ); + assertNotNull( pclProps.getProperty( "org.apache.maven.plugin.coreit.SomeClass" ) ); + assertNotNull( pclProps.getProperty( "org/apache/maven/plugin/coreit/a.properties" ) ); + assertEquals( "1", pclProps.getProperty( "org/apache/maven/plugin/coreit/a.properties.count" ) ); + assertNotNull( pclProps.getProperty( "org/apache/maven/plugin/coreit/b.properties" ) ); + assertEquals( "1", pclProps.getProperty( "org/apache/maven/plugin/coreit/b.properties.count" ) ); + assertNotNull( pclProps.getProperty( "org/apache/maven/plugin/coreit/it.properties" ) ); + assertEquals( "2", pclProps.getProperty( "org/apache/maven/plugin/coreit/it.properties.count" ) ); + + Properties tcclProps = verifier.loadProperties( "target/tccl.properties" ); + assertEquals( pclProps, tcclProps ); + } + +} diff --git a/its/core-it-suite/src/test/resources/mng-2693/pom.xml b/its/core-it-suite/src/test/resources/mng-2693/pom.xml new file mode 100644 index 0000000000..d2355723ab --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-2693/pom.xml @@ -0,0 +1,58 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng2693 + test + 1.0 + + Maven Integration Test :: MNG-2693 + + Verify that a plugin class/resource can be loaded from the plugin realm, also during the site lifecycle. + + + + + + org.apache.maven.its.plugins + maven-it-plugin-class-loader + 2.1-SNAPSHOT + + + load + pre-site + + org.apache.maven.plugin.coreit.ClassA,org.apache.maven.plugin.coreit.ClassB,org.apache.maven.plugin.coreit.SomeClass + org/apache/maven/plugin/coreit/a.properties,org/apache/maven/plugin/coreit/b.properties,org/apache/maven/plugin/coreit/it.properties + target/pcl.properties + target/tccl.properties + + + load + + + + + + +