Author: ate
Date: Thu Dec 23 02:06:10 2010
New Revision: 1052136
URL: http://svn.apache.org/viewvc?rev=1052136&view=rev
Log:
JS2-1227: Build failure with Maven 3
Fix jetspeed mvn unpack plugin (and related) to fail because Maven3 has a API
behavior breakage on PluginDescriptor.getIntroducedDependencyArtifacts() which
now always returns an EMPTY_COLLECTION ... :(
See for further details: https://issues.apache.org/jira/browse/JS2-1227
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml
portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/InitMojo.java
portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java
portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/mojo/AbstractUnpackMojo.java
portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/Artifacts.java
portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/UnpackResources.java
portals/jetspeed-2/portal/trunk/maven/jetspeed-unpack-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/UnpackMojo.java
portals/jetspeed-2/portal/trunk/maven/jetspeed-unpack-war-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/UnpackWarMojo.java
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml Thu
Dec 23 02:06:10 2010
@@ -119,6 +119,7 @@
<configuration>
<skip>${skipTests}</skip>
<unpack>
+
<artifact>${project.groupId}:jetspeed-portal-resources:jar</artifact>
<targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
<resources>
<resource>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml Thu
Dec 23 02:06:10 2010
@@ -168,6 +168,7 @@
<configuration>
<skip>${skipTests}</skip>
<unpack>
+
<artifact>${project.groupId}:jetspeed-portal-resources:jar</artifact>
<targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
<resources>
<resource>
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml
Thu Dec 23 02:06:10 2010
@@ -61,6 +61,7 @@
<phase>process-resources</phase>
<configuration>
<unpack>
+
<artifact>${project.groupId}:jetspeed-portal-resources:jar</artifact>
<targetDirectory>${project.build.directory}/classes/org/apache/jetspeed/tools/deploy</targetDirectory>
<resources>
<resource>
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/pom.xml?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/pom.xml Thu
Dec 23 02:06:10 2010
@@ -99,6 +99,7 @@
<configuration>
<skip>${skipTests}</skip>
<unpack>
+
<artifact>${project.groupId}:jetspeed-portal-resources:jar</artifact>
<targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
<resources>
<resource>
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml
Thu Dec 23 02:06:10 2010
@@ -166,6 +166,7 @@
<configuration>
<skip>${skipTests}</skip>
<unpack>
+
<artifact>${project.groupId}:jetspeed-portal-resources:jar</artifact>
<targetDirectory>${project.build.directory}</targetDirectory>
<resources>
<resource>
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/pom.xml?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/pom.xml Thu
Dec 23 02:06:10 2010
@@ -104,6 +104,7 @@
<configuration>
<skip>${skipTests}</skip>
<unpack>
+
<artifact>${project.groupId}:jetspeed-portal-resources:jar</artifact>
<targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
<resources>
<resource>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml Thu Dec
23 02:06:10 2010
@@ -310,6 +310,7 @@
<configuration>
<skip>${skipTests}</skip>
<unpack>
+
<artifact>${project.groupId}:jetspeed-portal-resources:jar</artifact>
<targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
<resources>
<resource>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml Thu
Dec 23 02:06:10 2010
@@ -132,6 +132,7 @@
<configuration>
<skip>${skipTests}</skip>
<unpack>
+
<artifact>${project.groupId}:jetspeed-portal-resources:jar</artifact>
<targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
<resources>
<resource>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/pom.xml Thu Dec
23 02:06:10 2010
@@ -132,6 +132,7 @@
<configuration>
<skip>${skipTests}</skip>
<unpack>
+
<artifact>${project.groupId}:jetspeed-portal-resources:jar</artifact>
<targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
<resources>
<resource>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml Thu
Dec 23 02:06:10 2010
@@ -179,6 +179,7 @@
<configuration>
<skip>${skipTests}</skip>
<unpack>
+
<artifact>${project.groupId}:jetspeed-portal-resources:jar</artifact>
<targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
<resources>
<resource>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml Thu
Dec 23 02:06:10 2010
@@ -156,6 +156,7 @@
<configuration>
<skip>${skipTests}</skip>
<unpack>
+
<artifact>${project.groupId}:jetspeed-portal-resources:jar</artifact>
<targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
<resources>
<resource>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml Thu
Dec 23 02:06:10 2010
@@ -166,6 +166,7 @@
<configuration>
<skip>${skipTests}</skip>
<unpack>
+
<artifact>${project.groupId}:jetspeed-portal-resources:jar</artifact>
<targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
<resources>
<resource>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml Thu Dec 23
02:06:10 2010
@@ -131,6 +131,7 @@
<configuration>
<skip>${skipTests}</skip>
<unpack>
+
<artifact>${project.groupId}:jetspeed-portal-resources:jar</artifact>
<targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
<resources>
<resource>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml Thu
Dec 23 02:06:10 2010
@@ -118,6 +118,7 @@
<configuration>
<skip>${skipTests}</skip>
<unpack>
+
<artifact>${project.groupId}:jetspeed-portal-resources:jar</artifact>
<targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
<resources>
<resource>
Modified:
portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/InitMojo.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/InitMojo.java?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/InitMojo.java
(original)
+++
portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/InitMojo.java
Thu Dec 23 02:06:10 2010
@@ -16,7 +16,7 @@
*/
package org.apache.jetspeed.maven.plugins;
-import java.util.Set;
+import java.util.ArrayList;
import org.apache.jetspeed.maven.utils.Artifacts;
import org.apache.jetspeed.maven.utils.DbConnection;
@@ -75,10 +75,10 @@ public class InitMojo extends AbstractMo
*/
private boolean skip;
- /** @parameter expression="${plugin.introducedDependencyArtifacts}"
+ /** @parameter expression="${plugin.artifacts}"
* @readonly
**/
- private Set pluginDependencyArtifacts;
+ private ArrayList pluginArtifacts;
private Artifacts artifacts;
/** The Maven project.
@@ -96,7 +96,7 @@ public class InitMojo extends AbstractMo
return;
}
- artifacts = new Artifacts(pluginDependencyArtifacts);
+ artifacts = new Artifacts(pluginArtifacts);
if (unpack != null)
{
Modified:
portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java
(original)
+++
portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java
Thu Dec 23 02:06:10 2010
@@ -35,7 +35,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.StringTokenizer;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -157,8 +156,8 @@ public class DeployMojo extends Abstract
*/
private Map destinations;
- /** @parameter expression="${plugin.introducedDependencyArtifacts}" */
- private Set pluginDependencyArtifacts;
+ /** @parameter expression="${plugin.artifacts}" */
+ private ArrayList pluginArtifacts;
/**
* @parameter
@@ -193,7 +192,7 @@ public class DeployMojo extends Abstract
File portalDeployDir = new
File(targetBaseDir,(String)destMap.get("deploy"));
File localPortalDeployDir = new File(targetBaseDir,
(String)destMap.get("local"));
- artifacts = new Artifacts(pluginDependencyArtifacts);
+ artifacts = new Artifacts(pluginArtifacts);
boolean infusion = false;
Modified:
portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/mojo/AbstractUnpackMojo.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/mojo/AbstractUnpackMojo.java?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/mojo/AbstractUnpackMojo.java
(original)
+++
portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/mojo/AbstractUnpackMojo.java
Thu Dec 23 02:06:10 2010
@@ -16,7 +16,7 @@
*/
package org.apache.jetspeed.maven.mojo;
-import java.util.Set;
+import java.util.ArrayList;
import org.apache.jetspeed.maven.utils.Artifacts;
import org.apache.jetspeed.maven.utils.UnpackResources;
@@ -47,7 +47,7 @@ public abstract class AbstractUnpackMojo
return;
}
- artifacts = new Artifacts(getPluginDependencyArtifacts());
+ artifacts = new Artifacts(getPluginArtifacts());
if (getUnpack() != null)
{
@@ -57,7 +57,7 @@ public abstract class AbstractUnpackMojo
protected abstract boolean isSkip();
- protected abstract Set getPluginDependencyArtifacts();
+ protected abstract ArrayList getPluginArtifacts();
protected abstract UnpackResources getUnpack();
Modified:
portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/Artifacts.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/Artifacts.java?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/Artifacts.java
(original)
+++
portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/Artifacts.java
Thu Dec 23 02:06:10 2010
@@ -16,9 +16,9 @@
*/
package org.apache.jetspeed.maven.utils;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.Set;
import org.apache.maven.artifact.Artifact;
@@ -30,7 +30,7 @@ public class Artifacts
{
private HashMap artifactsMap = new HashMap();
- public Artifacts(Set artifacts)
+ public Artifacts(ArrayList artifacts)
{
if (artifacts != null)
{
Modified:
portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/UnpackResources.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/UnpackResources.java?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/UnpackResources.java
(original)
+++
portals/jetspeed-2/portal/trunk/maven/jetspeed-maven-utils/src/main/java/org/apache/jetspeed/maven/utils/UnpackResources.java
Thu Dec 23 02:06:10 2010
@@ -342,7 +342,7 @@ public class UnpackResources
}
else if ((artifact == null && file == null) || (artifact != null &&
file != null))
{
- throw new MojoExecutionException("Either specify artifact or
file");
+ throw new MojoExecutionException("Either specify artifact or file:
artifacts.size="+artifacts.size());
}
else if (artifact != null)
{
Modified:
portals/jetspeed-2/portal/trunk/maven/jetspeed-unpack-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/UnpackMojo.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-unpack-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/UnpackMojo.java?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/maven/jetspeed-unpack-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/UnpackMojo.java
(original)
+++
portals/jetspeed-2/portal/trunk/maven/jetspeed-unpack-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/UnpackMojo.java
Thu Dec 23 02:06:10 2010
@@ -16,7 +16,7 @@
*/
package org.apache.jetspeed.maven.plugins;
-import java.util.Set;
+import java.util.ArrayList;
import org.apache.jetspeed.maven.mojo.AbstractUnpackMojo;
import org.apache.jetspeed.maven.utils.UnpackResources;
@@ -47,10 +47,10 @@ public class UnpackMojo extends Abstract
*/
private UnpackResources unpack;
- /** @parameter expression="${plugin.introducedDependencyArtifacts}"
+ /** @parameter expression="${plugin.artifacts}"
* @readonly
**/
- private Set pluginDependencyArtifacts;
+ private ArrayList pluginArtifacts;
/** The Maven project.
* @parameter expression="${project}"
@@ -64,9 +64,9 @@ public class UnpackMojo extends Abstract
return skip;
}
- protected Set getPluginDependencyArtifacts()
+ protected ArrayList getPluginArtifacts()
{
- return pluginDependencyArtifacts;
+ return pluginArtifacts;
}
protected UnpackResources getUnpack()
Modified:
portals/jetspeed-2/portal/trunk/maven/jetspeed-unpack-war-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/UnpackWarMojo.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-unpack-war-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/UnpackWarMojo.java?rev=1052136&r1=1052135&r2=1052136&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/maven/jetspeed-unpack-war-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/UnpackWarMojo.java
(original)
+++
portals/jetspeed-2/portal/trunk/maven/jetspeed-unpack-war-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/UnpackWarMojo.java
Thu Dec 23 02:06:10 2010
@@ -16,7 +16,7 @@
*/
package org.apache.jetspeed.maven.plugins;
-import java.util.Set;
+import java.util.ArrayList;
import org.apache.jetspeed.maven.utils.UnpackResources;
import org.apache.jetspeed.maven.mojo.AbstractUnpackMojo;
@@ -47,10 +47,10 @@ public class UnpackWarMojo extends Abstr
*/
private UnpackResources unpack;
- /** @parameter expression="${plugin.introducedDependencyArtifacts}"
+ /** @parameter expression="${plugin.artifacts}"
* @readonly
**/
- private Set pluginDependencyArtifacts;
+ private ArrayList pluginArtifacts;
/** The Maven project.
* @parameter expression="${project}"
@@ -64,9 +64,9 @@ public class UnpackWarMojo extends Abstr
return skip;
}
- protected Set getPluginDependencyArtifacts()
+ protected ArrayList getPluginArtifacts()
{
- return pluginDependencyArtifacts;
+ return pluginArtifacts;
}
protected UnpackResources getUnpack()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
