You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/10/31 19:14:46 UTC
git commit: Fix build with maven 3.1.x
Repository: cxf
Updated Branches:
refs/heads/master 277607da2 -> 8c7e2493d
Fix build with maven 3.1.x
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8c7e2493
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8c7e2493
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8c7e2493
Branch: refs/heads/master
Commit: 8c7e2493dc26e1df4a16168a5491ac96509549d6
Parents: 277607d
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Oct 31 14:14:34 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Oct 31 14:14:34 2014 -0400
----------------------------------------------------------------------
.../cxf/maven_plugin/AbstractCodegenMoho.java | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8c7e2493/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
index 33f7c10..91206e9 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
@@ -213,13 +213,6 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
*/
private RepositorySystem repositorySystem;
- /**
- * @component
- * @readonly
- * @required
- */
- private MavenSession session;
-
public AbstractCodegenMoho() {
super();
@@ -868,11 +861,11 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
ArtifactResolutionRequest request = new ArtifactResolutionRequest();
request.setArtifact(artifact);
request.setResolveRoot(true).setResolveTransitively(false);
- request.setServers(session.getRequest().getServers());
- request.setMirrors(session.getRequest().getMirrors());
- request.setProxies(session.getRequest().getProxies());
- request.setLocalRepository(session.getLocalRepository());
- request.setRemoteRepositories(session.getRequest().getRemoteRepositories());
+ request.setServers(mavenSession.getRequest().getServers());
+ request.setMirrors(mavenSession.getRequest().getMirrors());
+ request.setProxies(mavenSession.getRequest().getProxies());
+ request.setLocalRepository(mavenSession.getLocalRepository());
+ request.setRemoteRepositories(mavenSession.getRequest().getRemoteRepositories());
ArtifactResolutionResult result = repositorySystem.resolve(request);
return result.getOriginatingArtifact();