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 21:23:57 UTC
svn commit: r1713928 - in /maven/plugins/trunk/maven-rar-plugin: pom.xml
src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java
Author: khmarbaise
Date: Wed Nov 11 20:23:57 2015
New Revision: 1713928
URL: http://svn.apache.org/viewvc?rev=1713928&view=rev
Log:
[MRAR-46] Upgrade Maven 3.X Only JDK 1.6
Upgrade maven-filtering 1.3 to 3.0.0
Upgrade maven-archiver from 2.6 to 3.0.0
Upgrade plexus-archiver from 2.9 to 2.10.3
Added JUnit 4.11
Added maven-compat in test scope
for maven-plugin-testing-harness (2.1)
Modified:
maven/plugins/trunk/maven-rar-plugin/pom.xml
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java
Modified: maven/plugins/trunk/maven-rar-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/pom.xml?rev=1713928&r1=1713927&r2=1713928&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-rar-plugin/pom.xml Wed Nov 11 20:23:57 2015
@@ -67,7 +67,7 @@ under the License.
</contributors>
<properties>
- <mavenVersion>2.2.1</mavenVersion>
+ <mavenVersion>3.0</mavenVersion>
</properties>
<dependencies>
@@ -78,7 +78,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
@@ -99,32 +99,39 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.20</version>
+ <version>3.0.22</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-filtering</artifactId>
- <version>1.3</version>
+ <version>3.0.0</version>
</dependency>
- <!--
- ! The following dependency is necessary cause
- ! maven-archiver contains a different version of
- ! plexus-archiver (2.8.1).
- -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>2.9</version>
+ <version>2.10.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>2.6</version>
+ <version>3.0.0</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-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java?rev=1713928&r1=1713927&r2=1713928&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java Wed Nov 11 20:23:57 2015
@@ -27,10 +27,12 @@ import java.util.List;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.model.Organization;
+import org.apache.maven.model.Profile;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusTestCase;
@@ -57,14 +59,12 @@ public class RarMavenProjectStub
super.setOrganization( org );
super.setFile( getFile() );
- super.setPluginArtifacts( Collections.EMPTY_SET );
- super.setReportArtifacts( Collections.EMPTY_SET );
- super.setExtensionArtifacts( Collections.EMPTY_SET );
+ super.setExtensionArtifacts( Collections.<Artifact>emptySet() );
super.setArtifact( getArtifact() );
- super.setRemoteArtifactRepositories( Collections.EMPTY_LIST );
- super.setPluginArtifactRepositories( Collections.EMPTY_LIST );
- super.setCollectedProjects( Collections.EMPTY_LIST );
- super.setActiveProfiles( Collections.EMPTY_LIST );
+ super.setRemoteArtifactRepositories( Collections.<ArtifactRepository>emptyList() );
+ super.setPluginArtifactRepositories( Collections.<ArtifactRepository>emptyList() );
+ super.setCollectedProjects( Collections.<MavenProject>emptyList() );
+ super.setActiveProfiles( Collections.<Profile>emptyList() );
super.addCompileSourceRoot( getBasedir() + "/src/test/resources/unit/basic-rar-test/src/main/java" );
super.addTestCompileSourceRoot( getBasedir() + "/src/test/resources/unit/basic-rar-test/src/test/java" );