Mercurial > hg > thermostat

changeset 2609:3e0b81d9b291

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use modifiable Lucene coordinates in heap dump assembly Reviewed-by: jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-March/022340.html PR3239
author Elliott Baron <ebaron@redhat.com>
date Mon, 06 Mar 2017 11:11:51 -0500
parents 1286dad1ad8f
children 2885a4a290d0
files distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch distribution/packaging/fedora/0003_rhel_lucene_4.patch distribution/packaging/fedora/thermostat.spec pom.xml vm-heap-analysis/distribution/assemblies/plugin-assembly-agent.xml vm-heap-analysis/distribution/assemblies/plugin-assembly.xml
diffstat 6 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch	Fri Mar 03 12:45:11 2017 -0500
+++ b/distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch	Mon Mar 06 11:11:51 2017 -0500
@@ -938,7 +938,7 @@
 --- a/pom.xml
 +++ b/pom.xml
 @@ -293,14 +293,26 @@
-     <lucene-analysis.bundle.symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</lucene-analysis.bundle.symbolic-name>
+     <lucene-core.maven-coords>org.apache.servicemix.bundles:org.apache.servicemix.bundles.lucene</lucene-core.maven-coords>
      <lucene-core.bundle.symbolic-name>org.apache.servicemix.bundles.lucene</lucene-core.bundle.symbolic-name>
      <!--
 -         felix 4.0 is compliant with osgi 4.3
--- a/distribution/packaging/fedora/0003_rhel_lucene_4.patch	Fri Mar 03 12:45:11 2017 -0500
+++ b/distribution/packaging/fedora/0003_rhel_lucene_4.patch	Mon Mar 06 11:11:51 2017 -0500
@@ -11,7 +11,7 @@
 +    <lucene.osgi-version>4.7.0.1</lucene.osgi-version>
      <byteman.version>3.0.5</byteman.version>
      <byteman.osgi-version>3.0.5</byteman.osgi-version>
-     <lucene-analysis.bundle.symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</lucene-analysis.bundle.symbolic-name>
+     <lucene-analysis.maven-coords>org.apache.servicemix.bundles:org.apache.servicemix.bundles.lucene-analyzers-common</lucene-analysis.maven-coords>
 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
--- a/distribution/packaging/fedora/thermostat.spec	Fri Mar 03 12:45:11 2017 -0500
+++ b/distribution/packaging/fedora/thermostat.spec	Mon Mar 06 11:11:51 2017 -0500
@@ -749,7 +749,9 @@
                  -Djansi.version=%{jansi_version} \
                  -Djcommon.osgi.version=%{jcommon_bundle_version} \
                  -Djfreechart.osgi.version=%{jfreechart_bundle_version} \
+                 -Dlucene-core.maven-coords=org.apache.lucene:lucene-core \
                  -Dlucene-core.bundle.symbolic-name=org.apache.lucene.core \
+                 -Dlucene-analysis.maven-coords=org.apache.lucene:lucene-analyzers \
                  -Dlucene-analysis.bundle.symbolic-name=%{lucene_analysis_core_bsn} \
                  -Dosgi.compendium.bundle.symbolic-name=org.osgi.compendium \
                  -Dosgi.compendium.osgi-version=4.1.0 \
--- a/pom.xml	Fri Mar 03 12:45:11 2017 -0500
+++ b/pom.xml	Mon Mar 06 11:11:51 2017 -0500
@@ -313,7 +313,9 @@
     <lucene.osgi-version>5.1.0.1</lucene.osgi-version>
     <byteman.version>3.0.5</byteman.version>
     <byteman.osgi-version>3.0.5</byteman.osgi-version>
+    <lucene-analysis.maven-coords>org.apache.servicemix.bundles:org.apache.servicemix.bundles.lucene-analyzers-common</lucene-analysis.maven-coords>
     <lucene-analysis.bundle.symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</lucene-analysis.bundle.symbolic-name>
+    <lucene-core.maven-coords>org.apache.servicemix.bundles:org.apache.servicemix.bundles.lucene</lucene-core.maven-coords>
     <lucene-core.bundle.symbolic-name>org.apache.servicemix.bundles.lucene</lucene-core.bundle.symbolic-name>
     <!--
          felix 4.0 is compliant with osgi 4.3
--- a/vm-heap-analysis/distribution/assemblies/plugin-assembly-agent.xml	Fri Mar 03 12:45:11 2017 -0500
+++ b/vm-heap-analysis/distribution/assemblies/plugin-assembly-agent.xml	Mon Mar 06 11:11:51 2017 -0500
@@ -52,8 +52,8 @@
         <include>com.redhat.thermostat:thermostat-vm-heap-analysis-common</include>
         <include>com.redhat.thermostat:thermostat-vm-heap-analysis-agent</include>
         <include>com.redhat.thermostat:thermostat-vm-heap-analysis-hprof</include>
-        <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.lucene</include>
-        <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.lucene-analyzers-common</include>
+        <include>${lucene-core.maven-coords}</include>
+        <include>${lucene-analysis.maven-coords}</include>
       </includes>
       <useProjectArtifact>false</useProjectArtifact>
       <useTransitiveDependencies>false</useTransitiveDependencies>
--- a/vm-heap-analysis/distribution/assemblies/plugin-assembly.xml	Fri Mar 03 12:45:11 2017 -0500
+++ b/vm-heap-analysis/distribution/assemblies/plugin-assembly.xml	Mon Mar 06 11:11:51 2017 -0500
@@ -55,8 +55,8 @@
         <include>com.redhat.thermostat:thermostat-vm-heap-analysis-client-swing</include>
         <include>com.redhat.thermostat:thermostat-vm-heap-analysis-agent</include>
         <include>com.redhat.thermostat:thermostat-vm-heap-analysis-hprof</include>
-        <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.lucene</include>
-        <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.lucene-analyzers-common</include>
+        <include>${lucene-core.maven-coords}</include>
+        <include>${lucene-analysis.maven-coords}</include>
       </includes>
       <useProjectArtifact>false</useProjectArtifact>
       <useTransitiveDependencies>false</useTransitiveDependencies>