[maven] Make sure we look for requested pom file and not resolved

Stanislav Ochotnicky sochotni at fedoraproject.org
Fri Oct 19 07:39:17 UTC 2012


commit 4ee764f3d3e040df91b20c7da55b8ae5f9e5e82e
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Fri Oct 19 09:39:08 2012 +0200

    Make sure we look for requested pom file and not resolved

 JavadirWorkspaceReader.java |    2 +-
 maven.spec                  |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/JavadirWorkspaceReader.java b/JavadirWorkspaceReader.java
index 83fded4..2c1e9df 100644
--- a/JavadirWorkspaceReader.java
+++ b/JavadirWorkspaceReader.java
@@ -107,7 +107,7 @@ public class JavadirWorkspaceReader implements WorkspaceReader {
             MavenJPackageDepmap.debug("Resolved VERSION=" + version);
 
             if (artifact.getExtension().equals("pom")) {
-                path = getPOMPath(groupId, artifactId, version);
+                path = getPOMPath(groupId, artifactId, wantedVersion);
                 ret = new File(path.toString());
                 if (ret.isFile()) {
                     MavenJPackageDepmap.debug("Returning " + path.toString());
diff --git a/maven.spec b/maven.spec
index e0a13c4..2db07a5 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
 
 Name:           maven
 Version:        3.0.4
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Java project management and project comprehension tool
 
 Group:          Development/Tools
@@ -377,6 +377,9 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
 
 
 %changelog
+* Fri Oct 19 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 3.0.4-13
+- Make sure we look for requested pom file and not resolved
+
 * Thu Oct 18 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 3.0.4-12
 - Look into maven.repo.local first to handle corner-case packages (#865599)
 - Finish handling of compatibility packages


More information about the scm-commits mailing list