# HG changeset patch
# User Severin Gehwolf <sgehwolf@redhat.com>
# Date 1467289728 -7200
# Node ID 47d457a93a1dc1092d71b256dc20e7c09823adff
# Parent  7e6a52dfd303d802768df0aea554df36e878ff80
[RPM] More bundle resolution fixes.

- Fedora rawhide has version 3.2.2 of apache-commons-collections.
- find-vm needs to include http mime bundle downstream (bundled
  upstream) and jfreechart bundles since downstream it's a proper
  OSGi bundle.

Reviewed-by: jkang
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-June/020090.html
PR3071

diff -r 7e6a52dfd303 -r 47d457a93a1d distribution/packaging/fedora/0001_shared_fix_bundle_loading.patch
--- a/distribution/packaging/fedora/0001_shared_fix_bundle_loading.patch	Thu Jun 30 16:28:18 2016 -0400
+++ b/distribution/packaging/fedora/0001_shared_fix_bundle_loading.patch	Thu Jun 30 14:28:48 2016 +0200
@@ -1,7 +1,7 @@
 diff --git a/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/distribution/thermostat-plugin.xml b/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/distribution/thermostat-plugin.xml
 --- a/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/distribution/thermostat-plugin.xml
 +++ b/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/distribution/thermostat-plugin.xml
-@@ -40,7 +40,7 @@
+@@ -39,7 +39,7 @@
          <bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${symbol_dollar}{commons-logging.version}</version></bundle>
          <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${symbol_dollar}{httpcomponents.core.version}</version></bundle>
          <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${symbol_dollar}{httpcomponents.client.version}</version></bundle>
@@ -156,10 +156,33 @@
  
  summary = show various statistics about a VM
  
+diff --git a/distribution/config/osgi-export.properties b/distribution/config/osgi-export.properties
+--- a/distribution/config/osgi-export.properties
++++ b/distribution/config/osgi-export.properties
+@@ -33,19 +33,6 @@
+ # to do so, delete this exception statement from your version.
+ 
+ # OSGi public API
+-org.jfree.chart
+-org.jfree.chart.axis
+-org.jfree.chart.event
+-org.jfree.chart.labels
+-org.jfree.chart.plot
+-org.jfree.chart.panel
+-org.jfree.chart.renderer.xy
+-org.jfree.data
+-org.jfree.data.general
+-org.jfree.data.time
+-org.jfree.data.xy
+-org.jfree.ui
+-org.jfree.data.gantt
+ sun.swing
+ sun.swing.table
+ 
 diff --git a/killvm/distribution/thermostat-plugin.xml b/killvm/distribution/thermostat-plugin.xml
 --- a/killvm/distribution/thermostat-plugin.xml
 +++ b/killvm/distribution/thermostat-plugin.xml
-@@ -74,9 +74,11 @@
+@@ -81,9 +81,11 @@
          <bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
          <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
          <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
@@ -185,7 +208,7 @@
 diff --git a/setup/distribution/thermostat-plugin.xml b/setup/distribution/thermostat-plugin.xml
 --- a/setup/distribution/thermostat-plugin.xml
 +++ b/setup/distribution/thermostat-plugin.xml
-@@ -64,6 +64,8 @@
+@@ -77,6 +77,8 @@
          <bundle><symbolic-name>com.redhat.thermostat.internal.utils.laf</symbolic-name><version>${project.version}</version></bundle>
          <bundle><symbolic-name>com.redhat.thermostat.plugin.validator</symbolic-name><version>${project.version}</version></bundle>
          <bundle><symbolic-name>com.redhat.thermostat.process</symbolic-name><version>${project.version}</version></bundle>
@@ -208,6 +231,22 @@
          <bundle><symbolic-name>com.google.gson</symbolic-name><version>${gson.version}</version></bundle>
          <bundle><symbolic-name>org.mongodb.mongo-java-driver</symbolic-name><version>${mongo-driver.osgi-version}</version></bundle>
          <bundle><symbolic-name>org.apache.commons.beanutils</symbolic-name><version>${commons-beanutils.version}</version></bundle>
+diff --git a/vm-find/distribution/thermostat-plugin.xml b/vm-find/distribution/thermostat-plugin.xml
+--- a/vm-find/distribution/thermostat-plugin.xml
++++ b/vm-find/distribution/thermostat-plugin.xml
+@@ -220,9 +220,11 @@
+         <bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
+         <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
+         <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
+-        <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-version}</version></bundle>
++        <bundle><symbolic-name>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.mime.version}</version></bundle>
+         <bundle><symbolic-name>com.google.gson</symbolic-name><version>${gson.version}</version></bundle>
+         <bundle><symbolic-name>org.jboss.netty</symbolic-name><version>${netty.version}</version></bundle>
++        <bundle><symbolic-name>org.jfree.jcommon</symbolic-name><version>${jcommon.osgi.version}</version></bundle>
++        <bundle><symbolic-name>org.jfree.jfreechart</symbolic-name><version>${jfreechart.osgi.version}</version></bundle>
+       </bundles>
+     </command>
+   </commands>
 diff --git a/vm-gc/distribution/thermostat-plugin.xml b/vm-gc/distribution/thermostat-plugin.xml
 --- a/vm-gc/distribution/thermostat-plugin.xml
 +++ b/vm-gc/distribution/thermostat-plugin.xml
