Sophie

Sophie

distrib > Mageia > 7 > i586 > media > core-release-src > by-pkgid > 80c772068bd02f7640c3aec98bb1ebed > files > 2

maven-hpi-plugin-1.113-10.mga7.src.rpm

From 05fa3d9b485158d94faa839f314d5698ce870779 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 16 Feb 2016 07:45:56 +0100
Subject: [PATCH] Update to latest Maven shared components

---
 pom.xml                                                       | 11 ++++++++---
 .../plugins/hpi/AbstractDependencyGraphTraversingMojo.java    |  6 +++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 692876b..a2db940 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,9 +129,14 @@
     </dependency>
     <!-- for copy-dependency-plugins -->
     <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-dependency-plugin</artifactId>
-      <version>2.8</version>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-dependency-tree</artifactId>
+      <version>3.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-common-artifact-filters</artifactId>
+      <version>3.0.0</version>
     </dependency>
     <!-- for the create goal -->
     <dependency>
diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractDependencyGraphTraversingMojo.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractDependencyGraphTraversingMojo.java
index ce8bdcc..1a5237c 100644
--- a/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractDependencyGraphTraversingMojo.java
+++ b/src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractDependencyGraphTraversingMojo.java
@@ -1,6 +1,8 @@
 package org.jenkinsci.maven.plugins.hpi;
 
 import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.project.DefaultProjectBuildingRequest;
+import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder;
 import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException;
 import org.apache.maven.shared.dependency.graph.DependencyNode;
@@ -16,7 +18,9 @@ public abstract class AbstractDependencyGraphTraversingMojo extends AbstractJenk
      * Traverses the whole dependency tree rooted at the project.
      */
     protected void traverseProject() throws DependencyGraphBuilderException {
-        visit(graphBuilder.buildDependencyGraph(project, null));
+        ProjectBuildingRequest request = new DefaultProjectBuildingRequest();
+        request.setProject(project);
+        visit(graphBuilder.buildDependencyGraph(request, null));
     }
 
     /**
-- 
2.5.0