[Geotools-commits] svn - r38462 - trunk/build/maven/jar-collector/src/main/java/org/geotools/maven

[<svn...@os...>]

Author: jive
Date: 2012-01-04 21:33:19 -0800 (Wed, 04 Jan 2012)
New Revision: 38462

Modified:
   trunk/build/maven/jar-collector/src/main/java/org/geotools/maven/JarCollector.java
Log:
Patch for GEOT-3981 thanks Joachim Van der Auwera

Modified: trunk/build/maven/jar-collector/src/main/java/org/geotools/maven/JarCollector.java
===================================================================
--- trunk/build/maven/jar-collector/src/main/java/org/geotools/maven/JarCollector.java	2012-01-05 05:10:07 UTC (rev 38461)
+++ trunk/build/maven/jar-collector/src/main/java/org/geotools/maven/JarCollector.java	2012-01-05 05:33:19 UTC (rev 38462)
@@ -18,8 +18,10 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.List;
 import java.util.Set;
 
+import org.apache.maven.model.Dependency;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
@@ -67,14 +69,6 @@
     private String jarName;
 
     /**
-     * Project dependencies.
-     *
-     * @parameter expression="${project.artifacts}"
-     * @required
-     */
-    private Set<Artifact> dependencies;
-
-    /**
      * The Maven project running this plugin.
      *
      * @parameter expression="${project}"
@@ -146,8 +140,10 @@
             }
         }
         FileUtils.copyFileToDirectory(jarFile, collect);
+		Set<Artifact> dependencies = project.getDependencyArtifacts();
         if (dependencies != null) {
             for (final Artifact artifact : dependencies) {
+				System.out.println("+++++++++++++++++++++++ DEP: " + artifact.getDependencyTrail());
                 final String scope = artifact.getScope();
                 if (scope != null &&  // Maven 2.0.6 bug?
                    (scope.equalsIgnoreCase(Artifact.SCOPE_COMPILE) ||