cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject git commit: Update to use all the various repositories for resolving extensions
Date Mon, 15 Sep 2014 16:28:30 GMT
Repository: cxf-xjc-utils
Updated Branches:
  refs/heads/master 640012ac2 -> 85252a559


Update to use all the various repositories for resolving extensions


Project: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/commit/85252a55
Tree: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/tree/85252a55
Diff: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/diff/85252a55

Branch: refs/heads/master
Commit: 85252a559cdc97a7fb98cd47954de433904d26ac
Parents: 640012a
Author: Daniel Kulp <dkulp@apache.org>
Authored: Mon Sep 15 12:28:00 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Mon Sep 15 12:28:00 2014 -0400

----------------------------------------------------------------------
 .../org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/85252a55/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
----------------------------------------------------------------------
diff --git a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
index 782a8bb..72397e0 100644
--- a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
+++ b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
@@ -31,6 +31,7 @@ import java.util.List;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
 import org.apache.maven.execution.MavenSession;
@@ -261,7 +262,12 @@ public abstract class AbstractXSDToJavaMojo extends AbstractMojo {
         request.setMirrors(session.getRequest().getMirrors());
         request.setProxies(session.getRequest().getProxies());
         request.setLocalRepository(session.getLocalRepository());
-        request.setRemoteRepositories(session.getRequest().getRemoteRepositories());
+        List<ArtifactRepository> r = new ArrayList<ArtifactRepository>();
+        r.addAll(project.getPluginArtifactRepositories());
+        r.addAll(project.getRemoteArtifactRepositories());
+        r.addAll(session.getRequest().getRemoteRepositories());
+        r.addAll(session.getRequest().getPluginArtifactRepositories());
+        request.setRemoteRepositories(r);
         ArtifactResolutionResult result = repository.resolve(request);
         List<File> files = new ArrayList<File>();
         for (Artifact a : result.getArtifacts()) {


Mime
View raw message