[lucene] Update to upstream release 4.8.0
by Michael Šimáček
commit 73524c0b47c29dcf2f365f9a63b941016c96e4c3
Author: Michael Simacek <msimacek(a)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(a)redhat.com> - 0:4.8.0-1
+- Update to upstream release 4.8.0
+
* Fri May 2 2014 Alexander Kurtakov <akurtako(a)redhat.com> 0:4.8.0-0.1
- Initial 4.8.0 effort.
10 years
[qpid-proton-java] add alias
by gil
commit 833c55e26a811966c49ceafe29f051bb48ecec6f
Author: gil <puntogil(a)libero.it>
Date: Fri May 2 12:31:03 2014 +0200
add alias
qpid-proton-java.spec | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/qpid-proton-java.spec b/qpid-proton-java.spec
index 7c47e37..14b612d 100644
--- a/qpid-proton-java.spec
+++ b/qpid-proton-java.spec
@@ -1,6 +1,6 @@
Name: qpid-proton-java
Version: 0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Java libraries for Qpid Proton
License: ASL 2.0
URL: http://qpid.apache.org/proton/
@@ -20,19 +20,15 @@ BuildRequires: mvn(org.mockito:mockito-core)
BuildArch: noarch
-
%description
Java language bindings for the Qpid Proton messaging framework.
-# === qpid-proton-java-javadoc
-
%package javadoc
Summary: Javadoc for %{name}
%description javadoc
This package contains javadoc for %{name}.
-
%prep
%setup -q -n qpid-proton-%{version}
@@ -51,16 +47,15 @@ sed -i 's|pemReader = new PEMParser(reader, passwordFinder);|pemReader = new PEM
%pom_remove_dep org.python:jython-standalone tests
rm -r tests/java/org/apache/qpid/proton/JythonTest.java
+%mvn_alias :proton-j org.apache.qpid:proton-api org.apache.qpid:proton-j-impl
%build
%mvn_build
-
%install
%mvn_install
-
%files -f .mfiles
%dir %{_javadir}/%{name}
%doc proton-j/LICENSE
@@ -69,8 +64,10 @@ rm -r tests/java/org/apache/qpid/proton/JythonTest.java
%files javadoc -f .mfiles-javadoc
%doc proton-j/LICENSE
-
%changelog
+* Fri May 02 2014 gil cattaneo <puntogil(a)libero.it> 0.7-2
+- add alias
+
* Thu May 1 2014 Darryl L. Pierce <dpierce(a)redhat.com> - 0.7-1
- Rebased on Proton 0.7.
10 years
[lucene] Initial 4.8.0 effort.
by Alexander Kurtakov
commit 144f3fff2097b54c2b9a820d33b7b10363641e16
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri May 2 11:33:24 2014 +0300
Initial 4.8.0 effort.
.gitignore | 2 +
0001-Ignore-transitive-deps.patch | 32 +++++++++++++++
0001-dependency-generation.patch | 4 +-
lucene-4.7.2-analysis-OSGi-MANIFEST.MF | 63 -----------------------------
lucene-4.7.2-core-OSGi-MANIFEST.MF | 23 ----------
lucene-4.7.2-queryparser-OSGi-MANIFEST.MF | 30 --------------
lucene-4.8.0-analysis-OSGi-MANIFEST.MF | 63 +++++++++++++++++++++++++++++
lucene-4.8.0-core-OSGi-MANIFEST.MF | 23 ++++++++++
lucene-4.8.0-queryparser-OSGi-MANIFEST.MF | 30 ++++++++++++++
lucene.spec | 17 +++++--
sources | 4 +-
11 files changed, 166 insertions(+), 125 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b6c5136..db8f596 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ dev-tools.tar.xz
/lucene-4.7.1-src.tgz
/lucene-4.7.2-src.tgz
/dev-tools-4.7.2.tar.xz
+/dev-tools-4.8.0.tar.xz
+/lucene-4.8.0-src.tgz
diff --git a/0001-Ignore-transitive-deps.patch b/0001-Ignore-transitive-deps.patch
new file mode 100644
index 0000000..0caa37e
--- /dev/null
+++ b/0001-Ignore-transitive-deps.patch
@@ -0,0 +1,32 @@
+From 45492c938ffe0292a4f6198d4551cedf6cd69499 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Thu, 1 May 2014 14:32:53 +0300
+Subject: [PATCH] Ignore transitive deps.
+
+---
+ .../java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java b/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
+index 2069c7d..d891bc5 100644
+--- a/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
++++ b/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
+@@ -481,6 +481,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()) {
+@@ -502,6 +503,7 @@ public class GetMavenDependenciesTask extends Task {
+ + groupId + ':' + artifactId + ':' + version + " from "
+ + ivyXmlFile.getAbsolutePath(), e);
+ }
++ */
+ return transitiveDependencies;
+ }
+
+--
+1.9.0
+
diff --git a/0001-dependency-generation.patch b/0001-dependency-generation.patch
index 7061b8a..07cf732 100644
--- a/0001-dependency-generation.patch
+++ b/0001-dependency-generation.patch
@@ -61,7 +61,7 @@ index b89448c..be99de5 100644
private static final String DEPENDENCY_MANAGEMENT_PROPERTY = "lucene.solr.dependency.management";
private static final String IVY_USER_DIR_PROPERTY = "ivy.default.ivy.user.dir";
-@@ -467,6 +467,7 @@ public class GetMavenDependenciesTask extends Task {
+@@ -482,6 +482,7 @@ public class GetMavenDependenciesTask extends Task {
(String groupId, String artifactId, String version) {
SortedSet<String> transitiveDependencies = new TreeSet<String>();
// E.g. ~/.ivy2/cache/xerces/xercesImpl/ivy-2.9.1.xml
@@ -69,7 +69,7 @@ index b89448c..be99de5 100644
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());
-@@ -487,6 +488,7 @@ public class GetMavenDependenciesTask extends Task {
+@@ -502,6 +502,7 @@ public class GetMavenDependenciesTask extends Task {
+ groupId + ':' + artifactId + ':' + version + " from "
+ ivyXmlFile.getAbsolutePath(), e);
}
diff --git a/lucene-4.8.0-analysis-OSGi-MANIFEST.MF b/lucene-4.8.0-analysis-OSGi-MANIFEST.MF
new file mode 100644
index 0000000..326e16a
--- /dev/null
+++ b/lucene-4.8.0-analysis-OSGi-MANIFEST.MF
@@ -0,0 +1,63 @@
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-SymbolicName: org.apache.lucene.analysis
+Require-Bundle: org.apache.lucene.core;bundle-version="4.8.0"
+Export-Package: org.apache.lucene.analysis.ar;version="4.8.0",
+ org.apache.lucene.analysis.core;version="4.8.0",
+ org.apache.lucene.analysis.bg;version="4.8.0",
+ org.apache.lucene.analysis.br;version="4.8.0",
+ org.apache.lucene.analysis.ca;version="4.8.0",
+ org.apache.lucene.analysis.cjk;version="4.8.0",
+ org.apache.lucene.analysis.cn;version="4.8.0",
+ org.apache.lucene.analysis.compound;version="4.8.0",
+ org.apache.lucene.analysis.compound.hyphenation;version="4.8.0",
+ org.apache.lucene.analysis.cz;version="4.8.0",
+ org.apache.lucene.analysis.da;version="4.8.0",
+ org.apache.lucene.analysis.de;version="4.8.0",
+ org.apache.lucene.analysis.el;version="4.8.0",
+ org.apache.lucene.analysis.en;version="4.8.0",
+ org.apache.lucene.analysis.es;version="4.8.0",
+ org.apache.lucene.analysis.eu;version="4.8.0",
+ org.apache.lucene.analysis.fa;version="4.8.0",
+ org.apache.lucene.analysis.fi;version="4.8.0",
+ org.apache.lucene.analysis.fr;version="4.8.0",
+ org.apache.lucene.analysis.gl;version="4.8.0",
+ org.apache.lucene.analysis.hi;version="4.8.0",
+ org.apache.lucene.analysis.hu;version="4.8.0",
+ org.apache.lucene.analysis.hunspell;version="4.8.0",
+ org.apache.lucene.analysis.hy;version="4.8.0",
+ org.apache.lucene.analysis.id;version="4.8.0",
+ org.apache.lucene.analysis.in;version="4.8.0",
+ org.apache.lucene.analysis.it;version="4.8.0",
+ org.apache.lucene.analysis.lv;version="4.8.0",
+ org.apache.lucene.analysis.miscellaneous;version="4.8.0",
+ org.apache.lucene.analysis.ngram;version="4.8.0",
+ org.apache.lucene.analysis.nl;version="4.8.0",
+ org.apache.lucene.analysis.no;version="4.8.0",
+ org.apache.lucene.analysis.path;version="4.8.0",
+ org.apache.lucene.analysis.payloads;version="4.8.0",
+ org.apache.lucene.analysis.position;version="4.8.0",
+ org.apache.lucene.analysis.pt;version="4.8.0",
+ org.apache.lucene.analysis.query;version="4.8.0",
+ org.apache.lucene.analysis.reverse;version="4.8.0",
+ org.apache.lucene.analysis.ro;version="4.8.0",
+ org.apache.lucene.analysis.ru;version="4.8.0",
+ org.apache.lucene.analysis.shingle;version="4.8.0",
+ org.apache.lucene.analysis.sinks;version="4.8.0",
+ org.apache.lucene.analysis.snowball;version="4.8.0",
+ org.apache.lucene.analysis.standard;version="4.8.0",
+ org.apache.lucene.analysis.sv;version="4.8.0",
+ org.apache.lucene.analysis.synonym;version="4.8.0",
+ org.apache.lucene.analysis.th;version="4.8.0",
+ org.apache.lucene.analysis.tr;version="4.8.0",
+ org.apache.lucene.analysis.util;version="4.8.0",
+ org.apache.lucene.analysis.wikipedia;version="4.8.0",
+ org.apache.lucene.collation;version="4.8.0"
+Bundle-Version: 4.8.0
+Bundle-Vendor: fedoraproject.org
+Bundle-Name: Lucene contributed extensions
+Import-Package: org.xml.sax;resolution:=optional,
+ javax.xml.parsers;resolution:=optional,
+ org.xml.sax.helpers;resolution:=optional
+Bundle-ManifestVersion: 2
+
diff --git a/lucene-4.8.0-core-OSGi-MANIFEST.MF b/lucene-4.8.0-core-OSGi-MANIFEST.MF
new file mode 100644
index 0000000..c6a285a
--- /dev/null
+++ b/lucene-4.8.0-core-OSGi-MANIFEST.MF
@@ -0,0 +1,23 @@
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-SymbolicName: org.apache.lucene.core
+Import-Package: javax.management
+Export-Package: org.apache.lucene;version="4.8.0",
+ org.apache.lucene.analysis;version="4.8.0",
+ org.apache.lucene.analysis.tokenattributes;version="4.8.0",
+ org.apache.lucene.document;version="4.8.0",
+ org.apache.lucene.index;version="4.8.0",
+ org.apache.lucene.search;version="4.8.0",
+ org.apache.lucene.search.payloads;version="4.8.0",
+ org.apache.lucene.search.spans;version="4.8.0",
+ org.apache.lucene.search.similarities;version="4.8.0",
+ org.apache.lucene.store;version="4.8.0",
+ org.apache.lucene.util;version="4.8.0",
+ org.apache.lucene.util.fst;version="4.8.0",
+ org.apache.lucene.util.packed;version="4.8.0",
+ org.apache.lucene.util.mutable;version="4.8.0",
+ org.apache.lucene.util.automaton;version="4.8.0"
+Bundle-Version: 4.8.0
+Bundle-Vendor: fedoraproject.org
+Bundle-Name: High-performance, full-featured text search engine
+Bundle-ManifestVersion: 2
diff --git a/lucene-4.8.0-queryparser-OSGi-MANIFEST.MF b/lucene-4.8.0-queryparser-OSGi-MANIFEST.MF
new file mode 100644
index 0000000..7e50959
--- /dev/null
+++ b/lucene-4.8.0-queryparser-OSGi-MANIFEST.MF
@@ -0,0 +1,30 @@
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-SymbolicName: org.apache.lucene.queryparser
+Require-Bundle: org.apache.lucene.core;bundle-version="4.8.0"
+Export-Package: org.apache.lucene.queryparser.analyzing;version="4.8.0",
+ org.apache.lucene.queryparser.classic;version="4.8.0",
+ org.apache.lucene.queryparser.complexPhrase;version="4.8.0",
+ org.apache.lucene.queryparser.ext;version="4.8.0",
+ org.apache.lucene.queryparser.flexible.core;version="4.8.0",
+ org.apache.lucene.queryparser.flexible.core.builders;version="4.8.0",
+ org.apache.lucene.queryparser.flexible.core.config;version="4.8.0",
+ org.apache.lucene.queryparser.flexible.core.messages;version="4.8.0",
+ org.apache.lucene.queryparser.flexible.core.nodes;version="4.8.0",
+ org.apache.lucene.queryparser.flexible.core.parser;version="4.8.0",
+ org.apache.lucene.queryparser.flexible.core.processors;version="4.8.0",
+ org.apache.lucene.queryparser.flexible.core.util;version="4.8.0",
+ org.apache.lucene.queryparser.simple;version="4.8.0",
+ org.apache.lucene.queryparser.surround.parser;version="4.8.0",
+ org.apache.lucene.queryparser.surround.query;version="4.8.0",
+ org.apache.lucene.queryparser.xml;version="4.8.0",
+ org.apache.lucene.queryparser.xml.builders;version="4.8.0"
+Bundle-Version: 4.8.0
+Bundle-Vendor: fedoraproject.org
+Bundle-Name: Lucene Query parsers and parsing framework
+Import-Package: org.xml.sax;resolution:=optional,
+ javax.xml.parsers;resolution:=optional,
+ org.xml.sax.helpers;resolution:=optional
+Bundle-ManifestVersion: 2
+
+
diff --git a/lucene.spec b/lucene.spec
index 7cd5412..55c3c18 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -30,8 +30,8 @@
Summary: High-performance, full-featured text search engine
Name: lucene
-Version: 4.7.2
-Release: 1%{?dist}
+Version: 4.8.0
+Release: 0.1%{?dist}
Epoch: 0
License: ASL 2.0
URL: http://lucene.apache.org/
@@ -39,12 +39,12 @@ Source0: http://www.apache.org/dist/lucene/java/%{version}/%{name}-%{vers
Source1: lucene-%{version}-core-OSGi-MANIFEST.MF
Source2: lucene-%{version}-analysis-OSGi-MANIFEST.MF
Source3: lucene-%{version}-queryparser-OSGi-MANIFEST.MF
-#svn export http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_4_7_2/dev-tools/
-#tar caf dev-tools-4.7.2.tar.xz dev-tools/
+#svn export http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_4_8_0/dev-tools/
+#tar caf dev-tools-4.8.0.tar.xz dev-tools/
Source4: dev-tools-%{version}.tar.xz
Patch0: 0001-disable-ivy-settings.patch
-Patch1: 0001-dependency-generation.patch
+Patch1: 0001-Ignore-transitive-deps.patch
BuildRequires: git
BuildRequires: ant
@@ -289,6 +289,10 @@ 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
pushd %{name}
@@ -391,6 +395,9 @@ popd
%doc LICENSE.txt
%changelog
+* Fri May 2 2014 Alexander Kurtakov <akurtako(a)redhat.com> 0:4.8.0-0.1
+- Initial 4.8.0 effort.
+
* Thu Apr 17 2014 Alexander Kurtakov <akurtako(a)redhat.com> 0:4.7.2-1
- Update to 4.7.2 upstream release.
diff --git a/sources b/sources
index f6f2d0a..6163422 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e8d4c28968b78827811912daf4f2d4da lucene-4.7.2-src.tgz
-8dc73434511b1afbb6dd6a498aaf9b3e dev-tools-4.7.2.tar.xz
+ddd14d18f69366e53e9a9dfc8ff6d0b9 dev-tools-4.8.0.tar.xz
+27edd820203ec2ab584c8a02cbe2a500 lucene-4.8.0-src.tgz
10 years
[localizer] Update to upstream version 1.19
by Michal Srb
commit 427f93faeb98ff364d8d6c46d83f04b992d42924
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri May 2 06:48:54 2014 +0200
Update to upstream version 1.19
.gitignore | 1 +
localizer.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9a7e4e9..b25a17a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/localizer-parent-1.16.tar.gz
/localizer-parent-1.17.tar.gz
/localizer-parent-1.18.tar.gz
+/localizer-parent-1.19.tar.gz
diff --git a/localizer.spec b/localizer.spec
index 4bfce73..c34f5ec 100644
--- a/localizer.spec
+++ b/localizer.spec
@@ -1,6 +1,6 @@
Name: localizer
-Version: 1.18
-Release: 2%{?dist}
+Version: 1.19
+Release: 1%{?dist}
Summary: Type-safe localization message access for Java
License: MIT
@@ -70,6 +70,9 @@ cp %{SOURCE1} LICENSE
%doc LICENSE
%changelog
+* Fri May 02 2014 Michal Srb <msrb(a)redhat.com> - 1.19-1
+- Update to upstream version 1.19
+
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.18-2
- Use Requires: java-headless rebuild (#1067528)
diff --git a/sources b/sources
index 3a4a2e6..8abaa02 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-04ce1c3c870b25a60c6ec491ec00a3ad localizer-parent-1.18.tar.gz
+048af54e250936c42a3836c28d8168a4 localizer-parent-1.19.tar.gz
10 years
[maven-shade-plugin] Update to upstream version 2.3
by Mikolaj Izdebski
commit d968051ad9523579cfe53f9c55573b1254762ded
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri May 2 06:38:54 2014 +0200
Update to upstream version 2.3
.gitignore | 1 +
maven-shade-plugin.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7e2fcce..380f25c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ maven-shade-plugin-1.7.1-source-release.zip
/maven-shade-plugin-2.0-source-release.zip
/maven-shade-plugin-2.1-source-release.zip
/maven-shade-plugin-2.2-source-release.zip
+/maven-shade-plugin-2.3-source-release.zip
diff --git a/maven-shade-plugin.spec b/maven-shade-plugin.spec
index 0cca22d..20c5fa7 100644
--- a/maven-shade-plugin.spec
+++ b/maven-shade-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-shade-plugin
-Version: 2.2
-Release: 2%{?dist}
+Version: 2.3
+Release: 1%{?dist}
Summary: This plugin provides the capability to package the artifact in an uber-jar
License: ASL 2.0
URL: http://maven.apache.org/plugins/%{name}
@@ -60,6 +60,9 @@ ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar
%doc LICENSE NOTICE
%changelog
+* Fri May 2 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.3-1
+- Update to upstream version 2.3
+
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2-2
- Use Requires: java-headless rebuild (#1067528)
diff --git a/sources b/sources
index 0765194..a97daf8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7bbf9a7f15c2868750312368abba9ef3 maven-shade-plugin-2.2-source-release.zip
+47cc7c4a4710937384012e9640ea3f29 maven-shade-plugin-2.3-source-release.zip
10 years