Author: krosenvold
Date: Thu Jun 11 16:49:11 2015
New Revision: 1684942
URL: http://svn.apache.org/r1684942
Log:
Upgraded to 3.0. Still with maven-compat and deprecations
Upped to 1.6
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java
maven/plugins/trunk/pom.xml
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1684942&r1=1684941&r2=1684942&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Thu Jun 11 16:49:11 2015
@@ -57,10 +57,13 @@ under the License.
</distributionManagement>
<properties>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ <maven.compiler.target>1.6</maven.compiler.target>
+
<mdoVersion>1.1.3</mdoVersion>
<mavenArchiverVersion>2.5</mavenArchiverVersion>
<mavenFilteringVersion>1.3</mavenFilteringVersion>
- <mavenVersion>2.2.1</mavenVersion>
+ <mavenVersion>3.0</mavenVersion>
<testOutputToFile>true</testOutputToFile>
<checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder,JavadocMethod</checkstyle.violation.ignore>
</properties>
@@ -87,7 +90,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
@@ -115,7 +118,6 @@ under the License.
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
</dependency>
-
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
@@ -129,7 +131,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>file-management</artifactId>
- <version>1.1</version>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -139,7 +141,7 @@ under the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -159,7 +161,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.21</version>
+ <version>3.0.22</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java?rev=1684942&r1=1684941&r2=1684942&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
Thu Jun 11 16:49:11 2015
@@ -581,15 +581,8 @@ public abstract class AbstractAssemblyMo
if ( session != null )
{
commandLineProperties = new Properties();
- if ( session.getExecutionProperties() != null )
- {
- commandLineProperties.putAll( session.getExecutionProperties()
);
- }
-
- if ( session.getUserProperties() != null )
- {
- commandLineProperties.putAll( session.getUserProperties() );
- }
+ commandLineProperties.putAll( session.getSystemProperties() );
+ commandLineProperties.putAll( session.getUserProperties() );
}
PropertiesBasedValueSource cliProps = new PropertiesBasedValueSource(
commandLineProperties );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java?rev=1684942&r1=1684941&r2=1684942&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
Thu Jun 11 16:49:11 2015
@@ -74,8 +74,6 @@ public class DefaultAssemblyArchiverTest
throws PlexusContainerException
{
container = new DefaultPlexusContainer();
- container.initialize();
- container.start();
}
@AfterClass
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java?rev=1684942&r1=1684941&r2=1684942&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
Thu Jun 11 16:49:11 2015
@@ -152,7 +152,7 @@ public class AddDependencySetsTaskTest
{
final MavenProject project = new MavenProject( new Model() );
- final ProjectBuildingException pbe = new ProjectBuildingException(
"test", "Test error." );
+ final ProjectBuildingException pbe = new ProjectBuildingException(
"test", "Test error.", new Throwable() );
final MockAndControlForAddDependencySetsTask macTask =
new MockAndControlForAddDependencySetsTask( mockManager, new
MavenProject( new Model() ) );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java?rev=1684942&r1=1684941&r2=1684942&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
Thu Jun 11 16:49:11 2015
@@ -71,7 +71,7 @@ public class DefaultDependencyResolverTe
super.setUp();
resolver = (ArtifactResolver) lookup( ArtifactResolver.ROLE );
- metadataSource = (ArtifactMetadataSource) lookup(
ArtifactMetadataSource.ROLE );
+ metadataSource = (ArtifactMetadataSource) lookup(
ArtifactMetadataSource.class);
factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
repoFactory = (ArtifactRepositoryFactory) lookup(
ArtifactRepositoryFactory.ROLE );
layout = (ArtifactRepositoryLayout) lookup(
ArtifactRepositoryLayout.ROLE, "default" );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java?rev=1684942&r1=1684941&r2=1684942&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java
Thu Jun 11 16:49:11 2015
@@ -358,6 +358,8 @@ public class FilterUtilsTest
mac = new ArtifactMockAndControl( groupId, artifactId, depTrail );
setArtifact( mac.artifact );
+
+ setVersion( "1.0" );
}
}
Modified: maven/plugins/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=1684942&r1=1684941&r2=1684942&view=diff
==============================================================================
--- maven/plugins/trunk/pom.xml (original)
+++ maven/plugins/trunk/pom.xml Thu Jun 11 16:49:11 2015
@@ -63,7 +63,6 @@ under the License.
<!-- HACK: Deliberately put before other plugins that employ
maven-antrun-plugin to workaround MNG-1323 -->
<module>maven-eclipse-plugin</module>
- <module>maven-assembly-plugin</module>
<module>maven-changelog-plugin</module>
<module>maven-changes-plugin</module>
<!-- Moved to java-7 profile because it requires Java 7
@@ -139,6 +138,7 @@ under the License.
</activation>
<modules>
<!--Moved to maven-3 profile as a workaround for MNG-3814 -->
+ <module>maven-assembly-plugin</module>
<module>maven-project-info-reports-plugin</module>
<module>maven-remote-resources-plugin</module>
<!--Moved to maven-3 profile as they require Maven 3.0 -->
