Attachment 870611 Details for Bug 1072575 – Update to lucene 4.7.0

[patch] Update to lucene 4.7.0

0001-Update-to-lucene-4.7.0.patch (text/plain), 4.00 KB, created by Michael Simacek on 2014-03-04 19:41:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Simacek

Created: 2014-03-04 19:41:44 UTC

Size: 4.00 KB

patch

obsolete

>From 626a9b306736d5d90a825675e8bc2915d8200e0b Mon Sep 17 00:00:00 2001
>From: Michael Simacek <msimacek@redhat.com>
>Date: Tue, 4 Mar 2014 18:02:02 +0100
>Subject: [PATCH] Update to lucene 4.7.0
>
>Signed-off-by: Michael Simacek <msimacek@redhat.com>
>---
> thermostat.spec              | 10 ++++++++--
> update-to-lucene-4.7.0.patch | 35 +++++++++++++++++++++++++++++++++++
> 2 files changed, 43 insertions(+), 2 deletions(-)
> create mode 100644 update-to-lucene-4.7.0.patch
>
>diff --git a/thermostat.spec b/thermostat.spec
>index 9a8e16e..993e5d8 100644
>--- a/thermostat.spec
>+++ b/thermostat.spec
>@@ -78,7 +78,7 @@ Name:       %{?scl_prefix}thermostat
> Version:    %{major}.%{minor}.%{patchlevel}
> # If building from snapshot out of hg, uncomment and adjust below value as appropriate
> #Release:    0.1.20131122hg%{hgrev}%{?dist}
>-Release:    2%{?dist}
>+Release:    3%{?dist}
> Summary:    A monitoring and serviceability tool for OpenJDK
> License:    GPLv2+ with exceptions and OFL
> URL:        http://icedtea.classpath.org/thermostat/
>@@ -119,6 +119,7 @@ Patch2:     fix_loglevel.patch
> # We rely on RPM's dep solving mechanism instead.
> # See: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1591
> Patch3:     ignore_bundle_versions.patch
>+Patch4:     update-to-lucene-4.7.0.patch
> 
> BuildRequires:  java-devel >= 1:1.7.0
> BuildRequires:  jpackage-utils
>@@ -264,11 +265,13 @@ security.
> %patch1 -p1
> %patch2 -p1
> %patch3 -p1
>+%patch4 -p1
> 
> # Fix up artifact names which have different name upstream
> #  lucene
> %pom_remove_dep "org.apache.servicemix.bundles:org.apache.servicemix.bundles.lucene" common/core
>-%pom_add_dep "org.apache.lucene:lucene-core:3.6.0" common/core
>+%pom_add_dep "org.apache.lucene:lucene-analyzers:4.7.0" common/core
>+%pom_add_dep "org.apache.lucene:lucene-core:4.7.0" common/core
> #  httpclient
> %pom_remove_dep org.apache.httpcomponents:httpclient-osgi web/client
> %pom_add_dep org.apache.httpcomponents:httpclient:4.1.2 web/client
>@@ -804,6 +807,9 @@ fi
> %config(noreplace) %{system_confdir}/sysconfig/tomcat@%{pkg_name}
> 
> %changelog
>+* Tue Mar 04 2014 Michael Simacek <msimacek@redhat.com> - 1.0.2-3
>+- Update to lucene 4.7.0
>+
> * Tue Mar 04 2014 Severin Gehwolf <sgehwolf@redhat.com> - 1.0.2-2
> - Update spec due to newer httpcomponents-client version.
> 
>diff --git a/update-to-lucene-4.7.0.patch b/update-to-lucene-4.7.0.patch
>new file mode 100644
>index 0000000..86cfb0c
>--- /dev/null
>+++ b/update-to-lucene-4.7.0.patch
>@@ -0,0 +1,35 @@
>+From 979b8115e307599dfbb01d9e171b0a7219dea613 Mon Sep 17 00:00:00 2001
>+From: Michael Simacek <msimacek@redhat.com>
>+Date: Tue, 4 Mar 2014 17:06:22 +0100
>+Subject: [PATCH] Update to lucene 4.7.0
>+
>+Signed-off-by: Michael Simacek <msimacek@redhat.com>
>+---
>+ .../java/com/redhat/thermostat/vm/heap/analysis/common/HeapDump.java  | 4 ++--
>+ 1 file changed, 2 insertions(+), 2 deletions(-)
>+
>+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
>+index 7516e49..cce16e4 100644
>+--- 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
>+@@ -49,7 +49,7 @@ import java.util.Enumeration;
>+ import java.util.logging.Level;
>+ import java.util.logging.Logger;
>+ 
>+-import org.apache.lucene.analysis.SimpleAnalyzer;
>++import org.apache.lucene.analysis.core.SimpleAnalyzer;
>+ import org.apache.lucene.document.Document;
>+ import org.apache.lucene.document.Field;
>+ import org.apache.lucene.index.CorruptIndexException;
>+@@ -209,7 +209,7 @@ public class HeapDump {
>+                 String objectId = doc.get(INDEX_FIELD_OBJECT_ID);
>+                 results.add(objectId);
>+             }
>+-            searcher.close();
>++            indexReader.close();
>+         } catch (IOException e) {
>+             log.log(Level.SEVERE, "Unexpected IO Exception while searching heap dump index", e);
>+         }
>+-- 
>+1.8.5.3
>+
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1072575: 870611