You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2015/11/11 12:42:30 UTC
svn commit: r1713814 - in /maven/plugins/trunk/maven-ejb-plugin: pom.xml
src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBasicStub.java
Author: khmarbaise
Date: Wed Nov 11 11:42:30 2015
New Revision: 1713814
URL: http://svn.apache.org/viewvc?rev=1713814&view=rev
Log:
[MEJB-81] Upgrade to Maven 3.X only compatiblity
Maven Dependencies to 3.0 only.
Upgraded maven-archiver to 3.0.0
Upgraded maven-filtering to 3.0.0
Upgraded maven-plugin-testing-harness to 2.1 added maven-compat in test scope
Modified:
maven/plugins/trunk/maven-ejb-plugin/pom.xml
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBasicStub.java
Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/pom.xml?rev=1713814&r1=1713813&r2=1713814&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ejb-plugin/pom.xml Wed Nov 11 11:42:30 2015
@@ -57,9 +57,9 @@ under the License.
</distributionManagement>
<properties>
- <mavenArchiverVersion>2.6</mavenArchiverVersion>
- <mavenFilteringVersion>1.3</mavenFilteringVersion>
- <mavenVersion>2.2.1</mavenVersion>
+ <mavenArchiverVersion>3.0.0</mavenArchiverVersion>
+ <mavenFilteringVersion>3.0.0</mavenFilteringVersion>
+ <mavenVersion>3.0</mavenVersion>
</properties>
<dependencies>
@@ -70,7 +70,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
@@ -113,11 +113,22 @@ under the License.
<artifactId>commons-io</artifactId>
<version>2.2</version>
</dependency>
-
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.3</version>
+ <version>2.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBasicStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBasicStub.java?rev=1713814&r1=1713813&r2=1713814&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBasicStub.java (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBasicStub.java Wed Nov 11 11:42:30 2015
@@ -20,12 +20,13 @@ package org.apache.maven.plugin.ejb.stub
*/
import java.io.File;
-import java.util.HashSet;
-import java.util.LinkedList;
+import java.util.Collections;
import java.util.Properties;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Model;
+import org.apache.maven.model.Profile;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
@@ -155,15 +156,13 @@ public class MavenProjectBasicStub
{
// the pom should be located in the isolated dummy root
super.setFile( new File( getBasedir(), "pom.xml" ) );
- super.setDependencyArtifacts( new HashSet() );
- super.setArtifacts( new HashSet() );
- super.setPluginArtifacts( new HashSet() );
- super.setReportArtifacts( new HashSet() );
- super.setExtensionArtifacts( new HashSet() );
- super.setRemoteArtifactRepositories( new LinkedList() );
- super.setPluginArtifactRepositories( new LinkedList() );
- super.setCollectedProjects( new LinkedList() );
- super.setActiveProfiles( new LinkedList() );
+ super.setDependencyArtifacts( Collections.<Artifact>emptySet() );
+ super.setArtifacts( Collections.<Artifact>emptySet() );
+ super.setExtensionArtifacts( Collections.<Artifact>emptySet() );
+ super.setRemoteArtifactRepositories( Collections.<ArtifactRepository>emptyList() );
+ super.setPluginArtifactRepositories( Collections.<ArtifactRepository>emptyList() );
+ super.setCollectedProjects( Collections.<MavenProject>emptyList() );
+ super.setActiveProfiles( Collections.<Profile>emptyList() );
super.setOriginalModel( null );
super.setExecutionProject( this );
super.setArtifact( artifact );