You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gb...@apache.org on 2017/05/30 20:14:59 UTC
svn commit: r1796930 - in /maven/plugins/trunk/maven-antrun-plugin: ./
src/main/java/org/apache/maven/ant/tasks/
src/main/java/org/apache/maven/plugin/
src/main/java/org/apache/maven/plugins/
src/main/java/org/apache/maven/plugins/antrun/
Author: gboue
Date: Tue May 30 20:14:59 2017
New Revision: 1796930
URL: http://svn.apache.org/viewvc?rev=1796930&view=rev
Log:
[MANTRUN-201] Migrate plugin to Maven 3.0
Migrating to Maven 3.0 and renaming plugin package to org.apache.maven.plugins.
Added:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/
- copied from r1796929, maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/
Removed:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/
Modified:
maven/plugins/trunk/maven-antrun-plugin/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntrunXmlPlexusConfigurationWriter.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/MavenAntRunProject.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/MavenLogger.java
Modified: maven/plugins/trunk/maven-antrun-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/pom.xml?rev=1796930&r1=1796929&r2=1796930&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/pom.xml Tue May 30 20:14:59 2017
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Maven AntRun Plugin</name>
@@ -57,7 +57,7 @@ under the License.
</distributionManagement>
<properties>
- <mavenVersion>2.2.1</mavenVersion>
+ <mavenVersion>3.0</mavenVersion>
</properties>
<dependencies>
@@ -68,7 +68,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java?rev=1796930&r1=1796929&r2=1796930&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java Tue May 30 20:14:59 2017
@@ -19,8 +19,8 @@ package org.apache.maven.ant.tasks;
* under the License.
*/
-import org.apache.maven.plugin.antrun.AntRunMojo;
-import org.apache.maven.plugin.antrun.MavenAntRunProject;
+import org.apache.maven.plugins.antrun.AntRunMojo;
+import org.apache.maven.plugins.antrun.MavenAntRunProject;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
import org.apache.tools.ant.BuildException;
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java?rev=1796930&r1=1796929&r2=1796930&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java Tue May 30 20:14:59 2017
@@ -24,7 +24,7 @@ import org.apache.maven.ant.tasks.suppor
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
-import org.apache.maven.plugin.antrun.AntRunMojo;
+import org.apache.maven.plugins.antrun.AntRunMojo;
import org.apache.maven.project.MavenProject;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
@@ -109,7 +109,7 @@ public class DependencyFilesetsTask
MavenProject mavenProject = (MavenProject) this.getProject().getReference( "maven.project" );
// Add filesets for depenedency artifacts
- @SuppressWarnings( "unchecked" ) Set<Artifact> depArtifacts = filterArtifacts( mavenProject.getArtifacts() );
+ Set<Artifact> depArtifacts = filterArtifacts( mavenProject.getArtifacts() );
FileSet dependenciesFileSet = new FileSet();
dependenciesFileSet.setProject( getProject() );
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java?rev=1796930&r1=1796929&r2=1796930&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java Tue May 30 20:14:59 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.antrun;
+package org.apache.maven.plugins.antrun;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -450,7 +450,6 @@ public class AntRunMojo
antProject.setProperty( ( propertyPrefix + "settings.localRepository" ), localRepository.getBasedir() );
// Add properties for depenedency artifacts
- @SuppressWarnings( "unchecked" )
Set<Artifact> depArtifacts = mavenProject.getArtifacts();
for ( Artifact artifact : depArtifacts )
{
@@ -565,7 +564,7 @@ public class AntRunMojo
private File writeTargetToProjectFile()
throws IOException, PlexusConfigurationException
{
- // Have to use an XML writer because in Maven 2.x the PlexusConfig toString() method loses XML attributes
+ // Have to use an XML writer because the PlexusConfig toString() method does not properly escape XML attributes
StringWriter writer = new StringWriter();
AntrunXmlPlexusConfigurationWriter xmlWriter = new AntrunXmlPlexusConfigurationWriter();
xmlWriter.write( target, writer );
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntrunXmlPlexusConfigurationWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntrunXmlPlexusConfigurationWriter.java?rev=1796930&r1=1796929&r2=1796930&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntrunXmlPlexusConfigurationWriter.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/AntrunXmlPlexusConfigurationWriter.java Tue May 30 20:14:59 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.antrun;
+package org.apache.maven.plugins.antrun;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,9 +27,8 @@ import java.io.IOException;
import java.io.Writer;
/**
- * Write a plexus configuration to a stream
- * Note: This class was originally copied from plexus-container-default. It is duplicated here
- * to maintain compatibility with both Maven 2.x and Maven 3.x.
+ * Write a plexus configuration to a stream Note: This class was originally copied from plexus-container-default. It is
+ * not possible to rely on {@link PlexusConfiguration#toString()} because it doesn't properly escape XML attributes.
*/
public class AntrunXmlPlexusConfigurationWriter
{
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/MavenAntRunProject.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/MavenAntRunProject.java?rev=1796930&r1=1796929&r2=1796930&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/MavenAntRunProject.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/MavenAntRunProject.java Tue May 30 20:14:59 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.antrun;
+package org.apache.maven.plugins.antrun;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/MavenLogger.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/MavenLogger.java?rev=1796930&r1=1796929&r2=1796930&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/MavenLogger.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugins/antrun/MavenLogger.java Tue May 30 20:14:59 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.antrun;
+package org.apache.maven.plugins.antrun;
/*
* Licensed to the Apache Software Foundation (ASF) under one