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 2016/01/27 18:04:03 UTC
svn commit: r1727129 - in /maven/plugins/trunk/maven-war-plugin: pom.xml
src/test/java/org/apache/maven/plugin/war/stub/MavenProject4CopyConstructor.java
src/test/java/org/apache/maven/plugin/war/stub/MavenProjectBasicStub.java
Author: khmarbaise
Date: Wed Jan 27 17:04:03 2016
New Revision: 1727129
URL: http://svn.apache.org/viewvc?rev=1727129&view=rev
Log:
[MWAR-328] Upgrade to Maven 3.0 compatiblity / JDK 6
o Updated the following shared components:
- maven-archiver from 2.6 to 3.0.0
- maven-filtering from 1.3 to 3.0.0
- maven-mapping from 1.0 to 3.0.0
o Removed maven-project but added
maven-compat in test scope to make
the maven-plugin-testing-harness working.
o Upgraded maven-plugin-testing-harness from 1.3 to 2.1
o Upgraded commons-io from 2.2 to 2.4
o Upgraded plexus-archiver from 2.9 to 3.0.1
Modified:
maven/plugins/trunk/maven-war-plugin/pom.xml
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProject4CopyConstructor.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectBasicStub.java
Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1727129&r1=1727128&r2=1727129&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Wed Jan 27 17:04:03 2016
@@ -1,25 +1,26 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -57,9 +58,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>
<contributors>
@@ -92,11 +93,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
</dependency>
@@ -123,12 +119,12 @@ under the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>2.9</version>
+ <version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -157,19 +153,26 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-mapping</artifactId>
- <version>1.0</version>
+ <version>3.0.0</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</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-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProject4CopyConstructor.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProject4CopyConstructor.java?rev=1727129&r1=1727128&r2=1727129&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProject4CopyConstructor.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProject4CopyConstructor.java Wed Jan 27 17:04:03 2016
@@ -25,6 +25,9 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.model.Profile;
+import org.apache.maven.project.MavenProject;
public class MavenProject4CopyConstructor
extends MavenProjectBasicStub
@@ -49,13 +52,11 @@ public class MavenProject4CopyConstructo
super.setFile( new File( getBasedir(), "pom.xml" ) );
super.setDependencyArtifacts( new HashSet<Artifact>() );
super.setArtifacts( new HashSet<Artifact>() );
- super.setPluginArtifacts( new HashSet<Artifact>() );
- super.setReportArtifacts( new HashSet<Artifact>() );
super.setExtensionArtifacts( new HashSet<Artifact>() );
- super.setRemoteArtifactRepositories( new LinkedList<Artifact>() );
- super.setPluginArtifactRepositories( new LinkedList<Artifact>() );
- super.setCollectedProjects( new LinkedList<Artifact>() );
- super.setActiveProfiles( new LinkedList<Artifact>() );
+ super.setRemoteArtifactRepositories( new LinkedList<ArtifactRepository>() );
+ super.setPluginArtifactRepositories( new LinkedList<ArtifactRepository>() );
+ super.setCollectedProjects( new LinkedList<MavenProject>() );
+ super.setActiveProfiles( new LinkedList<Profile>() );
super.setOriginalModel( null );
super.setExecutionProject( this );
super.setBuild( getBuild() );
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectBasicStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectBasicStub.java?rev=1727129&r1=1727128&r2=1727129&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectBasicStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectBasicStub.java Wed Jan 27 17:04:03 2016
@@ -119,4 +119,11 @@ public class MavenProjectBasicStub
return build;
}
+
+ @Override
+ public MavenProject clone()
+ {
+ return this;
+ }
+
}