@@ -224,7 +263,7 @@
        </bundles>
      </command>
      <command>
-@@ -134,9 +136,11 @@
+@@ -122,9 +124,11 @@
          <bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
          <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
          <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
@@ -240,7 +279,7 @@
 diff --git a/vm-heap-analysis/distribution/thermostat-plugin.xml b/vm-heap-analysis/distribution/thermostat-plugin.xml
 --- a/vm-heap-analysis/distribution/thermostat-plugin.xml
 +++ b/vm-heap-analysis/distribution/thermostat-plugin.xml
-@@ -80,9 +80,11 @@
+@@ -87,9 +87,11 @@
          <bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
          <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
          <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
@@ -253,7 +292,7 @@
          <bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
          <bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
        </bundles>
-@@ -137,9 +139,11 @@
+@@ -144,9 +146,11 @@
          <bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
          <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
          <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
@@ -266,7 +305,7 @@
          <bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
          <bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
        </bundles>
-@@ -197,9 +201,11 @@
+@@ -204,9 +208,11 @@
          <bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
          <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
          <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
@@ -279,7 +318,7 @@
          <bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
          <bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
        </bundles>
-@@ -251,9 +257,11 @@
+@@ -258,9 +264,11 @@
          <bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
          <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
          <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
@@ -292,7 +331,7 @@
          <bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
          <bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
        </bundles>
-@@ -305,9 +313,11 @@
+@@ -312,9 +320,11 @@
          <bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
          <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
          <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
@@ -305,7 +344,7 @@
          <bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
          <bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
        </bundles>
-@@ -359,9 +369,11 @@
+@@ -366,9 +376,11 @@
          <bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
          <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
          <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
@@ -318,7 +357,7 @@
          <bundle><symbolic-name>${lucene-core.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
          <bundle><symbolic-name>${lucene-analysis.bundle.symbolic-name}</symbolic-name><version>${lucene.osgi-version}</version></bundle>
        </bundles>
-@@ -407,9 +419,11 @@
+@@ -414,9 +426,11 @@
          <bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
          <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
          <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
@@ -334,7 +373,7 @@
 diff --git a/vm-profiler/distribution/thermostat-plugin.xml b/vm-profiler/distribution/thermostat-plugin.xml
 --- a/vm-profiler/distribution/thermostat-plugin.xml
 +++ b/vm-profiler/distribution/thermostat-plugin.xml
-@@ -88,7 +88,7 @@
+@@ -95,7 +95,7 @@
                  <bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
                  <bundle><symbolic-name>org.apache.httpcomponents.httpcore</symbolic-name><version>${httpcomponents.core.version}</version></bundle>
                  <bundle><symbolic-name>org.apache.httpcomponents.httpclient</symbolic-name><version>${httpcomponents.client.version}</version></bundle>
diff -r 7e6a52dfd303 -r 47d457a93a1d distribution/packaging/fedora/thermostat.spec
--- a/distribution/packaging/fedora/thermostat.spec	Thu Jun 30 16:28:18 2016 -0400
+++ b/distribution/packaging/fedora/thermostat.spec	Thu Jun 30 14:28:48 2016 +0200
@@ -49,6 +49,8 @@
   %global beanutils_bundle_version   1.9.2
   # apache-commons-codec
   %global codec_bundle_version       1.10.0
+  # apache-commons-collections
+  %global collections_bundle_version 3.2.2
   # apache-commons-logging
   %global logging_bundle_version     1.2.0
   %global hc_core_bundle_version     4.4.5
@@ -77,6 +79,8 @@
   %global beanutils_bundle_version   1.8.3
   # apache-commons-codec
   %global codec_bundle_version       1.8.0
+  # apache-commons-collections
+  %global collections_bundle_version 3.2.1
   # apache-commons-logging
   %global logging_bundle_version     1.1.2
   %global hc_core_bundle_version     4.3.3
@@ -101,8 +105,6 @@
 # with version suffix. See 0001_shared_fix_bundle_loading.patch
 %global jansi_version              1.11
 
-# apache-commons-collections
-%global collections_bundle_version 3.2.1
 
 # Base path to the JDK which will be used in boot scripts
 %if 0%{?fedora} >= 22