Mercurial > hg > release > thermostat-1.6
changeset 1957:92eed4d29c16
Drop spec file patch for lucene 5.
Reviewed-by: neugens
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-June/019921.html
PR3056
author | Severin Gehwolf <sgehwolf@redhat.com> |
---|---|
date | Tue, 28 Jun 2016 15:22:30 +0200 |
parents | 4c4656f5bab4 |
children | bd656ada63c5 |
files | distribution/packaging/fedora/0003_fedora_lucene_5.patch distribution/packaging/fedora/thermostat.spec |
diffstat | 2 files changed, 0 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/distribution/packaging/fedora/0003_fedora_lucene_5.patch Wed Jun 29 16:35:40 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -# HG changeset patch -# User Severin Gehwolf <sgehwolf@redhat.com> -# Date 1432917520 -7200 -# Fri May 29 18:38:40 2015 +0200 -# Node ID 79df35f1ff13b06b89d75b9abb8599c78d8d6f29 -# Parent fbe787e737fe44eb1f24ca11ba514b0bd41d9741 -Upgrade to Lucene 5.1.0. -Reviewed-by: omajid -Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2015-May/013891.html - -diff --git a/pom.xml b/pom.xml ---- a/pom.xml -+++ b/pom.xml -@@ -260,8 +260,8 @@ - <commons-fileupload.version>1.2.2</commons-fileupload.version> - - <jline.version>2.9</jline.version> -- <lucene.version>4.7.0_1</lucene.version> -- <lucene.osgi-version>4.7.0.1</lucene.osgi-version> -+ <lucene.version>5.1.0_1</lucene.version> -+ <lucene.osgi-version>5.1.0.1</lucene.osgi-version> - <lucene-analysis.bundle.symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</lucene-analysis.bundle.symbolic-name> - <lucene-core.bundle.symbolic-name>org.apache.servicemix.bundles.lucene</lucene-core.bundle.symbolic-name> - <!-- -diff --git a/vm-heap-analysis/common/src/main/java/com/redhat/thermostat/vm/heap/analysis/common/HeapDump.java b/vm-heap-analysis/common/src/main/java/com/redhat/thermostat/vm/heap/analysis/common/HeapDump.java ---- a/vm-heap-analysis/common/src/main/java/com/redhat/thermostat/vm/heap/analysis/common/HeapDump.java -+++ b/vm-heap-analysis/common/src/main/java/com/redhat/thermostat/vm/heap/analysis/common/HeapDump.java -@@ -66,7 +66,6 @@ - import org.apache.lucene.store.Directory; - import org.apache.lucene.store.LockObtainFailedException; - import org.apache.lucene.store.RAMDirectory; --import org.apache.lucene.util.Version; - - import com.redhat.thermostat.common.utils.LoggingUtils; - import com.redhat.thermostat.vm.heap.analysis.common.model.HeapInfo; -@@ -141,7 +140,7 @@ - - Enumeration<JavaHeapObject> thingos = snapshot.getThings(); - Directory dir = new RAMDirectory(); -- IndexWriterConfig indexWriterConfig = new IndexWriterConfig(Version.LUCENE_47, new SimpleAnalyzer(Version.LUCENE_47)); -+ IndexWriterConfig indexWriterConfig = new IndexWriterConfig(new SimpleAnalyzer()); - IndexWriter writer = new IndexWriter(dir, indexWriterConfig); - while (thingos.hasMoreElements()) { - JavaHeapObject thingo = thingos.nextElement();
--- a/distribution/packaging/fedora/thermostat.spec Wed Jun 29 16:35:40 2016 +0200 +++ b/distribution/packaging/fedora/thermostat.spec Tue Jun 28 15:22:30 2016 +0200 @@ -243,11 +243,6 @@ # For now _NOT_ suitable for upstream until felix ships an API only package which # is 4.3 OSGi spec. Patch2: 0002_shared_osgi_spec_fixes.patch -# This is _NOT_ suitable for upstream at this point. It's a simple backport of the -# upgrade to Lucene 5 patch: -# http://icedtea.classpath.org/hg/thermostat/rev/79df35f1ff13 -# Note: SCL-ized stack uses lucene 4.8 vs 5 in HEAD -Patch3: 0003_fedora_lucene_5.patch %if 0%{?non_bootstrap_build} # Work-around xmvn-subst limitation @@ -455,7 +450,6 @@ #%%setup -q -n %%{pkg_name}-%%{major}-%%{minor}-%%{hgrev} %patch1 -p1 %patch2 -p1 -%patch3 -p1 # Fix up artifact names which have different name upstream