From 6f2a924693e80c322486c72f8d080cea643fcb89 Mon Sep 17 00:00:00 2001 From: robin Date: Sat, 2 Jun 2012 14:46:40 +0800 Subject: [PATCH] consider system scoped dependency in plugin.maven --- commons.all/pom.xml | 1 + commons.tapestry/pom.xml | 2 +- parent.general/pom.xml | 2 +- .../src/main/java/com/pmease/plugin/maven/PluginUtils.java | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/commons.all/pom.xml b/commons.all/pom.xml index 2feef5b2c5..ba82859a0e 100644 --- a/commons.all/pom.xml +++ b/commons.all/pom.xml @@ -19,6 +19,7 @@ ../commons.hibernate ../commons.wicket ../commons.tapestry + ../commons.product diff --git a/commons.tapestry/pom.xml b/commons.tapestry/pom.xml index 2dc263e458..556f7bc4ad 100644 --- a/commons.tapestry/pom.xml +++ b/commons.tapestry/pom.xml @@ -48,7 +48,7 @@ org.got5 tapestry5-jquery 3.2.0 - + diff --git a/parent.general/pom.xml b/parent.general/pom.xml index 342b9628ad..0ae71cfa72 100644 --- a/parent.general/pom.xml +++ b/parent.general/pom.xml @@ -155,7 +155,7 @@ com.pmease plugin.maven - 1.0.7 + 1.0.8 check-project-dependencies diff --git a/plugin.maven/src/main/java/com/pmease/plugin/maven/PluginUtils.java b/plugin.maven/src/main/java/com/pmease/plugin/maven/PluginUtils.java index 9e6d7dec4e..9ab86b4140 100644 --- a/plugin.maven/src/main/java/com/pmease/plugin/maven/PluginUtils.java +++ b/plugin.maven/src/main/java/com/pmease/plugin/maven/PluginUtils.java @@ -121,7 +121,8 @@ public class PluginUtils { } public static boolean isRuntimeArtifact(Artifact artifact) { - return artifact.getScope().equals(Artifact.SCOPE_COMPILE) || artifact.getScope().equals(Artifact.SCOPE_RUNTIME); + return artifact.getScope().equals(Artifact.SCOPE_COMPILE) || artifact.getScope().equals(Artifact.SCOPE_RUNTIME) + || artifact.getScope().equals(Artifact.SCOPE_SYSTEM); } public static void writeClasspath(File file, MavenProject project, RepositorySystem repoSystem,