[lucene] Update to upstream release 4.8.0
Michael Šimáček
msimacek at fedoraproject.org
Fri May 2 10:34:03 UTC 2014
commit 73524c0b47c29dcf2f365f9a63b941016c96e4c3
Author: Michael Simacek <msimacek at redhat.com>
Date: Fri May 2 12:30:29 2014 +0200
Update to upstream release 4.8.0
0001-Ignore-transitive-deps.patch | 32 ----------------
0001-dependency-generation.patch | 75 ++++++++++++++----------------------
lucene.spec | 12 +++---
3 files changed, 35 insertions(+), 84 deletions(-)
---
diff --git a/0001-dependency-generation.patch b/0001-dependency-generation.patch
index 07cf732..9613a26 100644
--- a/0001-dependency-generation.patch
+++ b/0001-dependency-generation.patch
@@ -1,19 +1,33 @@
-From 2e7cba052c4558aa5f6102b3c771ca0d22eaab0f Mon Sep 17 00:00:00 2001
+From 8d6fc5deeea8e870e3fdcb798a01940e48a0cbe3 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
-Date: Fri, 7 Mar 2014 17:19:12 +0100
+Date: Fri, 2 May 2014 11:07:23 +0200
Subject: [PATCH] dependency generation
Signed-off-by: rpm-build <rpm-build>
---
- common-build.xml | 7 +++----
- .../apache/lucene/dependencies/GetMavenDependenciesTask.java | 10 ++++++----
- 2 files changed, 9 insertions(+), 8 deletions(-)
+ build.xml | 2 +-
+ common-build.xml | 7 +++----
+ .../org/apache/lucene/dependencies/GetMavenDependenciesTask.java | 2 ++
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+diff --git a/build.xml b/build.xml
+index 3237141..28fffe3 100644
+--- a/build.xml
++++ b/build.xml
+@@ -497,7 +497,7 @@
+ <target name="generate-maven-artifacts" depends="-unpack-lucene-tgz">
+ <sequential>
+ <ant dir=".." target="resolve" inheritall="false"/>
+- <antcall target="-filter-pom-templates" inheritall="false"/>
++ <antcall target="filter-pom-templates" inheritall="false"/>
+ <antcall target="-dist-maven" inheritall="false"/>
+ </sequential>
+ </target>
diff --git a/common-build.xml b/common-build.xml
-index 98dd678..446a954 100644
+index 7068fe6..b6d4b9f 100644
--- a/common-build.xml
+++ b/common-build.xml
-@@ -1540,10 +1540,9 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
+@@ -1555,10 +1555,9 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
<property name="maven.dependencies.filters.file" location="${common.build.dir}/maven.dependencies.filters.properties"/>
@@ -26,7 +40,7 @@ index 98dd678..446a954 100644
centralized.versions.file="${common.dir}/ivy-versions.properties"
module.dependencies.properties.file="${module.dependencies.properties.file}"
maven.dependencies.filters.file="${maven.dependencies.filters.file}"/>
-@@ -1563,7 +1562,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
+@@ -1578,7 +1577,7 @@ ${ant.project.name}.test.dependencies=${test.classpath.list}
</copy>
</target>
@@ -36,40 +50,18 @@ index 98dd678..446a954 100644
<copy todir="${common.dir}/build/poms" overwrite="true" encoding="UTF-8" filtering="on">
<fileset dir="${common.dir}/../dev-tools/maven"/>
diff --git a/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java b/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
-index b89448c..be99de5 100644
+index 2069c7d..d891bc5 100644
--- a/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
+++ b/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
-@@ -73,18 +73,18 @@ import javax.xml.xpath.XPathFactory;
- */
- public class GetMavenDependenciesTask extends Task {
- private static final Pattern PROPERTY_PREFIX_FROM_IVY_XML_FILE_PATTERN = Pattern.compile
-- ("[/\\\\](lucene|solr)[/\\\\](?:(?:contrib|(analysis)|(example))[/\\\\])?([^/\\\\]+)[/\\\\]ivy\\.xml");
-+ ("[/\\\\](solr|lucene)[-0-9.]*[/\\\\](?:(?:contrib|(analysis)|(example))[/\\\\])?([^/\\\\]+)[/\\\\]ivy\\.xml");
- private static final Pattern COORDINATE_KEY_PATTERN = Pattern.compile("/([^/]+)/([^/]+)");
- private static final Pattern MODULE_DEPENDENCIES_COORDINATE_KEY_PATTERN
- = Pattern.compile("(.*?)(\\.test)?\\.dependencies");
- // lucene/build/core/classes/java
- private static final Pattern COMPILATION_OUTPUT_DIRECTORY_PATTERN
-- = Pattern.compile("(lucene|solr)/build/(?:contrib/)?(.*)/classes/(?:java|test)");
-+ = Pattern.compile("(solr|lucene)[-0-9.]*/build/(?:contrib/)?(.*)/classes/(?:java|test)");
- private static final Pattern PROPERTY_REFERENCE_PATTERN = Pattern.compile("\\$\\{([^}]+)\\}");
- private static final String UNWANTED_INTERNAL_DEPENDENCIES
- = "/(?:test-)?lib/|test-framework/classes/java|/test-files|/resources";
- private static final Pattern SHARED_EXTERNAL_DEPENDENCIES_PATTERN
-- = Pattern.compile("((?:solr|lucene)/(?!test-framework).*)/((?:test-)?)lib/");
-+ = Pattern.compile("((?:lucene|solr)[-0-9.]*/(?!test-framework).*)/((?:test-)?)lib/");
-
- private static final String DEPENDENCY_MANAGEMENT_PROPERTY = "lucene.solr.dependency.management";
- private static final String IVY_USER_DIR_PROPERTY = "ivy.default.ivy.user.dir";
-@@ -482,6 +482,7 @@ public class GetMavenDependenciesTask extends Task {
+@@ -481,6 +481,7 @@ public class GetMavenDependenciesTask extends Task {
+ private Collection<String> getTransitiveDependenciesFromIvyCache
(String groupId, String artifactId, String version) {
- SortedSet<String> transitiveDependencies = new TreeSet<String>();
- // E.g. ~/.ivy2/cache/xerces/xercesImpl/ivy-2.9.1.xml
+ 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()) {
- throw new BuildException("File not found: " + ivyXmlFile.getPath());
-@@ -502,6 +502,7 @@ public class GetMavenDependenciesTask extends Task {
+@@ -502,6 +503,7 @@ public class GetMavenDependenciesTask extends Task {
+ groupId + ':' + artifactId + ':' + version + " from "
+ ivyXmlFile.getAbsolutePath(), e);
}
@@ -77,15 +69,6 @@ index b89448c..be99de5 100644
return transitiveDependencies;
}
-@@ -526,7 +528,7 @@ public class GetMavenDependenciesTask extends Task {
- // Lucene analysis modules' build dirs do not include hyphens, but Solr contribs' build dirs do
- String origModuleDir = antProjectName.replace("analyzers-", "analysis/");
- Pattern unwantedInternalDependencies = Pattern.compile
-- ("(?:lucene/build/|solr/build/(?:contrib/)?)" + origModuleDir + "|" + UNWANTED_INTERNAL_DEPENDENCIES);
-+ ("(?:lucene[-0-9.]*/build/|solr[-0-9.]*/build/(?:contrib/)?)" + origModuleDir + "|" + UNWANTED_INTERNAL_DEPENDENCIES);
- SortedSet<String> sortedDeps = new TreeSet<String>();
- for (String dependency : value.split(",")) {
- matcher = SHARED_EXTERNAL_DEPENDENCIES_PATTERN.matcher(dependency);
--
-1.8.5.3
+1.9.0
diff --git a/lucene.spec b/lucene.spec
index 55c3c18..7e64aa7 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -31,7 +31,7 @@
Summary: High-performance, full-featured text search engine
Name: lucene
Version: 4.8.0
-Release: 0.1%{?dist}
+Release: 1%{?dist}
Epoch: 0
License: ASL 2.0
URL: http://lucene.apache.org/
@@ -44,7 +44,7 @@ Source3: lucene-%{version}-queryparser-OSGi-MANIFEST.MF
Source4: dev-tools-%{version}.tar.xz
Patch0: 0001-disable-ivy-settings.patch
-Patch1: 0001-Ignore-transitive-deps.patch
+Patch1: 0001-dependency-generation.patch
BuildRequires: git
BuildRequires: ant
@@ -289,9 +289,6 @@ popd
%mvn_package ":%{name}-analysis-modules-aggregator" %{name}-analysis
%mvn_package ":%{name}-analyzers-common" %{name}-analysis
%mvn_package ":{*}-aggregator" @1
-sed -i -e "s/-filter-pom-templates/filter-pom-templates/g" lucene/build.xml
-sed -i -e "s/-filter-pom-templates/filter-pom-templates/g" lucene/common-build.xml
-
%build
@@ -306,7 +303,7 @@ done
for module in benchmark misc test-framework demo core/src/java facet \
analysis/stempel codecs/src/java codecs/src/test queryparser \
- core/src/test .; do
+ core/src/test memory .; do
%pom_remove_plugin :forbiddenapis ${module}
done
@@ -395,6 +392,9 @@ popd
%doc LICENSE.txt
%changelog
+* Fri May 02 2014 Michael Simacek <msimacek at redhat.com> - 0:4.8.0-1
+- Update to upstream release 4.8.0
+
* Fri May 2 2014 Alexander Kurtakov <akurtako at redhat.com> 0:4.8.0-0.1
- Initial 4.8.0 effort.
More information about the scm-commits
mailing list