Author: rfscholte
Date: Sat Mar 14 16:31:58 2015
New Revision: 1666713
URL: http://svn.apache.org/r1666713
Log:
Remove deprecated parameters
Removed:
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/install-file-layout-test/
Modified:
maven/plugins/branches/m-install-p-3.0/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
maven/plugins/branches/m-install-p-3.0/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
maven/plugins/branches/m-install-p-3.0/src/test/java/org/apache/maven/plugin/install/InstallMojoTest.java
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/basic-install-checksum/plugin-config.xml
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/basic-install-test-packaging-pom/plugin-config.xml
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/basic-install-test-with-attached-artifacts/plugin-config.xml
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/basic-install-test/plugin-config.xml
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/configured-install-test/plugin-config.xml
Modified:
maven/plugins/branches/m-install-p-3.0/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/m-install-p-3.0/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java?rev=1666713&r1=1666712&r2=1666713&view=diff
==============================================================================
---
maven/plugins/branches/m-install-p-3.0/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
(original)
+++
maven/plugins/branches/m-install-p-3.0/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
Sat Mar 14 16:31:58 2015
@@ -31,14 +31,12 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Enumeration;
import java.util.LinkedHashSet;
-import java.util.Map;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.regex.Pattern;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
@@ -46,7 +44,6 @@ import org.apache.maven.model.io.xpp3.Ma
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.ProjectBuildingRequest;
@@ -146,23 +143,6 @@ public class InstallFileMojo
private Boolean generatePom;
/**
- * The type of remote repository layout to install to. Try
<code>legacy</code> for a Maven 1.x-style repository
- * layout.
- *
- * @since 2.2
- * @deprecated Maven 3.0 doesn't support legacy layout anymore
- */
- @Deprecated
- @Parameter( property = "repositoryLayout", defaultValue = "default",
required = true )
- private String repositoryLayout;
-
- /**
- * Map that contains the repository layouts.
- */
- @Component( role = ArtifactRepositoryLayout.class )
- private Map<String, ArtifactRepositoryLayout> repositoryLayouts;
-
- /**
* The path for a specific local repository directory. If not specified
the local repository path configured in the
* Maven settings will be used.
*
Modified:
maven/plugins/branches/m-install-p-3.0/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/m-install-p-3.0/src/main/java/org/apache/maven/plugin/install/InstallMojo.java?rev=1666713&r1=1666712&r2=1666713&view=diff
==============================================================================
---
maven/plugins/branches/m-install-p-3.0/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
(original)
+++
maven/plugins/branches/m-install-p-3.0/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
Sat Mar 14 16:31:58 2015
@@ -82,18 +82,6 @@ public class InstallMojo
private boolean installAtEnd;
/**
- * @deprecated either use project.getPackaging() or
reactorProjects.get(i).getPackaging()
- */
- @Parameter( defaultValue = "${project.packaging}", required = true,
readonly = true )
- protected String packaging;
-
- /**
- * @deprecated either use project.getFile() or
reactorProjects.get(i).getFile()
- */
- @Parameter( defaultValue = "${project.file}", required = true, readonly =
true )
- private File pomFile;
-
- /**
* Set this to <code>true</code> to bypass artifact installation. Use this
for artifacts that does not need to be
* installed in the local repository.
*
@@ -102,18 +90,6 @@ public class InstallMojo
@Parameter( property = "maven.install.skip", defaultValue = "false" )
private boolean skip;
- /**
- * @deprecated either use project.getArtifact() or
reactorProjects.get(i).getArtifact()
- */
- @Parameter( defaultValue = "${project.artifact}", required = true,
readonly = true )
- private Artifact artifact;
-
- /**
- * @deprecated either use project.getAttachedArtifacts() or
reactorProjects.get(i).getAttachedArtifacts()
- */
- @Parameter( defaultValue = "${project.attachedArtifacts}", required =
true, readonly = true )
- private List<Artifact> attachedArtifacts;
-
public void execute()
throws MojoExecutionException
{
Modified:
maven/plugins/branches/m-install-p-3.0/src/test/java/org/apache/maven/plugin/install/InstallMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/m-install-p-3.0/src/test/java/org/apache/maven/plugin/install/InstallMojoTest.java?rev=1666713&r1=1666712&r2=1666713&view=diff
==============================================================================
---
maven/plugins/branches/m-install-p-3.0/src/test/java/org/apache/maven/plugin/install/InstallMojoTest.java
(original)
+++
maven/plugins/branches/m-install-p-3.0/src/test/java/org/apache/maven/plugin/install/InstallMojoTest.java
Sat Mar 14 16:31:58 2015
@@ -103,10 +103,8 @@ public class InstallMojoTest
String groupId = dotToSlashReplacer( artifact.getGroupId() );
- String packaging = getVariableValueFromObject( mojo, "packaging"
).toString();
-
File installedArtifact = new File( getBasedir(), LOCAL_REPO + groupId
+ "/" + artifact.getArtifactId() + "/" +
- artifact.getVersion() + "/" + artifact.getArtifactId() + "-" +
artifact.getVersion() + "." + packaging );
+ artifact.getVersion() + "/" + artifact.getArtifactId() + "-" +
artifact.getVersion() + "." + artifact.getArtifactHandler().getExtension() );
assertTrue( installedArtifact.exists() );
Modified:
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/basic-install-checksum/plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/basic-install-checksum/plugin-config.xml?rev=1666713&r1=1666712&r2=1666713&view=diff
==============================================================================
---
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/basic-install-checksum/plugin-config.xml
(original)
+++
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/basic-install-checksum/plugin-config.xml
Sat Mar 14 16:31:58 2015
@@ -22,12 +22,6 @@ under the License.
<plugin>
<artifactId>maven-install-plugin</artifactId>
<configuration>
- <!-- deprecated fields -->
-
<pomFile>${basedir}/src/test/resources/unit/basic-install-checksum/plugin-config.xml</pomFile>
- <packaging>jar</packaging>
- <artifact
implementation="org.apache.maven.plugin.install.stubs.InstallArtifactStub"/>
- <attachedArtifacts/>
-
<localRepository>${localRepository}</localRepository>
<createChecksum>true</createChecksum>
<project
implementation="org.apache.maven.plugin.testing.stubs.MavenProjectStub">
Modified:
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/basic-install-test-packaging-pom/plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/basic-install-test-packaging-pom/plugin-config.xml?rev=1666713&r1=1666712&r2=1666713&view=diff
==============================================================================
---
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/basic-install-test-packaging-pom/plugin-config.xml
(original)
+++
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/basic-install-test-packaging-pom/plugin-config.xml
Sat Mar 14 16:31:58 2015
@@ -22,13 +22,7 @@ under the License.
<plugin>
<artifactId>maven-install-plugin</artifactId>
<configuration>
- <!-- deprecated fields -->
-
<pomFile>${basedir}/src/test/resources/unit/basic-install-test-packaging-pom/plugin-config.xml</pomFile>
- <packaging>pom</packaging>
- <artifact
implementation="org.apache.maven.plugin.install.stubs.InstallArtifactStub"/>
- <attachedArtifacts/>
<localRepository>${localRepository}</localRepository>
-
<project
implementation="org.apache.maven.plugin.testing.stubs.MavenProjectStub">
<file>${basedir}/src/test/resources/unit/basic-install-test-packaging-pom/plugin-config.xml</file>
<packaging>pom</packaging>
Modified:
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/basic-install-test-with-attached-artifacts/plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/basic-install-test-with-attached-artifacts/plugin-config.xml?rev=1666713&r1=1666712&r2=1666713&view=diff
==============================================================================
---
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/basic-install-test-with-attached-artifacts/plugin-config.xml
(original)
+++
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/basic-install-test-with-attached-artifacts/plugin-config.xml
Sat Mar 14 16:31:58 2015
@@ -22,16 +22,6 @@ under the License.
<plugin>
<artifactId>maven-install-plugin</artifactId>
<configuration>
- <!-- @deprecated fields -->
-
<pomFile>${basedir}/src/test/resources/unit/basic-install-test-with-attached-artifacts/plugin-config.xml
- </pomFile>
- <packaging>jar</packaging>
- <artifact
implementation="org.apache.maven.plugin.install.stubs.InstallArtifactStub"/>
- <attachedArtifacts>
- <attachedArtifact
implementation="org.apache.maven.plugin.install.stubs.AttachedArtifactStub0"/>
- <attachedArtifact
implementation="org.apache.maven.plugin.install.stubs.AttachedArtifactStub1"/>
- </attachedArtifacts>
-
<localRepository>${localRepository}</localRepository>
<project
implementation="org.apache.maven.plugin.testing.stubs.MavenProjectStub">
<file>${basedir}/src/test/resources/unit/basic-install-test-with-attached-artifacts/plugin-config.xml</file>
Modified:
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/basic-install-test/plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/basic-install-test/plugin-config.xml?rev=1666713&r1=1666712&r2=1666713&view=diff
==============================================================================
---
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/basic-install-test/plugin-config.xml
(original)
+++
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/basic-install-test/plugin-config.xml
Sat Mar 14 16:31:58 2015
@@ -22,12 +22,6 @@ under the License.
<plugin>
<artifactId>maven-install-plugin</artifactId>
<configuration>
- <!-- @deprecated fields -->
-
<pomFile>${basedir}/src/test/resources/unit/basic-install-test/plugin-config.xml</pomFile>
- <packaging>jar</packaging>
- <artifact
implementation="org.apache.maven.plugin.install.stubs.InstallArtifactStub"/>
- <attachedArtifacts/>
-
<localRepository>${localRepository}</localRepository>
<project
implementation="org.apache.maven.plugin.testing.stubs.MavenProjectStub">
<file>${basedir}/src/test/resources/unit/basic-install-test/plugin-config.xml</file>
Modified:
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/configured-install-test/plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/configured-install-test/plugin-config.xml?rev=1666713&r1=1666712&r2=1666713&view=diff
==============================================================================
---
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/configured-install-test/plugin-config.xml
(original)
+++
maven/plugins/branches/m-install-p-3.0/src/test/resources/unit/configured-install-test/plugin-config.xml
Sat Mar 14 16:31:58 2015
@@ -22,12 +22,6 @@ under the License.
<plugin>
<artifactId>maven-install-plugin</artifactId>
<configuration>
- <!-- deprecated fields -->
-
<pomFile>${basedir}/src/test/resources/unit/configured-install-test/plugin-config.xml</pomFile>
- <packaging>jar</packaging>
- <artifact
implementation="org.apache.maven.plugin.install.stubs.InstallArtifactStub"/>
- <attachedArtifacts/>
-
<updateReleaseInfo>true</updateReleaseInfo>
<localRepository>${localRepository}</localRepository>
<project
implementation="org.apache.maven.plugin.testing.stubs.MavenProjectStub">
