|
 |
aa165c |
# HG changeset patch
|
|
|
aa165c |
# Parent 87052247afc2111919d290cb94eabefd83979263
|
|
|
aa165c |
diff --git a/pom.xml b/pom.xml
|
|
|
aa165c |
--- a/pom.xml
|
|
|
aa165c |
+++ b/pom.xml
|
|
|
aa165c |
@@ -238,8 +238,10 @@
|
|
|
aa165c |
<commons-fileupload.version>1.2.2</commons-fileupload.version>
|
|
|
aa165c |
|
|
|
aa165c |
<jline.version>2.9</jline.version>
|
|
|
aa165c |
- <lucene.version>4.7.0_1</lucene.version>
|
|
|
aa165c |
- <lucene.osgi-version>4.7.0.1</lucene.osgi-version>
|
|
|
aa165c |
+ <lucene.version>4.8.0_1</lucene.version>
|
|
|
aa165c |
+ <lucene.osgi-version>4.8.0.1</lucene.osgi-version>
|
|
|
aa165c |
+ <lucene-analysis.bundle.symbolic-name>org.apache.lucene.analysis</lucene-analysis.bundle.symbolic-name>
|
|
|
aa165c |
+ <lucene-core.bundle.symbolic-name>org.apache.lucene.core</lucene-core.bundle.symbolic-name>
|
|
|
aa165c |
|
|
|
aa165c |
Since we use felix framework at runtime, try to avoid introducing an
|
|
|
aa165c |
extra dependency for OSGi API-only (e.g. org.osgi:org.osgi.core) in order to
|
|
|
aa165c |
diff --git a/vm-heap-analysis/distribution/thermostat-plugin.xml b/vm-heap-analysis/distribution/thermostat-plugin.xml
|
|
|
aa165c |
--- a/vm-heap-analysis/distribution/thermostat-plugin.xml
|
|
|
aa165c |
+++ b/vm-heap-analysis/distribution/thermostat-plugin.xml
|
|
|
aa165c |
@@ -92,8 +92,8 @@
|
|
|
aa165c |
<bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
|
|
|
aa165c |
<bundle><symbolic-name>org.jfree.jcommon</symbolic-name><version>${jcommon.osgi.version}</version></bundle>
|
|
|
aa165c |
<bundle><symbolic-name>org.jfree.jfreechart</symbolic-name><version>${jfreechart.osgi.version}</version></bundle>
|
|
|
aa165c |
- <bundle><symbolic-name>org.apache.servicemix.bundles.lucene</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
- <bundle><symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
+ <bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
+ <bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
</bundles>
|
|
|
aa165c |
</command>
|
|
|
aa165c |
<command>
|
|
|
aa165c |
@@ -151,8 +151,8 @@
|
|
|
aa165c |
<bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
|
|
|
aa165c |
<bundle><symbolic-name>org.jfree.jcommon</symbolic-name><version>${jcommon.osgi.version}</version></bundle>
|
|
|
aa165c |
<bundle><symbolic-name>org.jfree.jfreechart</symbolic-name><version>${jfreechart.osgi.version}</version></bundle>
|
|
|
aa165c |
- <bundle><symbolic-name>org.apache.servicemix.bundles.lucene</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
- <bundle><symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
+ <bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
+ <bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
</bundles>
|
|
|
aa165c |
</command>
|
|
|
aa165c |
<command>
|
|
|
aa165c |
@@ -213,8 +213,8 @@
|
|
|
aa165c |
<bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
|
|
|
aa165c |
<bundle><symbolic-name>org.jfree.jcommon</symbolic-name><version>${jcommon.osgi.version}</version></bundle>
|
|
|
aa165c |
<bundle><symbolic-name>org.jfree.jfreechart</symbolic-name><version>${jfreechart.osgi.version}</version></bundle>
|
|
|
aa165c |
- <bundle><symbolic-name>org.apache.servicemix.bundles.lucene</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
- <bundle><symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
+ <bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
+ <bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
</bundles>
|
|
|
aa165c |
</command>
|
|
|
aa165c |
<command>
|
|
|
aa165c |
@@ -269,8 +269,8 @@
|
|
|
aa165c |
<bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
|
|
|
aa165c |
<bundle><symbolic-name>org.jfree.jcommon</symbolic-name><version>${jcommon.osgi.version}</version></bundle>
|
|
|
aa165c |
<bundle><symbolic-name>org.jfree.jfreechart</symbolic-name><version>${jfreechart.osgi.version}</version></bundle>
|
|
|
aa165c |
- <bundle><symbolic-name>org.apache.servicemix.bundles.lucene</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
- <bundle><symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
+ <bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
+ <bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
</bundles>
|
|
|
aa165c |
</command>
|
|
|
aa165c |
<command>
|
|
|
aa165c |
@@ -325,8 +325,8 @@
|
|
|
aa165c |
<bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
|
|
|
aa165c |
<bundle><symbolic-name>org.jfree.jcommon</symbolic-name><version>${jcommon.osgi.version}</version></bundle>
|
|
|
aa165c |
<bundle><symbolic-name>org.jfree.jfreechart</symbolic-name><version>${jfreechart.osgi.version}</version></bundle>
|
|
|
aa165c |
- <bundle><symbolic-name>org.apache.servicemix.bundles.lucene</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
- <bundle><symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
+ <bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
+ <bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
</bundles>
|
|
|
aa165c |
</command>
|
|
|
aa165c |
<command>
|
|
|
aa165c |
@@ -381,8 +381,8 @@
|
|
|
aa165c |
<bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
|
|
|
aa165c |
<bundle><symbolic-name>org.jfree.jcommon</symbolic-name><version>${jcommon.osgi.version}</version></bundle>
|
|
|
aa165c |
<bundle><symbolic-name>org.jfree.jfreechart</symbolic-name><version>${jfreechart.osgi.version}</version></bundle>
|
|
|
aa165c |
- <bundle><symbolic-name>org.apache.servicemix.bundles.lucene</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
- <bundle><symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
+ <bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
+ <bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
</bundles>
|
|
|
aa165c |
</command>
|
|
|
aa165c |
<command>
|
|
|
aa165c |
@@ -430,8 +430,8 @@
|
|
|
aa165c |
<bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
|
|
|
aa165c |
<bundle><symbolic-name>org.jfree.jcommon</symbolic-name><version>${jcommon.osgi.version}</version></bundle>
|
|
|
aa165c |
<bundle><symbolic-name>org.jfree.jfreechart</symbolic-name><version>${jfreechart.osgi.version}</version></bundle>
|
|
|
aa165c |
- <bundle><symbolic-name>org.apache.servicemix.bundles.lucene</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
- <bundle><symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
+ <bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
+ <bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
</bundles>
|
|
|
aa165c |
</command>
|
|
|
aa165c |
</commands>
|
|
|
aa165c |
@@ -446,8 +446,8 @@
|
|
|
aa165c |
<bundle><symbolic-name>com.redhat.thermostat.common.command</symbolic-name><version>${project.version}</version></bundle>
|
|
|
aa165c |
<bundle><symbolic-name>com.redhat.thermostat.client.core</symbolic-name><version>${project.version}</version></bundle>
|
|
|
aa165c |
<bundle><symbolic-name>com.redhat.thermostat.client.swing</symbolic-name><version>${project.version}</version></bundle>
|
|
|
aa165c |
- <bundle><symbolic-name>org.apache.servicemix.bundles.lucene</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
- <bundle><symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
+ <bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
+ <bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
</bundles>
|
|
|
aa165c |
</extension>
|
|
|
aa165c |
<extension>
|
|
|
aa165c |
@@ -455,8 +455,8 @@
|
|
|
aa165c |
<bundles>
|
|
|
aa165c |
<bundle><symbolic-name>com.redhat.thermostat.vm.heap.analysis.common</symbolic-name><version>${project.version}</version></bundle>
|
|
|
aa165c |
<bundle><symbolic-name>com.redhat.thermostat.vm.heap.analysis.agent</symbolic-name><version>${project.version}</version></bundle>
|
|
|
aa165c |
- <bundle><symbolic-name>org.apache.servicemix.bundles.lucene</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
- <bundle><symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
+ <bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
+ <bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
|
|
|
aa165c |
</bundles>
|
|
|
aa165c |
</extension>
|
|
|
aa165c |
</extensions>
|