From 483438a49b9a66c5b7c401c3c1ad28efbe82dcb3 Mon Sep 17 00:00:00 2001
From: Benjamin Bentmann <bentmann@apache.org>
Date: Mon, 7 Dec 2009 00:08:10 +0000
Subject: [PATCH] [MNG-4479] [regression] Project-level plugin dependencies
 ignored for direct CLI invocation if plugin key uses properties

o Added IT

git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@887807 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/maven/it/IntegrationTestSuite.java |   1 +
 ...ectLevelPluginDepUsedForCliConfigTest.java |  69 +++++++++++++++++
 .../src/test/resources/mng-4479/pom.xml       |  71 ++++++++++++++++++
 .../maven/its/mng4479/dep/0.1/dep-0.1.jar     | Bin 0 -> 6028 bytes
 .../maven/its/mng4479/dep/0.1/dep-0.1.pom     |  62 +++++++++++++++
 .../maven/its/mng4479/dep/maven-metadata.xml  |  12 +++
 .../resources/mng-4479/settings-template.xml  |  55 ++++++++++++++
 7 files changed, 270 insertions(+)
 create mode 100644 its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java
 create mode 100644 its/core-it-suite/src/test/resources/mng-4479/pom.xml
 create mode 100644 its/core-it-suite/src/test/resources/mng-4479/repo/org/apache/maven/its/mng4479/dep/0.1/dep-0.1.jar
 create mode 100644 its/core-it-suite/src/test/resources/mng-4479/repo/org/apache/maven/its/mng4479/dep/0.1/dep-0.1.pom
 create mode 100644 its/core-it-suite/src/test/resources/mng-4479/repo/org/apache/maven/its/mng4479/dep/maven-metadata.xml
 create mode 100644 its/core-it-suite/src/test/resources/mng-4479/settings-template.xml

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 2884acbe3d..af1dab339e 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
@@ -86,6 +86,7 @@ public class IntegrationTestSuite
         // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
 
         suite.addTestSuite( MavenITmng4482ForcePluginSnapshotUpdateTest.class );
+        suite.addTestSuite( MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.class );
         suite.addTestSuite( MavenITmng4474PerLookupWagonInstantiationTest.class );
         suite.addTestSuite( MavenITmng4470AuthenticatedDeploymentToProxyTest.class );
         suite.addTestSuite( MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.class );
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java
new file mode 100644
index 0000000000..f2404b9beb
--- /dev/null
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java
@@ -0,0 +1,69 @@
+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.FileUtils;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.util.Properties;
+
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4479">MNG-4479</a>.
+ * 
+ * @author Benjamin Bentmann
+ */
+public class MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest
+    extends AbstractMavenIntegrationTestCase
+{
+
+    public MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest()
+    {
+        super( "[2.0.3,2.0.99),[3.0-alpha-2,)" );
+    }
+
+    /**
+     * Verify that project-level plugin dependencies are used for direct invocations of the plugin and that they
+     * can contribute classes required for the plugin configuration when the plugin is declared using properties
+     * for its key.
+     */
+    public void testit()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4479" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.setAutoclean( false );
+        verifier.deleteDirectory( "target" );
+        verifier.deleteArtifacts( "org.apache.maven.its.mng4479" );
+        verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+        verifier.getCliOptions().add( "-s" );
+        verifier.getCliOptions().add( "settings.xml" );
+        verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-parameter-implementation:2.1-SNAPSHOT:param-implementation" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+
+        Properties props = verifier.loadProperties( "target/param.properties" );
+        assertEquals( "org.apache.maven.plugin.coreit.ItImpl-passed", props.getProperty( "theParameter.string" ) );
+        assertEquals( "org.apache.maven.plugin.coreit.ItImpl", props.getProperty( "theParameter.class" ) );
+    }
+
+}
diff --git a/its/core-it-suite/src/test/resources/mng-4479/pom.xml b/its/core-it-suite/src/test/resources/mng-4479/pom.xml
new file mode 100644
index 0000000000..615ab811ee
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/mng-4479/pom.xml
@@ -0,0 +1,71 @@
+<?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.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.mng4479</groupId>
+  <artifactId>test</artifactId>
+  <version>0.1</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: MNG-4479</name>
+  <description>
+    Verify that project-level plugin dependencies are used for direct invocations of the plugin and that they
+    can contribute classes required for the plugin configuration when the plugin is declared using properties
+    for its key.
+  </description>
+
+  <properties>
+    <pluginGroupId>org.apache.maven.its.plugins</pluginGroupId>
+    <pluginArtifactId>maven-it-plugin-parameter-implementation</pluginArtifactId>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <!-- NOTE: It's the essential part of the test to use properties for the plugin key -->
+        <groupId>${pluginGroupId}</groupId>
+        <artifactId>${pluginArtifactId}</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <configuration>
+          <outputFile>target/param.properties</outputFile>
+          <!-- The implementation class for this parameter needs to be loaded from the dependency below -->
+          <theParameter implementation="org.apache.maven.plugin.coreit.ItImpl">
+            <field>passed</field>
+          </theParameter>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.its.mng4479</groupId>
+            <artifactId>dep</artifactId>
+            <version>0.1</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
+        <!-- NOTE: The presence of another plugin declaration is crucial to trigger the bug -->
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.1</version>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/its/core-it-suite/src/test/resources/mng-4479/repo/org/apache/maven/its/mng4479/dep/0.1/dep-0.1.jar b/its/core-it-suite/src/test/resources/mng-4479/repo/org/apache/maven/its/mng4479/dep/0.1/dep-0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..6c7566dc7169ae1677ce80a298978b0ff0e06801
GIT binary patch
literal 6028
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
G1oAg3OFEDM

