changed plugin to extension, since this is the only useful part
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1597191 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 499e044..75fdcee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<settingsFile>src/it/settings.xml</settingsFile>
<setupIncludes>
- <setupInclude>reactor/multi-module-plugin/pom.xml</setupInclude>
+ <setupInclude>reactor/resolve-extension/pom.xml</setupInclude>
</setupIncludes>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
diff --git a/src/it/reactor/module-z-deps-y/pom.xml b/src/it/reactor/module-z-deps-y/pom.xml
index ef6d4f8..f6788fc 100644
--- a/src/it/reactor/module-z-deps-y/pom.xml
+++ b/src/it/reactor/module-z-deps-y/pom.xml
@@ -74,13 +74,6 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.its.dependency-tree</groupId>
- <artifactId>multi-module-test-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
- <extensions>true</extensions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/src/it/reactor/multi-module-plugin/src/main/java/org/apache/maven/its/deptree/DummyMojo.java b/src/it/reactor/multi-module-plugin/src/main/java/org/apache/maven/its/deptree/DummyMojo.java
deleted file mode 100644
index 6398291..0000000
--- a/src/it/reactor/multi-module-plugin/src/main/java/org/apache/maven/its/deptree/DummyMojo.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.apache.maven.its.deptree;
-
-/*
- * 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.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.project.MavenProject;
-
-/**
- * Does absolutely nothing.
- *
- * @goal dummy
- * @phase package
- * @requiresDependencyResolution compile
- */
-public class DummyMojo extends AbstractMojo
-{
- /**
- * The maven project.
- *
- * @parameter property="${project}"
- * @required
- * @readonly
- */
- private MavenProject project;
-
- /**
- * @throws MojoExecutionException
- * @throws MojoFailureException
- */
- public void execute() throws MojoExecutionException, MojoFailureException
- {
- getLog().info( "Running DummyMojo : " + project.getArtifactId() );
- }
-}
diff --git a/src/it/reactor/pom.xml b/src/it/reactor/pom.xml
index e510142..b0205c0 100644
--- a/src/it/reactor/pom.xml
+++ b/src/it/reactor/pom.xml
@@ -43,4 +43,14 @@
<module>module-z-deps-y</module>
</modules>
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.its.dependency-tree</groupId>
+ <artifactId>resolve-extension</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </extension>
+ </extensions>
+ </build>
+
</project>
diff --git a/src/it/reactor/multi-module-plugin/invoker.properties b/src/it/reactor/resolve-extension/invoker.properties
similarity index 100%
rename from src/it/reactor/multi-module-plugin/invoker.properties
rename to src/it/reactor/resolve-extension/invoker.properties
diff --git a/src/it/reactor/multi-module-plugin/pom.xml b/src/it/reactor/resolve-extension/pom.xml
similarity index 76%
rename from src/it/reactor/multi-module-plugin/pom.xml
rename to src/it/reactor/resolve-extension/pom.xml
index df350ee..3f09b91 100644
--- a/src/it/reactor/multi-module-plugin/pom.xml
+++ b/src/it/reactor/resolve-extension/pom.xml
@@ -24,13 +24,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.dependency-tree</groupId>
- <artifactId>multi-module-test-plugin</artifactId>
+ <artifactId>resolve-extension</artifactId>
<version>1.0-SNAPSHOT</version>
- <packaging>maven-plugin</packaging>
+ <packaging>jar</packaging>
- <name>Multi-Module Test-Plugin</name>
+ <name>Resolve Dependency from Reactor Check Extension</name>
<description>
- Creates a maven-plugin that can be used to verify that maven-dep-tree resolves deps that only exist within the reactor.
+ Extension to check that maven-dependency-tree resolves deps that only exist within the reactor.
</description>
<properties>
@@ -49,25 +49,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>${maven.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>${maven.version}</version>
- <scope>provided</scope>
- </dependency>
-<!--
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>${maven.version}</version>
- </dependency>
--->
- <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-9-stable-1</version>
diff --git a/src/it/reactor/multi-module-plugin/src/main/java/org/apache/maven/its/deptree/ResolveDependenciesLifecycleParticipant.java b/src/it/reactor/resolve-extension/src/main/java/org/apache/maven/its/deptree/ResolveDependenciesLifecycleParticipant.java
similarity index 100%
rename from src/it/reactor/multi-module-plugin/src/main/java/org/apache/maven/its/deptree/ResolveDependenciesLifecycleParticipant.java
rename to src/it/reactor/resolve-extension/src/main/java/org/apache/maven/its/deptree/ResolveDependenciesLifecycleParticipant.java
