File _service:tar_scm:0002-Dependency-generation.patch of Package lucene

File _service:tar_scm:0002-Dependency-generation.patch of Package lucene (Revision 5dec2e63c89619ca760ce6cf5f2a8bbc)

Currently displaying revision 5dec2e63c89619ca760ce6cf5f2a8bbc , Show latest

From 521dc174c93efbe616dc5f573a5d293339df642b Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Thu, 25 Feb 2016 15:03:17 +0100
Subject: [PATCH 2/3] Dependency generation

---
 lucene/build.xml                                            | 6 ++++--
 lucene/common-build.xml                                     | 4 ++--
 .../lucene/dependencies/GetMavenDependenciesTask.java       | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lucene/build.xml b/lucene/build.xml
index 3c1439c..23d291a 100644
--- a/lucene/build.xml
+++ b/lucene/build.xml
@@ -425,12 +425,14 @@
     </sequential>
   </target>
 
-  <target name="generate-maven-artifacts" depends="-unpack-lucene-tgz">
-    <ant dir=".." target="resolve" inheritall="false"/>
+  <target name="generate-maven-artifacts">
+    <ant dir="." target="resolve" inheritall="false"/>
     <antcall target="-filter-pom-templates" inheritall="false"/>
+    
   </target>
   
   <target name="-validate-maven-dependencies" depends="compile-tools, install-maven-tasks, load-custom-tasks">
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 6767ffe..75f6579 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -1855,9 +1855,9 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
   <property name="maven.dependencies.filters.file" location="${common.build.dir}/maven.dependencies.filters.properties"/>
 
   <target name="-get-maven-dependencies" depends="compile-tools,load-custom-tasks">
-    <ant dir="${common.dir}/.." target="-append-all-modules-dependencies-properties" inheritall="false"/>
+    <ant dir="${common.dir}" target="-append-module-dependencies-properties" inheritall="false"/>
     <get-maven-dependencies-macro
-        dir="${common.dir}/.."
+        dir="."
         centralized.versions.file="${common.dir}/ivy-versions.properties"
         module.dependencies.properties.file="${module.dependencies.properties.file}"
         maven.dependencies.filters.file="${maven.dependencies.filters.file}"/>
diff --git a/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java b/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
index 610323f..13bde29 100644
--- a/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
+++ b/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
@@ -535,6 +535,7 @@ public class GetMavenDependenciesTask extends Task {
   private Collection<String> getTransitiveDependenciesFromIvyCache
   (String groupId, String artifactId, String version) {
     SortedSet<String> transitiveDependencies = new TreeSet<>();
+    /*
     //                                      E.g. ~/.ivy2/cache/xerces/xercesImpl/ivy-2.9.1.xml
     File ivyXmlFile = new File(new File(new File(ivyCacheDir, groupId), artifactId), "ivy-" + version + ".xml");
     if ( ! ivyXmlFile.exists()) {
@@ -556,6 +557,7 @@ public class GetMavenDependenciesTask extends Task {
                               + groupId + ':' + artifactId + ':' + version + " from "
                               + ivyXmlFile.getAbsolutePath(), e);
     }
+    */
     return transitiveDependencies;
   }
 
-- 
2.20.1