literal 0
HcmV?d00001

diff --git a/its/core-it-suite/src/test/resources/mng-4479/repo/org/apache/maven/its/mng4479/dep/0.1/dep-0.1.pom b/its/core-it-suite/src/test/resources/mng-4479/repo/org/apache/maven/its/mng4479/dep/0.1/dep-0.1.pom
new file mode 100644
index 0000000000..4bdebc581e
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/mng-4479/repo/org/apache/maven/its/mng4479/dep/0.1/dep-0.1.pom
@@ -0,0 +1,62 @@
+<?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.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.mng4479</groupId>
+  <artifactId>dep</artifactId>
+  <version>0.1</version>
+  <packaging>jar</packaging>
+
+  <name>Maven Integration Test :: MNG-4479 :: Plugin Dependency</name>
+
+  <distributionManagement>
+    <repository>
+      <id>maven-core-it</id>
+      <url>file:///${basedir}/repo</url>
+    </repository>
+  </distributionManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.its.plugins</groupId>
+      <artifactId>maven-it-plugin-parameter-implementation</artifactId>
+      <version>2.1-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>pom.xml</include>
+          <include>src/**</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+  </build>
+</project>
diff --git a/its/core-it-suite/src/test/resources/mng-4479/repo/org/apache/maven/its/mng4479/dep/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-4479/repo/org/apache/maven/its/mng4479/dep/maven-metadata.xml
new file mode 100644
index 0000000000..16f5fcdd3a
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/mng-4479/repo/org/apache/maven/its/mng4479/dep/maven-metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.apache.maven.its.mng4479</groupId>
+  <artifactId>dep</artifactId>
+  <version>0.1</version>
+  <versioning>
+    <versions>
+      <version>0.1</version>
+    </versions>
+    <lastUpdated>20091206230357</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/its/core-it-suite/src/test/resources/mng-4479/settings-template.xml b/its/core-it-suite/src/test/resources/mng-4479/settings-template.xml
new file mode 100644
index 0000000000..cde4215860
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/mng-4479/settings-template.xml
@@ -0,0 +1,55 @@
+<?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>
+  <profiles>
+    <profile>
+      <id>maven-core-it-repo</id>
+      <repositories>
+        <repository>
+          <id>maven-core-it</id>
+          <url>@baseurl@/repo</url>
+          <releases>
+            <checksumPolicy>ignore</checksumPolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>maven-core-it</id>
+          <url>@baseurl@/repo</url>
+          <releases>
+            <checksumPolicy>ignore</checksumPolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+  <activeProfiles>
+    <activeProfile>maven-core-it-repo</activeProfile>
+  </activeProfiles>
+</settings>