The package rpms/thermostat.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/thermostat.git/commit/?id=a500678....
Change:
-%ifarch %{arm} %{ix86} x86_64
Thanks.
Full change:
============
commit a500678a600c04dc514cf0f877a3d3514ab74785
Author: Severin Gehwolf <sgehwolf(a)redhat.com>
Date: Thu Oct 18 11:44:55 2018 +0200
Thermostat is dead upstream and, thus, unmaintained.
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 0e786f7..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/thermostat-1.6.0.tar.gz
-/thermostat-1.6.4.tar.gz
-thermostat-1.6.0
-thermostat-1.6.4
-/thermostat-1.6.6.tar.gz
-thermostat-1.6.6
diff --git a/0001_shared_fix_bundle_loading.patch b/0001_shared_fix_bundle_loading.patch
deleted file mode 100644
index 33692f7..0000000
--- a/0001_shared_fix_bundle_loading.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-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
-@@ -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>
--
<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>${symbol_dollar}{gson.version}</version></bundle>
- </bundles>
- </command>
-diff --git a/dev/schema-info-command/distribution/thermostat-plugin.xml
b/dev/schema-info-command/distribution/thermostat-plugin.xml
---- a/dev/schema-info-command/distribution/thermostat-plugin.xml
-+++ b/dev/schema-info-command/distribution/thermostat-plugin.xml
-@@ -63,7 +63,7 @@
-
<bundle><symbolic-name>com.redhat.thermostat.web.client</symbolic-name><version>${project.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>org.mongodb.mongo-java-driver</symbolic-name><version>${mongo-driver.osgi-version}</version></bundle>
- </bundles>
- </command>
-diff --git a/distribution/config/commands/agent-info.properties
b/distribution/config/commands/agent-info.properties
---- a/distribution/config/commands/agent-info.properties
-+++ b/distribution/config/commands/agent-info.properties
-@@ -4,7 +4,7 @@
- com.redhat.thermostat.web.client=${project.version}, \
- org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
- org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
-- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
-+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
- com.google.gson=${gson.version}, \
- org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
- org.apache.commons.beanutils=${commons-beanutils.version}, \
-diff --git a/distribution/config/commands/agent.properties
b/distribution/config/commands/agent.properties
---- a/distribution/config/commands/agent.properties
-+++ b/distribution/config/commands/agent.properties
-@@ -3,7 +3,7 @@
- com.redhat.thermostat.web.client=${project.version}, \
- org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
- org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
-- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
-+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
- com.google.gson=${gson.version}, \
- com.redhat.thermostat.process=${project.version}, \
- com.redhat.thermostat.common.core=${project.version}, \
-diff --git a/distribution/config/commands/clean-data.properties
b/distribution/config/commands/clean-data.properties
---- a/distribution/config/commands/clean-data.properties
-+++ b/distribution/config/commands/clean-data.properties
-@@ -4,7 +4,7 @@
- com.redhat.thermostat.web.client=${project.version}, \
- org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
- org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
-- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
-+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
- com.google.gson=${gson.version}, \
- org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
- org.apache.commons.beanutils=${commons-beanutils.version}, \
-diff --git a/distribution/config/commands/connect.properties
b/distribution/config/commands/connect.properties
---- a/distribution/config/commands/connect.properties
-+++ b/distribution/config/commands/connect.properties
-@@ -10,7 +10,7 @@
- org.apache.commons.logging=${commons-logging.version}, \
- org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
- org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
-- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
-+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
- com.google.gson=${gson.version}
-
- summary = persistently connect to storage
-diff --git a/distribution/config/commands/gui.properties
b/distribution/config/commands/gui.properties
---- a/distribution/config/commands/gui.properties
-+++ b/distribution/config/commands/gui.properties
-@@ -19,8 +19,11 @@
- com.redhat.thermostat.process=${project.version}, \
- org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
- org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
-- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
-- org.jboss.netty=${netty.version}
-+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
-+ org.jboss.netty=${netty.version}, \
-+ org.jfree.jcommon=${jcommon.osgi.version}, \
-+ org.jfree.jfreechart=${jfreechart.osgi.version}, \
-+ com.mxgraph=${jgraphx.osgi.version}
-
- summary = launch the GUI client
-
-diff --git a/distribution/config/commands/list-agents.properties
b/distribution/config/commands/list-agents.properties
---- a/distribution/config/commands/list-agents.properties
-+++ b/distribution/config/commands/list-agents.properties
-@@ -4,7 +4,7 @@
- com.redhat.thermostat.web.client=${project.version}, \
- org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
- org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
-- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
-+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
- com.google.gson=${gson.version}, \
- org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
- org.apache.commons.beanutils=${commons-beanutils.version}, \
-diff --git a/distribution/config/commands/list-vms.properties
b/distribution/config/commands/list-vms.properties
---- a/distribution/config/commands/list-vms.properties
-+++ b/distribution/config/commands/list-vms.properties
-@@ -4,7 +4,7 @@
- com.redhat.thermostat.web.client=${project.version}, \
- org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
- org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
-- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
-+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
- com.google.gson=${gson.version}, \
- org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
- org.apache.commons.beanutils=${commons-beanutils.version}, \
-diff --git a/distribution/config/commands/ping.properties
b/distribution/config/commands/ping.properties
---- a/distribution/config/commands/ping.properties
-+++ b/distribution/config/commands/ping.properties
-@@ -5,7 +5,7 @@
- com.redhat.thermostat.web.client=${project.version}, \
- org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
- org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
-- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
-+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
- com.google.gson=${gson.version}, \
- org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
- org.apache.commons.beanutils=${commons-beanutils.version}, \
-diff --git a/distribution/config/commands/vm-info.properties
b/distribution/config/commands/vm-info.properties
---- a/distribution/config/commands/vm-info.properties
-+++ b/distribution/config/commands/vm-info.properties
-@@ -4,7 +4,7 @@
- com.redhat.thermostat.web.client=${project.version}, \
- org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
- org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
-- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
-+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
- com.google.gson=${gson.version}, \
- org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
- org.apache.commons.beanutils=${commons-beanutils.version}, \
-diff --git a/distribution/config/commands/vm-stat.properties
b/distribution/config/commands/vm-stat.properties
---- a/distribution/config/commands/vm-stat.properties
-+++ b/distribution/config/commands/vm-stat.properties
-@@ -5,13 +5,15 @@
- com.redhat.thermostat.client.core=${project.version}, \
- org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
- org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
-- ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
-+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
- com.google.gson=${gson.version}, \
- org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
- org.apache.commons.beanutils=${commons-beanutils.version}, \
- org.apache.commons.codec=${commons-codec.osgi-version}, \
- org.apache.commons.collections=${commons-collections.version}, \
-- org.apache.commons.logging=${commons-logging.version}
-+ org.apache.commons.logging=${commons-logging.version}, \
-+ org.jfree.jcommon=${jcommon.osgi.version}, \
-+ org.jfree.jfreechart=${jfreechart.osgi.version}
-
- 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
-@@ -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>
--
<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/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties
b/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties
----
a/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties
-+++
b/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties
-@@ -5,4 +5,5 @@
- thermostat-plugin-validator-${project.version}.jar, \
- thermostat-launcher-${project.version}.jar, \
- jline-${jline.version}.jar, \
-- commons-cli-${commons-cli.version}.jar
-+ commons-cli-${commons-cli.version}.jar, \
-+ jansi-${jansi.version}.jar
-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
-@@ -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>
-+
<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/storage-profile/distribution/thermostat-plugin.xml
b/storage-profile/distribution/thermostat-plugin.xml
---- a/storage-profile/distribution/thermostat-plugin.xml
-+++ b/storage-profile/distribution/thermostat-plugin.xml
-@@ -70,9 +70,9 @@
-
<bundle><symbolic-name>com.redhat.thermostat.storage.mongodb</symbolic-name><version>${project.version}</version></bundle>
-
<bundle><symbolic-name>com.redhat.thermostat.web.common</symbolic-name><version>${project.version}</version></bundle>
-
<bundle><symbolic-name>com.redhat.thermostat.web.client</symbolic-name><version>${project.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.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>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.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
-@@ -76,9 +76,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>
- <command>
-@@ -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>
--
<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-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
-@@ -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>
--
<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>
-
<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>
-@@ -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>
--
<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>
-
<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>
-@@ -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>
--
<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>
-
<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>
-@@ -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>
--
<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>
-
<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>
-@@ -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>
--
<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>
-
<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>
-@@ -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>
--
<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>
-
<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>
-@@ -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>
--
<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>
-
<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>
-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
-@@ -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>
--
<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>
- </bundles>
- </command>
- </commands>
-diff --git a/web/endpoint-plugin/distribution/thermostat-plugin.xml
b/web/endpoint-plugin/distribution/thermostat-plugin.xml
---- a/web/endpoint-plugin/distribution/thermostat-plugin.xml
-+++ b/web/endpoint-plugin/distribution/thermostat-plugin.xml
-@@ -73,7 +73,7 @@
-
<bundle><symbolic-name>com.redhat.thermostat.web.client</symbolic-name><version>${project.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>com.redhat.thermostat.process</symbolic-name><version>${project.version}</version></bundle>
-
<bundle><symbolic-name>com.redhat.thermostat.agent.cli</symbolic-name><version>${project.version}</version></bundle>
diff --git a/0002_shared_osgi_spec_fixes.patch b/0002_shared_osgi_spec_fixes.patch
deleted file mode 100644
index eaf9bb2..0000000
--- a/0002_shared_osgi_spec_fixes.patch
+++ /dev/null
@@ -1,2044 +0,0 @@
-diff --git a/agent/cli/pom.xml b/agent/cli/pom.xml
---- a/agent/cli/pom.xml
-+++ b/agent/cli/pom.xml
-@@ -97,8 +97,8 @@
- <version>${project.version}</version>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/agent/command/pom.xml b/agent/command/pom.xml
---- a/agent/command/pom.xml
-+++ b/agent/command/pom.xml
-@@ -76,8 +76,8 @@
- <artifactId>netty</artifactId>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/agent/core/pom.xml b/agent/core/pom.xml
---- a/agent/core/pom.xml
-+++ b/agent/core/pom.xml
-@@ -88,8 +88,8 @@
- <version>${project.version}</version>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun</groupId>
-diff --git a/client/cli/pom.xml b/client/cli/pom.xml
---- a/client/cli/pom.xml
-+++ b/client/cli/pom.xml
-@@ -101,14 +101,8 @@
- <version>${project.version}</version>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/client/command/pom.xml b/client/command/pom.xml
---- a/client/command/pom.xml
-+++ b/client/command/pom.xml
-@@ -76,9 +76,8 @@
- <artifactId>netty</artifactId>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/client/core/pom.xml b/client/core/pom.xml
---- a/client/core/pom.xml
-+++ b/client/core/pom.xml
-@@ -96,14 +96,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- </dependencies>
-
-diff --git a/client/living-vm-filter/core/pom.xml b/client/living-vm-filter/core/pom.xml
---- a/client/living-vm-filter/core/pom.xml
-+++ b/client/living-vm-filter/core/pom.xml
-@@ -90,15 +90,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
--
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/client/living-vm-filter/swing/pom.xml
b/client/living-vm-filter/swing/pom.xml
---- a/client/living-vm-filter/swing/pom.xml
-+++ b/client/living-vm-filter/swing/pom.xml
-@@ -92,15 +92,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
--
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/client/swing/pom.xml b/client/swing/pom.xml
---- a/client/swing/pom.xml
-+++ b/client/swing/pom.xml
-@@ -110,14 +110,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/common/core/pom.xml b/common/core/pom.xml
---- a/common/core/pom.xml
-+++ b/common/core/pom.xml
-@@ -145,16 +145,6 @@
- <artifactId>commons-cli</artifactId>
- </dependency>
-
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-- </dependency>
-
- <dependency>
- <groupId>com.sun</groupId>
-diff --git a/config/pom.xml b/config/pom.xml
---- a/config/pom.xml
-+++ b/config/pom.xml
-@@ -91,14 +91,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git
a/dev/multi-module-plugin-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
b/dev/multi-module-plugin-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
----
a/dev/multi-module-plugin-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
-+++
b/dev/multi-module-plugin-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
-@@ -85,11 +85,8 @@
- <requiredProperty key="gson-version">
- <defaultValue>${gson.version}</defaultValue>
- </requiredProperty>
-- <requiredProperty key="osgi-compendium-osgi-version">
-- <defaultValue>${osgi.compendium.osgi-version}</defaultValue>
-- </requiredProperty>
-- <requiredProperty key="osgi-compendium-bundle-symbolic-name">
-- <defaultValue>${osgi.compendium.bundle.symbolic-name}</defaultValue>
-+ <requiredProperty key="felix.framework.version">
-+ <defaultValue>${felix.framework.version}</defaultValue>
- </requiredProperty>
- </requiredProperties>
- <fileSets>
-diff --git
a/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/agent/pom.xml
b/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/agent/pom.xml
----
a/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/agent/pom.xml
-+++
b/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/agent/pom.xml
-@@ -52,8 +52,8 @@
- <dependencies>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- <scope>provided</scope>
- </dependency>
-
-diff --git
a/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/client-cli/pom.xml
b/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/client-cli/pom.xml
----
a/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/client-cli/pom.xml
-+++
b/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/client-cli/pom.xml
-@@ -16,8 +16,8 @@
- <dependencies>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- <scope>provided</scope>
- </dependency>
-
-diff --git
a/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/pom.xml
b/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/pom.xml
---- a/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/pom.xml
-+++ b/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/pom.xml
-@@ -107,13 +107,13 @@
- <artifactId>junit</artifactId>
- <version>${symbol_dollar}{junit.version}</version>
- </dependency>
--
-+
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <version>${symbol_dollar}{osgi.core.version}</version>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
-+ <version>${symbol_dollar}{felix.framework.version}</version>
- </dependency>
--
-+
- <!-- thermostat dependencies -->
-
- <dependency>
-diff --git
a/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/storage-common/pom.xml
b/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/storage-common/pom.xml
----
a/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/storage-common/pom.xml
-+++
b/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/storage-common/pom.xml
-@@ -61,8 +61,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- <scope>provided</scope>
- </dependency>
-
-diff --git a/experimental/collections/pom.xml b/experimental/collections/pom.xml
---- a/experimental/collections/pom.xml
-+++ b/experimental/collections/pom.xml
-@@ -61,9 +61,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
-diff --git a/experimental/components/pom.xml b/experimental/components/pom.xml
---- a/experimental/components/pom.xml
-+++ b/experimental/components/pom.xml
-@@ -61,9 +61,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
-diff --git a/host-cpu/agent/pom.xml b/host-cpu/agent/pom.xml
---- a/host-cpu/agent/pom.xml
-+++ b/host-cpu/agent/pom.xml
-@@ -80,14 +80,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/host-cpu/client-core/pom.xml b/host-cpu/client-core/pom.xml
---- a/host-cpu/client-core/pom.xml
-+++ b/host-cpu/client-core/pom.xml
-@@ -99,14 +99,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/host-cpu/client-swing/pom.xml b/host-cpu/client-swing/pom.xml
---- a/host-cpu/client-swing/pom.xml
-+++ b/host-cpu/client-swing/pom.xml
-@@ -87,14 +87,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jfree</groupId>
-diff --git a/host-cpu/common/pom.xml b/host-cpu/common/pom.xml
---- a/host-cpu/common/pom.xml
-+++ b/host-cpu/common/pom.xml
-@@ -99,14 +99,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/host-memory/agent/pom.xml b/host-memory/agent/pom.xml
---- a/host-memory/agent/pom.xml
-+++ b/host-memory/agent/pom.xml
-@@ -80,14 +80,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/host-memory/client-core/pom.xml b/host-memory/client-core/pom.xml
---- a/host-memory/client-core/pom.xml
-+++ b/host-memory/client-core/pom.xml
-@@ -99,14 +99,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/host-memory/client-swing/pom.xml b/host-memory/client-swing/pom.xml
---- a/host-memory/client-swing/pom.xml
-+++ b/host-memory/client-swing/pom.xml
-@@ -87,14 +87,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jfree</groupId>
-diff --git a/host-memory/common/pom.xml b/host-memory/common/pom.xml
---- a/host-memory/common/pom.xml
-+++ b/host-memory/common/pom.xml
-@@ -99,14 +99,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/host-overview/client-core/pom.xml b/host-overview/client-core/pom.xml
---- a/host-overview/client-core/pom.xml
-+++ b/host-overview/client-core/pom.xml
-@@ -99,14 +99,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/host-overview/client-swing/pom.xml b/host-overview/client-swing/pom.xml
---- a/host-overview/client-swing/pom.xml
-+++ b/host-overview/client-swing/pom.xml
-@@ -87,14 +87,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jfree</groupId>
-diff --git a/keyring/pom.xml b/keyring/pom.xml
---- a/keyring/pom.xml
-+++ b/keyring/pom.xml
-@@ -170,14 +170,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/killvm/agent/pom.xml b/killvm/agent/pom.xml
---- a/killvm/agent/pom.xml
-+++ b/killvm/agent/pom.xml
-@@ -103,8 +103,8 @@
- <version>${project.version}</version>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- </dependencies>
-
-diff --git a/killvm/client-swing/pom.xml b/killvm/client-swing/pom.xml
---- a/killvm/client-swing/pom.xml
-+++ b/killvm/client-swing/pom.xml
-@@ -100,14 +100,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/killvm/command/pom.xml b/killvm/command/pom.xml
---- a/killvm/command/pom.xml
-+++ b/killvm/command/pom.xml
-@@ -87,9 +87,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/killvm/common/pom.xml b/killvm/common/pom.xml
---- a/killvm/common/pom.xml
-+++ b/killvm/common/pom.xml
-@@ -88,16 +88,6 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>4.2.0</version>
-@@ -120,4 +110,4 @@
- </dependency>
- </dependencies>
-
--</project>
-\ No newline at end of file
-+</project>
-diff --git a/laf-utils/pom.xml b/laf-utils/pom.xml
---- a/laf-utils/pom.xml
-+++ b/laf-utils/pom.xml
-@@ -137,14 +137,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/notes/client-swing/pom.xml b/notes/client-swing/pom.xml
---- a/notes/client-swing/pom.xml
-+++ b/notes/client-swing/pom.xml
-@@ -87,14 +87,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jfree</groupId>
-diff --git a/notes/common/pom.xml b/notes/common/pom.xml
---- a/notes/common/pom.xml
-+++ b/notes/common/pom.xml
-@@ -82,14 +82,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/numa/agent/pom.xml b/numa/agent/pom.xml
---- a/numa/agent/pom.xml
-+++ b/numa/agent/pom.xml
-@@ -80,9 +80,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/numa/client-core/pom.xml b/numa/client-core/pom.xml
---- a/numa/client-core/pom.xml
-+++ b/numa/client-core/pom.xml
-@@ -83,14 +83,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/numa/client-swing/pom.xml b/numa/client-swing/pom.xml
---- a/numa/client-swing/pom.xml
-+++ b/numa/client-swing/pom.xml
-@@ -87,14 +87,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jfree</groupId>
-diff --git a/numa/common/pom.xml b/numa/common/pom.xml
---- a/numa/common/pom.xml
-+++ b/numa/common/pom.xml
-@@ -82,14 +82,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/pom.xml b/pom.xml
---- a/pom.xml
-+++ b/pom.xml
-@@ -181,14 +181,26 @@
-
<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>
- <!--
-- felix 4.0 is compliant with osgi 4.3
-- for osgi clients, 4.3 is backwards compatible with 4.2
-+ Since we use felix framework at runtime, try to avoid introducing an
-+ extra dependency for OSGi API-only (e.g. org.osgi:org.osgi.core) in order to
-+ make packaging Thermostat easier. While org.osgi:org.osgi.core v4.3.x would
-+ satisfy OSGi 4.3 spec API, org.apache.felix:org.osgi.core v1.4 is OSGi 4.2
spec
-+ only at this point.
-+
-+ Felix framework 4.2 is an implementation of the 4.3 OSGi
-+ spec:
https://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Framework+...
-+
-+ Note that between OSGi spec 4.2 and 4.3 generics (a.k.a type parameters)
-+ have been introduced. Howerver, felix's API-only package,
-+ org.apache.felix:org.osgi.core, is OSGi spec 4.2 and we use OSGi spec 4.3
-+ specific code in thermostat.
-+
-+ We should be careful not to introduce felix specific API, though.
- -->
-- <osgi.core.version>4.3.1</osgi.core.version>
-+ <felix.framework.version>4.2.0</felix.framework.version>
- <osgi.compendium.version>4.3.1</osgi.compendium.version>
-
<osgi.compendium.osgi-version>4.3.1.201210102024</osgi.compendium.osgi-version>
-
<osgi.compendium.bundle.symbolic-name>osgi.cmpn</osgi.compendium.bundle.symbolic-name>
-- <felix.framework.version>4.2.0</felix.framework.version>
-
- <netty.version>3.2.4.Final</netty.version>
- <httpcomponents.core.version>4.3.2</httpcomponents.core.version>
-@@ -563,16 +575,6 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <version>${osgi.core.version}</version>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <version>${osgi.compendium.version}</version>
-- </dependency>
-- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${felix.framework.version}</version>
-diff --git a/storage/cli/pom.xml b/storage/cli/pom.xml
---- a/storage/cli/pom.xml
-+++ b/storage/cli/pom.xml
-@@ -67,8 +67,8 @@
- <version>${project.version}</version>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/system-backend/pom.xml b/system-backend/pom.xml
---- a/system-backend/pom.xml
-+++ b/system-backend/pom.xml
-@@ -87,14 +87,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- </dependencies>
-diff --git a/thread/client-common/pom.xml b/thread/client-common/pom.xml
---- a/thread/client-common/pom.xml
-+++ b/thread/client-common/pom.xml
-@@ -73,14 +73,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/thread/client-controllers/pom.xml b/thread/client-controllers/pom.xml
---- a/thread/client-controllers/pom.xml
-+++ b/thread/client-controllers/pom.xml
-@@ -74,14 +74,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/thread/client-swing/pom.xml b/thread/client-swing/pom.xml
---- a/thread/client-swing/pom.xml
-+++ b/thread/client-swing/pom.xml
-@@ -68,14 +68,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/thread/collector/pom.xml b/thread/collector/pom.xml
---- a/thread/collector/pom.xml
-+++ b/thread/collector/pom.xml
-@@ -91,14 +91,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/thread/harvester/pom.xml b/thread/harvester/pom.xml
---- a/thread/harvester/pom.xml
-+++ b/thread/harvester/pom.xml
-@@ -74,14 +74,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/unix-process-handler/pom.xml b/unix-process-handler/pom.xml
---- a/unix-process-handler/pom.xml
-+++ b/unix-process-handler/pom.xml
-@@ -77,14 +77,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/vm-classstat/agent/pom.xml b/vm-classstat/agent/pom.xml
---- a/vm-classstat/agent/pom.xml
-+++ b/vm-classstat/agent/pom.xml
-@@ -80,14 +80,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-classstat/client-core/pom.xml b/vm-classstat/client-core/pom.xml
---- a/vm-classstat/client-core/pom.xml
-+++ b/vm-classstat/client-core/pom.xml
-@@ -99,14 +99,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-classstat/client-swing/pom.xml b/vm-classstat/client-swing/pom.xml
---- a/vm-classstat/client-swing/pom.xml
-+++ b/vm-classstat/client-swing/pom.xml
-@@ -87,14 +87,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jfree</groupId>
-diff --git a/vm-classstat/common/pom.xml b/vm-classstat/common/pom.xml
---- a/vm-classstat/common/pom.xml
-+++ b/vm-classstat/common/pom.xml
-@@ -99,14 +99,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-compiler/agent/pom.xml b/vm-compiler/agent/pom.xml
---- a/vm-compiler/agent/pom.xml
-+++ b/vm-compiler/agent/pom.xml
-@@ -80,14 +80,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-compiler/client-core/pom.xml b/vm-compiler/client-core/pom.xml
---- a/vm-compiler/client-core/pom.xml
-+++ b/vm-compiler/client-core/pom.xml
-@@ -99,14 +99,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-compiler/client-swing/pom.xml b/vm-compiler/client-swing/pom.xml
---- a/vm-compiler/client-swing/pom.xml
-+++ b/vm-compiler/client-swing/pom.xml
-@@ -87,14 +87,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jfree</groupId>
-diff --git a/vm-compiler/common/pom.xml b/vm-compiler/common/pom.xml
---- a/vm-compiler/common/pom.xml
-+++ b/vm-compiler/common/pom.xml
-@@ -99,14 +99,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-cpu/agent/pom.xml b/vm-cpu/agent/pom.xml
---- a/vm-cpu/agent/pom.xml
-+++ b/vm-cpu/agent/pom.xml
-@@ -80,14 +80,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-cpu/client-cli/pom.xml b/vm-cpu/client-cli/pom.xml
---- a/vm-cpu/client-cli/pom.xml
-+++ b/vm-cpu/client-cli/pom.xml
-@@ -80,14 +80,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-cpu/client-core/pom.xml b/vm-cpu/client-core/pom.xml
---- a/vm-cpu/client-core/pom.xml
-+++ b/vm-cpu/client-core/pom.xml
-@@ -99,14 +99,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-cpu/client-swing/pom.xml b/vm-cpu/client-swing/pom.xml
---- a/vm-cpu/client-swing/pom.xml
-+++ b/vm-cpu/client-swing/pom.xml
-@@ -87,14 +87,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jfree</groupId>
-diff --git a/vm-cpu/common/pom.xml b/vm-cpu/common/pom.xml
---- a/vm-cpu/common/pom.xml
-+++ b/vm-cpu/common/pom.xml
-@@ -99,14 +99,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-find/command/pom.xml b/vm-find/command/pom.xml
---- a/vm-find/command/pom.xml
-+++ b/vm-find/command/pom.xml
-@@ -68,14 +68,8 @@
- <version>${project.version}</version>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-gc/agent/pom.xml b/vm-gc/agent/pom.xml
---- a/vm-gc/agent/pom.xml
-+++ b/vm-gc/agent/pom.xml
-@@ -80,14 +80,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-gc/client-core/pom.xml b/vm-gc/client-core/pom.xml
---- a/vm-gc/client-core/pom.xml
-+++ b/vm-gc/client-core/pom.xml
-@@ -99,14 +99,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-gc/client-swing/pom.xml b/vm-gc/client-swing/pom.xml
---- a/vm-gc/client-swing/pom.xml
-+++ b/vm-gc/client-swing/pom.xml
-@@ -87,14 +87,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jfree</groupId>
-diff --git a/vm-gc/command/pom.xml b/vm-gc/command/pom.xml
---- a/vm-gc/command/pom.xml
-+++ b/vm-gc/command/pom.xml
-@@ -67,15 +67,10 @@
- <version>${project.version}</version>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-- </dependency>
-+
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
- <artifactId>thermostat-common-test</artifactId>
-diff --git a/vm-gc/common/pom.xml b/vm-gc/common/pom.xml
---- a/vm-gc/common/pom.xml
-+++ b/vm-gc/common/pom.xml
-@@ -99,14 +99,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-gc/remote-collector-client-common/pom.xml
b/vm-gc/remote-collector-client-common/pom.xml
---- a/vm-gc/remote-collector-client-common/pom.xml
-+++ b/vm-gc/remote-collector-client-common/pom.xml
-@@ -68,14 +68,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/vm-gc/remote-collector-client-swing/pom.xml
b/vm-gc/remote-collector-client-swing/pom.xml
---- a/vm-gc/remote-collector-client-swing/pom.xml
-+++ b/vm-gc/remote-collector-client-swing/pom.xml
-@@ -68,14 +68,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/vm-gc/remote-collector-command/pom.xml
b/vm-gc/remote-collector-command/pom.xml
---- a/vm-gc/remote-collector-command/pom.xml
-+++ b/vm-gc/remote-collector-command/pom.xml
-@@ -68,14 +68,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/vm-gc/remote-collector-common/pom.xml
b/vm-gc/remote-collector-common/pom.xml
---- a/vm-gc/remote-collector-common/pom.xml
-+++ b/vm-gc/remote-collector-common/pom.xml
-@@ -68,14 +68,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/vm-heap-analysis/agent/pom.xml b/vm-heap-analysis/agent/pom.xml
---- a/vm-heap-analysis/agent/pom.xml
-+++ b/vm-heap-analysis/agent/pom.xml
-@@ -72,14 +72,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/vm-heap-analysis/client-core/pom.xml b/vm-heap-analysis/client-core/pom.xml
---- a/vm-heap-analysis/client-core/pom.xml
-+++ b/vm-heap-analysis/client-core/pom.xml
-@@ -94,14 +94,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/vm-heap-analysis/client-swing/pom.xml
b/vm-heap-analysis/client-swing/pom.xml
---- a/vm-heap-analysis/client-swing/pom.xml
-+++ b/vm-heap-analysis/client-swing/pom.xml
-@@ -91,14 +91,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/vm-heap-analysis/command/pom.xml b/vm-heap-analysis/command/pom.xml
---- a/vm-heap-analysis/command/pom.xml
-+++ b/vm-heap-analysis/command/pom.xml
-@@ -93,14 +93,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/vm-heap-analysis/common/pom.xml b/vm-heap-analysis/common/pom.xml
---- a/vm-heap-analysis/common/pom.xml
-+++ b/vm-heap-analysis/common/pom.xml
-@@ -93,14 +93,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-diff --git a/vm-io/agent/pom.xml b/vm-io/agent/pom.xml
---- a/vm-io/agent/pom.xml
-+++ b/vm-io/agent/pom.xml
-@@ -80,14 +80,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-io/client-cli/pom.xml b/vm-io/client-cli/pom.xml
---- a/vm-io/client-cli/pom.xml
-+++ b/vm-io/client-cli/pom.xml
-@@ -80,14 +80,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-io/client-core/pom.xml b/vm-io/client-core/pom.xml
---- a/vm-io/client-core/pom.xml
-+++ b/vm-io/client-core/pom.xml
-@@ -98,14 +98,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-io/client-swing/pom.xml b/vm-io/client-swing/pom.xml
---- a/vm-io/client-swing/pom.xml
-+++ b/vm-io/client-swing/pom.xml
-@@ -87,14 +87,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jfree</groupId>
-diff --git a/vm-io/common/pom.xml b/vm-io/common/pom.xml
---- a/vm-io/common/pom.xml
-+++ b/vm-io/common/pom.xml
-@@ -98,14 +98,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-jmx/agent/pom.xml b/vm-jmx/agent/pom.xml
---- a/vm-jmx/agent/pom.xml
-+++ b/vm-jmx/agent/pom.xml
-@@ -86,14 +86,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-jmx/client-core/pom.xml b/vm-jmx/client-core/pom.xml
---- a/vm-jmx/client-core/pom.xml
-+++ b/vm-jmx/client-core/pom.xml
-@@ -88,14 +88,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-jmx/client-swing/pom.xml b/vm-jmx/client-swing/pom.xml
---- a/vm-jmx/client-swing/pom.xml
-+++ b/vm-jmx/client-swing/pom.xml
-@@ -96,14 +96,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-jmx/common/pom.xml b/vm-jmx/common/pom.xml
---- a/vm-jmx/common/pom.xml
-+++ b/vm-jmx/common/pom.xml
-@@ -88,14 +88,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-memory/agent/pom.xml b/vm-memory/agent/pom.xml
---- a/vm-memory/agent/pom.xml
-+++ b/vm-memory/agent/pom.xml
-@@ -80,14 +80,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-memory/client-cli/pom.xml b/vm-memory/client-cli/pom.xml
---- a/vm-memory/client-cli/pom.xml
-+++ b/vm-memory/client-cli/pom.xml
-@@ -80,14 +80,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-memory/client-core/pom.xml b/vm-memory/client-core/pom.xml
---- a/vm-memory/client-core/pom.xml
-+++ b/vm-memory/client-core/pom.xml
-@@ -84,14 +84,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jfree</groupId>
-diff --git a/vm-memory/client-swing/pom.xml b/vm-memory/client-swing/pom.xml
---- a/vm-memory/client-swing/pom.xml
-+++ b/vm-memory/client-swing/pom.xml
-@@ -90,14 +90,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jfree</groupId>
-diff --git a/vm-memory/common/pom.xml b/vm-memory/common/pom.xml
---- a/vm-memory/common/pom.xml
-+++ b/vm-memory/common/pom.xml
-@@ -99,14 +99,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-numa/agent/pom.xml b/vm-numa/agent/pom.xml
---- a/vm-numa/agent/pom.xml
-+++ b/vm-numa/agent/pom.xml
-@@ -86,9 +86,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-numa/client-core/pom.xml b/vm-numa/client-core/pom.xml
---- a/vm-numa/client-core/pom.xml
-+++ b/vm-numa/client-core/pom.xml
-@@ -89,9 +89,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-numa/client-swing/pom.xml b/vm-numa/client-swing/pom.xml
---- a/vm-numa/client-swing/pom.xml
-+++ b/vm-numa/client-swing/pom.xml
-@@ -93,9 +93,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-numa/common/pom.xml b/vm-numa/common/pom.xml
---- a/vm-numa/common/pom.xml
-+++ b/vm-numa/common/pom.xml
-@@ -104,9 +104,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-overview/client-core/pom.xml b/vm-overview/client-core/pom.xml
---- a/vm-overview/client-core/pom.xml
-+++ b/vm-overview/client-core/pom.xml
-@@ -83,14 +83,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-overview/client-swing/pom.xml b/vm-overview/client-swing/pom.xml
---- a/vm-overview/client-swing/pom.xml
-+++ b/vm-overview/client-swing/pom.xml
-@@ -87,14 +87,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jfree</groupId>
-diff --git a/vm-profiler/agent/pom.xml b/vm-profiler/agent/pom.xml
---- a/vm-profiler/agent/pom.xml
-+++ b/vm-profiler/agent/pom.xml
-@@ -96,14 +96,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-profiler/client-cli/pom.xml b/vm-profiler/client-cli/pom.xml
---- a/vm-profiler/client-cli/pom.xml
-+++ b/vm-profiler/client-cli/pom.xml
-@@ -80,14 +80,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-profiler/client-core/pom.xml b/vm-profiler/client-core/pom.xml
---- a/vm-profiler/client-core/pom.xml
-+++ b/vm-profiler/client-core/pom.xml
-@@ -98,14 +98,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/vm-profiler/client-swing/pom.xml b/vm-profiler/client-swing/pom.xml
---- a/vm-profiler/client-swing/pom.xml
-+++ b/vm-profiler/client-swing/pom.xml
-@@ -87,14 +87,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jfree</groupId>
-diff --git a/vm-profiler/common/pom.xml b/vm-profiler/common/pom.xml
---- a/vm-profiler/common/pom.xml
-+++ b/vm-profiler/common/pom.xml
-@@ -98,14 +98,8 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
- <groupId>com.redhat.thermostat</groupId>
-diff --git a/web/client/pom.xml b/web/client/pom.xml
---- a/web/client/pom.xml
-+++ b/web/client/pom.xml
-@@ -64,9 +64,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
-@@ -96,10 +95,6 @@
- <!-- httpclient 4.3 needs this bundle, but does only
- specify it's dep on it with scope provided -->
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- </dependency>
-- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-osgi</artifactId>
- <version>${httpcomponents.core.version}</version>
-diff --git a/web/endpoint-plugin/web-service/pom.xml
b/web/endpoint-plugin/web-service/pom.xml
---- a/web/endpoint-plugin/web-service/pom.xml
-+++ b/web/endpoint-plugin/web-service/pom.xml
-@@ -54,9 +54,8 @@
- <dependencies>
- <!-- Plain OSGi -->
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <!-- The war which we are going to deploy in embedded jetty -->
-diff --git a/web/server/pom.xml b/web/server/pom.xml
---- a/web/server/pom.xml
-+++ b/web/server/pom.xml
-@@ -142,9 +142,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- <scope>provided</scope>
-+ <groupId>org.apache.felix</groupId>
-+ <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
-
- <dependency>
diff --git a/0003_mongodb_3_6_compat.patch b/0003_mongodb_3_6_compat.patch
deleted file mode 100644
index 5a37d3d..0000000
--- a/0003_mongodb_3_6_compat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur
thermostat-1.6.6.old/storage/cli/src/main/java/com/redhat/thermostat/storage/cli/internal/MongoProcessRunner.java
thermostat-1.6.6/storage/cli/src/main/java/com/redhat/thermostat/storage/cli/internal/MongoProcessRunner.java
----
thermostat-1.6.6.old/storage/cli/src/main/java/com/redhat/thermostat/storage/cli/internal/MongoProcessRunner.java 2018-03-16
18:07:02.189617923 -0400
-+++
thermostat-1.6.6/storage/cli/src/main/java/com/redhat/thermostat/storage/cli/internal/MongoProcessRunner.java 2018-03-16
18:07:35.727568983 -0400
-@@ -75,7 +75,7 @@
- private static final String MONGO_PROCESS = "mongod";
-
- private static final String [] MONGO_BASIC_ARGS = {
-- "mongod", "--quiet", "--fork", "--auth",
"--nohttpinterface", "--bind_ip"
-+ "mongod", "--quiet", "--fork", "--auth",
"--bind_ip"
- };
-
- private static final String [] MONGO_SHUTDOWN_ARGS = {
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..4ce78f7
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Thermostat is dead upstream and, thus, unmaintained.
diff --git a/fedora-thermostatrc b/fedora-thermostatrc
deleted file mode 100644
index a5cd2a3..0000000
--- a/fedora-thermostatrc
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2012-2016 Red Hat, Inc.
-#
-# This file is part of Thermostat.
-#
-# Thermostat is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published
-# by the Free Software Foundation; either version 2, or (at your
-# option) any later version.
-#
-# Thermostat is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Thermostat; see the file COPYING. If not see
-# <
http://www.gnu.org/licenses/>.
-#
-# Linking this code with other modules is making a combined work
-# based on this code. Thus, the terms and conditions of the GNU
-# General Public License cover the whole combination.
-#
-# As a special exception, the copyright holders of this code give
-# you permission to link this code with independent modules to
-# produce an executable, regardless of the license terms of these
-# independent modules, and to copy and distribute the resulting
-# executable under terms of your choice, provided that you also
-# meet, for each linked independent module, the terms and conditions
-# of the license of that module. An independent module is a module
-# which is not derived from or based on this code. If you modify
-# this code, you may extend this exception to your version of the
-# library, but you are not obligated to do so. If you do not wish
-# to do so, delete this exception statement from your version.
-#
-#####################################################################
-#
-# Environment variables for the system Thermostat profile. You
-# can assume that THERMOSTAT_HOME variable is correctly set and you
-# may override system variables via a user profile in
-# USER_THERMOSTAT_HOME/etc/thermostatrc.
-#
-#####################################################################
-
-#
-# Use a different JDK for running thermostat
-#
-#JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk
-
-#
-# Extra jar files which need to be on the classpath when
-# Thermostat boots.
-#
-THERMOSTAT_EXT_BOOT_CLASSPATH="${JAVA_HOME}/lib/tools.jar"
-THERMOSTAT_EXT_BOOT_CLASSPATH="${THERMOSTAT_EXT_BOOT_CLASSPATH}:${THERMOSTAT_HOME}/plugins/embedded-web-endpoint/jetty-schemas-3.1.M0.jar"
-export THERMOSTAT_EXT_BOOT_CLASSPATH
-
-#
-# Extra java options
-#
-#THERMOSTAT_EXT_JAVA_OPTS="-Xint -ea"
-#export THERMOSTAT_EXT_JAVA_OPTS
-
-#
-# Extra options passed on to the Thermostat main class
-#
-THERMOSTAT_EXT_OPTS="--ignore-bundle-versions"
-export THERMOSTAT_EXT_OPTS
diff --git a/scl-thermostat-tomcat-service-sysconfig
b/scl-thermostat-tomcat-service-sysconfig
deleted file mode 100644
index eb6fe63..0000000
--- a/scl-thermostat-tomcat-service-sysconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-# Custom configuration for Thermostat's CATALINA_BASE based tomcat.
-#
-# Where your tomcat installation lives
-CATALINA_BASE="__catalina_base__"
-CATALINA_HOME="/usr/share/tomcat"
-# Set Thermostat JAAS config via Tomcat's JAVA_OPTS variable.
-JAVA_OPTS="-Djava.security.auth.login.config=__jaas_config__"
diff --git a/scl-tomcat-initd.sh b/scl-tomcat-initd.sh
deleted file mode 100644
index daf34be..0000000
--- a/scl-tomcat-initd.sh
+++ /dev/null
@@ -1,286 +0,0 @@
-#!/bin/bash
-#
-# thermostat1-thermostat-tomcat This shell script takes care of deploying SCL-ized
thermostat
-# webapp.
-#
-# chkconfig: - 80 20
-#
-### BEGIN INIT INFO
-# Provides: __service_name__
-# Required-Start: $network $syslog
-# Required-Stop: $network $syslog
-# Default-Start:
-# Default-Stop:
-# Description: Thermostat tomcat start wrapper
-# Short-Description: start and stop Thermostat's tomcat
-### END INIT INFO
-#
-# Clone of tomcat6's init script.
-#
-
-## Source function library.
-#. /etc/rc.d/init.d/functions
-# Source LSB function library.
-if [ -r /lib/lsb/init-functions ]; then
- . /lib/lsb/init-functions
-else
- exit 1
-fi
-
-DISTRIB_ID=`lsb_release -i -s 2>/dev/null`
-
-NAME="$(basename $0)"
-unset ISBOOT
-if [ "${NAME:0:1}" = "S" -o "${NAME:0:1}" = "K"
]; then
- NAME="${NAME:3}"
- ISBOOT="1"
-fi
-
-# For SELinux we need to use 'runuser' not 'su'
-if [ -x "/sbin/runuser" ]; then
- SU="/sbin/runuser -s /bin/sh"
-else
- SU="/bin/su -s /bin/sh"
-fi
-
-# Get the tomcat config (use this for environment specific settings)
-TOMCAT_CFG="/etc/tomcat6/tomcat6.conf"
-if [ -r "$TOMCAT_CFG" ]; then
- . $TOMCAT_CFG
-fi
-
-# Get instance specific config file
-if [ -r "/etc/sysconfig/${NAME}" ]; then
- . /etc/sysconfig/${NAME}
-fi
-
-# Define which connector port to use
-CONNECTOR_PORT="${CONNECTOR_PORT:-8080}"
-
-# Path to the tomcat launch script
-TOMCAT_SCRIPT="/usr/sbin/tomcat6"
-
-# Tomcat program name
-TOMCAT_PROG="${NAME}"
-
-# Define the tomcat username
-TOMCAT_USER="${TOMCAT_USER:-tomcat}"
-
-# Define the tomcat log file
-TOMCAT_LOG="${TOMCAT_LOG:-/var/log/${NAME}-initd.log}"
-
-# Define the pid file name
-# If change is needed, use sysconfig instead of here
-export CATALINA_PID="${CATALINA_PID:-/var/run/${NAME}.pid}"
-
-RETVAL="0"
-
-function parseOptions() {
- options=""
- options="$options $(
- awk '!/^#/ && !/^$/ { ORS=" "; print "export
", $0, ";" }' \
- $TOMCAT_CFG
- )"
- if [ -r "/etc/sysconfig/${NAME}" ]; then
- options="$options $(
- awk '!/^#/ && !/^$/ { ORS=" ";
- print "export ", $0, ";"
}' \
- /etc/sysconfig/${NAME}
- )"
- fi
- TOMCAT_SCRIPT="$options ${TOMCAT_SCRIPT}"
-}
-
-# rhbz 757632
-function version() {
- parseOptions
- $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} version" >> ${TOMCAT_LOG}
2>&1 || RETVAL="4"
-}
-
-# See how we were called.
-function start() {
-
- echo -n "Starting ${TOMCAT_PROG}: "
- if [ "$RETVAL" != "0" ]; then
- log_failure_msg
- return
- fi
- if [ -f "/var/lock/subsys/${NAME}" ]; then
- if [ -f "${CATALINA_PID}" ]; then
- read kpid < ${CATALINA_PID}
-# if checkpid $kpid 2>&1; then
- if [ -d "/proc/${kpid}" ]; then
- log_success_msg
- if [ "$DISTRIB_ID" = "MandrivaLinux" ]; then
- echo
- fi
- RETVAL="0"
- return
- fi
- fi
- fi
- # fix permissions on the log and pid files
- touch $CATALINA_PID 2>&1 || RETVAL="4"
- if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ];
then
- chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID
- fi
- parseOptions
- if [ "$RETVAL" -eq "0" -a "$SECURITY_MANAGER" =
"true" ]; then
- $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start-security" \
- >> ${TOMCAT_LOG} 2>&1 || RETVAL="4"
- else
-
- [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c
"${TOMCAT_SCRIPT} start" >> ${TOMCAT_LOG} 2>&1 ||
RETVAL="4"
- fi
- if [ "$RETVAL" -eq "0" ]; then
- log_success_msg
- touch /var/lock/subsys/${NAME}
- else
- log_failure_msg "Error code ${RETVAL}"
- fi
- if [ "$DISTRIB_ID" = "MandrivaLinux" ]; then
- echo
- fi
-}
-
-function stop() {
- echo -n "Stopping ${TOMCAT_PROG}: "
- if [ -f "/var/lock/subsys/${NAME}" ]; then
- parseOptions
- if [ "$RETVAL" -eq "0" ]; then
- touch /var/lock/subsys/${NAME} 2>&1 || RETVAL="4"
- [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c
"${TOMCAT_SCRIPT} stop" >> ${TOMCAT_LOG} 2>&1 ||
RETVAL="4"
- fi
- if [ "$RETVAL" -eq "0" ]; then
- count="0"
- if [ -f "${CATALINA_PID}" ]; then
- read kpid < ${CATALINA_PID}
- until [ "$(ps --pid $kpid | grep -c $kpid)" -eq "0" ] ||
\
- [ "$count" -gt "$SHUTDOWN_WAIT" ]; do
- if [ "$SHUTDOWN_VERBOSE" = "true" ]; then
- echo "waiting for processes $kpid to exit"
- fi
- sleep 1
- let count="${count}+1"
- done
- if [ "$count" -gt "$SHUTDOWN_WAIT" ]; then
- if [ "$SHUTDOWN_VERBOSE" = "true" ]; then
- log_warning_msg "killing processes which did not stop after
${SHUTDOWN_WAIT} seconds"
- fi
- kill -9 $kpid
- fi
- log_success_msg
- fi
- rm -f /var/lock/subsys/${NAME} ${CATALINA_PID}
- else
- log_failure_msg
- RETVAL="4"
- fi
- else
- log_success_msg
- RETVAL="0"
- fi
- if [ "$DISTRIB_ID" = "MandrivaLinux" ]; then
- echo
- fi
-}
-
-function status()
-{
- checkpidfile
- if [ "$RETVAL" -eq "0" ]; then
- log_success_msg "${NAME} (pid ${kpid}) is running..."
- elif [ "$RETVAL" -eq "1" ]; then
- log_failure_msg "PID file exists, but process is not running"
- else
- checklockfile
- if [ "$RETVAL" -eq "2" ]; then
- log_failure_msg "${NAME} lockfile exists but process is not running"
- else
- pid="$(/usr/bin/pgrep -u ${TOMCAT_USER} -f tomcat)"
- if [ -z "$pid" ]; then
- log_success_msg "${NAME} is stopped"
- RETVAL="3"
- else
- log_success_msg "${NAME} (pid $pid) is running..."
- RETVAL="0"
- fi
- fi
- fi
-}
-
-function checklockfile()
-{
- if [ -f /var/lock/subsys/${NAME} ]; then
- pid="$(/usr/bin/pgrep -u ${TOMCAT_USER} -f tomcat)"
-# The lockfile exists but the process is not running
- if [ -z "$pid" ]; then
- RETVAL="2"
- fi
- fi
-}
-
-function checkpidfile()
-{
- if [ -f "${CATALINA_PID}" ]; then
- read kpid < ${CATALINA_PID}
- if [ -d "/proc/${kpid}" ]; then
-# The pid file exists and the process is running
- RETVAL="0"
- else
-# The pid file exists but the process is not running
- RETVAL="1"
- return
- fi
- fi
-# pid file does not exist and program is not running
- RETVAL="3"
-}
-
-function usage()
-{
- echo "Usage: $0
{start|stop|restart|condrestart|try-restart|reload|force-reload|status|version}"
- RETVAL="2"
-}
-
-# See how we were called.
-RETVAL="0"
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- stop
- start
- ;;
- condrestart|try-restart)
- if [ -f "/var/run/${NAME}.pid" ]; then
- stop
- start
- fi
- ;;
- reload)
- RETVAL="3"
- ;;
- force-reload)
- if [ -f "/var/run/${NAME}.pid" ]; then
- stop
- start
- fi
- ;;
- status)
- status
- ;;
- version)
- version
-# ${TOMCAT_SCRIPT} version
- ;;
- *)
- usage
- ;;
-esac
-
-exit $RETVAL
diff --git a/scl-tomcat-systemd.service b/scl-tomcat-systemd.service
deleted file mode 100644
index f3b359e..0000000
--- a/scl-tomcat-systemd.service
+++ /dev/null
@@ -1,21 +0,0 @@
-# Thermostat tomcat systemd service file for RHEL 7.0.
-#
-# Please start tomcat via "service tomcat@thermostat start" or
-# "systemctl start tomcat@thermostat" instead if you are using
-# RHEL-7.1.
-[Unit]
-Description=Apache Tomcat for Thermostat Container
-After=syslog.target network.target
-
-[Service]
-Type=forking
-# Provides the SERVICE_NAME to tomcat-sysd
-EnvironmentFile=__service_file_path__/__service_file_name__
-ExecStart=/usr/sbin/tomcat-sysd start
-ExecStop=/usr/sbin/tomcat-sysd stop
-SuccessExitStatus=143
-User=tomcat
-Group=tomcat
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sources b/sources
deleted file mode 100644
index e25909f..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (thermostat-1.6.6.tar.gz) =
6e78dd5df9c1f002f8c77e3c8ab1528497b329c18582cbdca80abe9a882581859537e4eff361a6297fee5c4e827bbf1e1eccf5da5a6ecd1bb3ee4cc291f5d4ad
diff --git a/thermostat-local-http b/thermostat-local-http
deleted file mode 100644
index 740b033..0000000
--- a/thermostat-local-http
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-#
-# Starts thermostat web-storage-service and opens
-# thermostat gui (swing client).
-#
-# This script is used via a *.desktop launcher
-#
-#set -xv
-
-THERMOSTAT=@thermostat.home(a)/bin/thermostat
-USER_THERMOSTAT_HOME="${HOME}/.thermostat"
-THERMOSTAT_SERVICE_PID=${USER_THERMOSTAT_HOME}/run/thermostat-web-storage-service.pid
-THERMOSTAT_SETUP_COMPLETE_STAMP=${USER_THERMOSTAT_HOME}/data/setup-complete.stamp
-
-function stop_service() {
- if [ -e "${THERMOSTAT_SERVICE_PID}" ]; then
- pid=$(cat "${THERMOSTAT_SERVICE_PID}")
- kill ${pid}
- retval=$?
- # cleanup pid
- rm -rf "${THERMOSTAT_SERVICE_PID}"
- return ${retval}
- else
- return 1
- fi
-}
-
-if [ ! -e ${THERMOSTAT_SETUP_COMPLETE_STAMP} ]; then
- ${THERMOSTAT} setup
-fi
-# Start thermostat service (storage + agent)
-${THERMOSTAT} -Tbg "${THERMOSTAT_SERVICE_PID}" web-storage-service
-sleep 2
-if [ -e "${THERMOSTAT_SERVICE_PID}" ]; then
- # Start the gui; this blocks
- ${THERMOSTAT} gui
-else
- zenity --error \
- --text "<tt>thermostat web-storage-service</tt> failed to
start.\n\nPlease launch the following command from a terminal for more details:
@thermostat.home@/bin/thermostat-local-http" \
- --title "Ooops. Something has gone wrong :("
- exit 1
-fi
-
-# This means gui finished, stop service
-stop_service
-exit 0
diff --git a/thermostat-local-mongodb b/thermostat-local-mongodb
deleted file mode 100644
index 62e2c69..0000000
--- a/thermostat-local-mongodb
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-#
-# Starts thermostat service and opens
-# thermostat gui (swing client).
-#
-# This script is used via a *.desktop launcher
-#
-#set -xv
-
-THERMOSTAT=@thermostat.home(a)/bin/thermostat
-USER_THERMOSTAT_HOME="${HOME}/.thermostat"
-THERMOSTAT_SERVICE_PID=${USER_THERMOSTAT_HOME}/run/thermostat-service.pid
-THERMOSTAT_SETUP_COMPLETE_STAMP=${USER_THERMOSTAT_HOME}/data/setup-complete.stamp
-
-function stop_service() {
- if [ -e "${THERMOSTAT_SERVICE_PID}" ]; then
- pid=$(cat "${THERMOSTAT_SERVICE_PID}")
- kill ${pid}
- retval=$?
- # cleanup pid
- rm -rf "${THERMOSTAT_SERVICE_PID}"
- return ${retval}
- else
- return 1
- fi
-}
-
-if [ ! -e ${THERMOSTAT_SETUP_COMPLETE_STAMP} ]; then
- ${THERMOSTAT} setup
-fi
-# Start thermostat service (storage + agent)
-${THERMOSTAT} -Tbg "${THERMOSTAT_SERVICE_PID}" service
-sleep 2
-if [ -e "${THERMOSTAT_SERVICE_PID}" ]; then
- # Start the gui; this blocks
- ${THERMOSTAT} gui
-else
- zenity --error \
- --text "<tt>thermostat service</tt> failed to start.\n\nPlease
launch the following command from a terminal for more details:
@thermostat.home@/bin/thermostat-local-mongodb" \
- --title "Ooops. Something has gone wrong :("
- exit 1
-fi
-
-# This means gui finished, stop service
-stop_service
-exit 0
diff --git a/thermostat-sysconfig b/thermostat-sysconfig
deleted file mode 100644
index 4725b76..0000000
--- a/thermostat-sysconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is "sourced" for systemd services only
-#
-# If thermostat {storage,agent} is run via systemd,
-# data directories are in __thermostat_home__
-#
-# Do not change this unless you know what you are doing
-THERMOSTAT_HOME=__thermostat_home__
-USER_THERMOSTAT_HOME=__thermostat_user_home__
-# any value vor this env var will do
-THERMOSTAT_SYSTEM_USER=true
diff --git a/thermostat.appdata.xml b/thermostat.appdata.xml
deleted file mode 100644
index 89b7e2f..0000000
--- a/thermostat.appdata.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2012-2016 Red Hat, Inc.
-
- This file is part of Thermostat.
-
- Thermostat is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
- option) any later version.
-
- Thermostat is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Thermostat; see the file COPYING. If not see
- <
http://www.gnu.org/licenses/>.
-
- Linking this code with other modules is making a combined work
- based on this code. Thus, the terms and conditions of the GNU
- General Public License cover the whole combination.
-
- As a special exception, the copyright holders of this code give
- you permission to link this code with independent modules to
- produce an executable, regardless of the license terms of these
- independent modules, and to copy and distribute the resulting
- executable under terms of your choice, provided that you also
- meet, for each linked independent module, the terms and conditions
- of the license of that module. An independent module is a module
- which is not derived from or based on this code. If you modify
- this code, you may extend this exception to your version of the
- library, but you are not obligated to do so. If you do not wish
- to do so, delete this exception statement from your version.
-
--->
-<application>
- <id type="desktop">thermostat.desktop</id>
- <metadata_license>CC-BY-SA-3.0</metadata_license>
- <project_license>GPL-2.0-with-classpath-exception</project_license>
- <name>Thermostat</name>
- <translation type="gettext">thermostat</translation>
- <summary>Serviceability and Monitoring for OpenJDK</summary>
- <description>
- <p>Thermostat is an instrumentation tool for the Hotspot JVM,
- with support for monitoring multiple JVM instances on multiple hosts,
- optionally in a cloud environment.
- </p>
- <p>
- The name Thermostat is intended as a play on words: Thermostat is to Hotspot much as
IcedTea is to Java.</p>
- </description>
- <screenshots>
- <screenshot type="default">
-
<
image>http://icedtea.classpath.org/thermostat/img/screenshot1.png</...
- <caption>Examine memory regions and their sizes</caption>
- </screenshot>
- <screenshot type="default">
-
<
image>http://icedtea.classpath.org/thermostat/img/screenshot2.png</...
- <caption>Visualize thread states</caption>
- </screenshot>
- <screenshot type="default">
-
<
image>http://icedtea.classpath.org/thermostat/img/screenshot3.png</...
- <caption>Dump, browse and search the Java heap</caption>
- </screenshot>
- </screenshots>
- <url
type="homepage">http://icedtea.classpath.org/thermostat</...
- <updatecontact>sgehwolf(a)redhat.com</updatecontact>
- <kudos>
- <kudo>HiDpiIcon</kudo>
- </kudos>
-</application>
diff --git a/thermostat.spec b/thermostat.spec
deleted file mode 100644
index 2345e73..0000000
--- a/thermostat.spec
+++ /dev/null
@@ -1,1185 +0,0 @@
-# Do not repack jars
-%global __jar_repack 0
-
-# Upstream Thermostat version triplet
-%global major 1
-%global minor 6
-%global patchlevel 6
-%global custom_rel 10
-
-# non_bootstrap_build == 1 means add self-BR so that
-# xmvn-subst symlinks correctly
-%global non_bootstrap_build 0
-
-%if 0%{?rhel}
-
-%if 0%{?rhel} <= 6
- %global is_rhel_6 1
- %global with_systemd 0
-%else
- %global is_rhel_6 0
- %global with_systemd 1
-%endif
-
-%else
-
-%global is_rhel_6 0
-%global with_systemd 1
-
-%endif
-
-# Thermostat requires exact versions for bundle dependencies.
-# We use those versions to pass to the maven build in order for
-# it to set it in relevant files.
-
-%if 0%{?fedora} >= 22
-
- #########################################
- # Fedora 23 and up
- #########################################
-
- # Real OSGi Bundle-Version is 3.10.6.Final
- %global netty_bundle_version 3.10.6
- %global jcommon_bundle_version 1.0.23
- %global jfreechart_bundle_version 1.0.19
- # apache-commons-beanutils
- %global beanutils_bundle_version 1.9.3
- # apache-commons-codec
- %global codec_bundle_version 1.11.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.10
- %global hc_client_bundle_version 4.5.5
- %global gson_bundle_version 2.8.2
- %global mongo_bundle_version 3.6.4
- %global lucene_analysis_core_bsn org.apache.lucene.analyzers-common
- %global lucene_version 5.5.0
- # The javax.servlet bundle version used by the
- # endpoint plugin: a.k.a web-storage-service
- %global javax_servlet_bundle_version 3.1.0
- %global javax_servlet_bsn javax.servlet-api
- %global jgraphx_bundle_version 3.6.0
- # xmvn-subst in rawhide and later fedoras support
- # in reactor symlinking. See RHBZ#1226251
- %global xmvn_subst_args -R %{buildroot} .
- %global jetty_version 9.4.0.M0
- %global tomcat_version 8
-
-%else
-
- #########################################
- # EL 6 + 7
- #########################################
- # Real OSGi Bundle-Version is 3.6.3.Final
- %global netty_bundle_version 3.6.3
- %global jcommon_bundle_version 1.0.18
- %global jfreechart_bundle_version 1.0.14
- # apache-commons-beanutils
- %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
- %global hc_client_bundle_version 4.3.6
- %global gson_bundle_version 2.2.2
- %global mongo_bundle_version 3.2.1
- %global lucene_analysis_core_bsn org.apache.lucene.analyzers-common
- %global lucene_version 5.4.1
- # The javax.servlet bundle version used by the
- # endpoint plugin: a.k.a web-storage-service
- # Comming from rh-java-common-tomcat-servlet-XXX-api
- # package.
- %global javax_servlet_bundle_version 3.0.0
- %global javax_servlet_bsn javax.servlet
- %global jgraphx_bundle_version 3.1.2
- %global xmvn_subst_args .
- %global jetty_version 9.0.3.v20130506
- %global tomcat_version 7
-
-%endif
-
-# Jansi is used as bootstrap bundle and the
-# bootstrap bundle properties file refers to the jar
-# with version suffix. See 0001_shared_fix_bundle_loading.patch
-%global jansi_version 1.11
-
-
-# Base path to the JDK which will be used in boot scripts
-%global jdk_base /usr/lib/jvm/java
-
-%{?scl:%scl_package thermostat}
-%{!?scl:%global pkg_name %{name}}
-
-# Global directory definitions
-# _root_<foo> don't seem to be defined in non-SCL context.
-# Define some vars we use instead in order for the build to work
-# for SCL/non-SCL contexts.
-%{?scl:
- %global system_confdir %{_root_sysconfdir}
- %global system_root_datadir %{_root_datadir}
- %global system_tmpfilesdir %{_root_exec_prefix}/lib/tmpfiles.d
- %global system_datadir %{_root_localstatedir}/lib/%{pkg_name}
- %global system_cachedir %{_root_localstatedir}/cache/%{pkg_name}
- %global system_logdir %{_root_localstatedir}/log/%{pkg_name}
- %global system_statedir %{_root_localstatedir}/run/%{pkg_name}
- %global system_sbindir %{_root_sbindir}
- %global thermostat_desktop_app_name "'Thermostat (from SCL)'"
-%if 0%{?is_rhel_6}
- %global system_initrddir %{_root_sysconfdir}/rc.d/init.d/
-%endif
-}
-# not SCL
-%{!?scl:
- %global system_confdir %{_sysconfdir}
- %global system_root_datadir %{_datadir}
- %global system_tmpfilesdir %{_tmpfilesdir}
- %global system_datadir %{_localstatedir}/lib/%{pkg_name}
- %global system_cachedir %{_localstatedir}/cache/%{pkg_name}
- %global system_logdir %{_localstatedir}/log/%{pkg_name}
- %global system_statedir %{_localstatedir}/run/%{pkg_name}
- %global thermostat_desktop_app_name Thermostat
-}
-# system java dir definition (non-scl)
-%global system_javadir %{system_root_datadir}/java
-%global scl_javadir %{_javadir}
-
-# Some Maven coordinates mismatch due to compat versioning.
-%{!?scl:
-%global object_web_asm_maven_coords org.ow2.asm:asm-all
-%global lucene_core_coords org.apache.lucene:lucene-core
-%global lucene_analyzers_coords org.apache.lucene:lucene-analyzers
-%global netty_maven_coords io.netty:netty:%{netty_bundle_version}
-}
-%{?scl:
-# objectweb-asm is objectweb-asm5 in SCL
-%global object_web_asm_maven_coords org.ow2.asm:asm-all:5
-# netty coordinates are org.jboss.netty:netty in SCL
-%global netty_maven_coords org.jboss.netty:netty
-%global lucene_core_coords org.apache.lucene:lucene-core:5
-%global lucene_analyzers_coords org.apache.lucene:lucene-analyzers:5
-}
-
-
-# THERMOSTAT_HOME and USER_THERMOSTAT_HOME variables. Note that
-# we use USER_THERMOSTAT_HOME only for systemd related setup.
-%global thermostat_home %{_datarootdir}/%{pkg_name}
-%{?scl:
- %global user_thermostat_home %{_scl_root}
-}
-# not SCL
-%{!?scl:
- # Prefix is "/" for non-scl
- %global user_thermostat_home /
-}
-
-# thermostat-webapp specific variables
-%{?scl:
- %global thermostat_catalina_base %{_datarootdir}/tomcat
-}
-# not SCL
-%{!?scl:
- %global thermostat_catalina_base %{_localstatedir}/lib/tomcats/%{pkg_name}
-}
-# The port tomcat will be listening on
-%global thermostat_catalina_port 8999
-%global thermostat_tomcat_service_name %{?scl_prefix}%{pkg_name}-tomcat
-
-# Don't generate native library provides for JNI libs. Those aren't
-# SCL-ized and might conflict with base RHEL. See RHBZ#1045552
-%{?scl:
- %if 0%{?is_rhel_6}
- %filter_from_provides /lib.*\.so(.*)$/d
- %filter_setup
- %else
- %global __provides_exclude_from
^%{_libdir}/thermostat/.*|%{thermostat_home}/libs/native/.*$
- %endif
-}
-
-%if 0%{?rhel}
- # Use java common's requires/provides generator
- %{?java_common_find_provides_and_requires}
-%endif
-
-# Uncomment to build from snapshot out of hg. See also Release and Source0
-#%%global hgrev b7c6db90e034
-
-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: %{custom_rel}%{?dist}
-Summary: A monitoring and serviceability tool for OpenJDK
-License: GPLv2+ with exceptions and OFL
-URL:
http://icedtea.classpath.org/thermostat/
-# This is the source URL to be used for released versions
-Source0:
http://icedtea.classpath.org/download/%{pkg_name}/%{pkg_name}-%{version}....
-# This is the source to be used for hg snapshot versions from HEAD
-#wget -O thermostat-%{hgrev}.tar.bz2
http://icedtea.classpath.org/hg/%{pkg_name}/archive/%{hgrev}.tar.bz2
-#Source0: thermostat-%{hgrev}.tar.bz2
-# This is the source to be used for hg snapshot versions from a release branch
-#wget -O thermostat-%{major}.%{minor}-%{hgrev}.tar.bz2
http://icedtea.classpath.org/hg/release/%{pkg_name}-%{major}.${minor}/arc...
-#Source0: thermostat-%{major}.%{minor}-%{hgrev}.tar.bz2
-# This is _NOT_ suitable for upstream at this point.
-# It's very Fedora/SCL specific.
-Source1: thermostat-sysconfig
-Source3: scl-thermostat-tomcat-service-sysconfig
-Source4: fedora-thermostatrc
-Source5: scl-tomcat-initd.sh
-Source6: scl-tomcat-systemd.service
-
-# This is _NOT_ suitable for upstream at this point.
-# jfreechart isn't a bundle upstream. Also some httpclient* related bundles
-# include transitive deps upstream, which isn't the case in Fedora (i.e. is
-# properly done in Fedora)
-Patch1: 0001_shared_fix_bundle_loading.patch
-# Patch proposed upstream, but was denied.
-# See
http://icedtea.classpath.org/pipermail/thermostat/2013-October/008602.html
-# 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
-# Remove 'nohttpinterface' when running mongod, which was removed in MongoDB 3.6
-Patch3: 0003_mongodb_3_6_compat.patch
-
-%{?scl:
-%if 0%{?non_bootstrap_build}
-# Work-around xmvn-subst limitation
-BuildRequires: %{?scl_prefix}thermostat-webapp = %{version}
-%endif
-}
-
-# RHEL 6 does not have virtual provides java-devel >= 1.7
-%if 0%{?is_rhel_6}
-BuildRequires: java-1.7.0-openjdk-devel
-%else
-BuildRequires: java-devel >= 1:1.7.0
-%endif
-BuildRequires: %{?scl_prefix_java_common}javapackages-tools
-BuildRequires: %{?scl_prefix_maven}maven-local
-BuildRequires: %{?scl_prefix_maven}maven-dependency-plugin
-BuildRequires: %{?scl_prefix_maven}maven-shade-plugin
-BuildRequires: %{?scl_prefix_maven}maven-surefire-plugin
-BuildRequires: %{?scl_prefix_maven}maven-war-plugin
-BuildRequires: %{?scl_prefix_maven}maven-clean-plugin
-BuildRequires: %{?scl_prefix_maven}maven-assembly-plugin
-BuildRequires: %{?scl_prefix_maven}maven-plugin-bundle
-BuildRequires: %{?scl_prefix_maven}maven-javadoc-plugin
-BuildRequires: %{?scl_prefix_maven}maven-antrun-plugin
-# Archetype maven plugins not available in SCL
-%{!?scl:
-BuildRequires: %{?scl_prefix_maven}maven-archetype-packaging
-BuildRequires: %{?scl_prefix_maven}mvn(org.apache.maven.plugins:maven-archetype-plugin)
-}
-%if 0%{?is_rhel_6}
-BuildRequires: gnome-keyring-devel
-%else
-# Use libsecret on Fedora
-%{!?scl:
-BuildRequires: libsecret-devel
-}
-%{?scl:
-BuildRequires: libgnome-keyring-devel
-}
-%endif
-# Keyring JNI uses autotools
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-# laf-utils JNI need pkconfig files for gtk2+
-BuildRequires: gtk2-devel
-BuildRequires:
%{?scl_prefix_java_common}mvn(org.apache.felix:org.apache.felix.framework)
-BuildRequires: %{?scl_prefix_maven}mvn(org.fusesource:fusesource-pom:pom:)
-BuildRequires: %{?scl_prefix_java_common}mvn(org.apache.commons:commons-cli)
-BuildRequires: %{?scl_prefix}mvn(jline:jline)
-BuildRequires: %{?scl_prefix_java_common}mvn(org.fusesource.jansi:jansi)
-BuildRequires: %{?scl_prefix_java_common}mvn(%{lucene_core_coords})
-BuildRequires: %{?scl_prefix_java_common}mvn(%{lucene_analyzers_coords})
-BuildRequires: %{?scl_prefix_java_common}mvn(com.google.code.gson:gson)
-BuildRequires: %{?scl_prefix}mvn(org.jfree:jfreechart)
-BuildRequires: %{?scl_prefix}mvn(org.jfree:jcommon)
-BuildRequires: %{?scl_prefix_java_common}mvn(org.apache.commons:commons-beanutils)
-BuildRequires: %{?scl_prefix_mongodb}mvn(org.mongodb:mongo-java-driver)
-# Change to netty 4 once RHBZ#1053619 is
-# resolved.
-# The version number in mvn() means it's a compat package.
-BuildRequires: %{?scl_prefix}mvn(%{netty_maven_coords})
-
-# BRs for webapp sub-package
-%if 0%{?is_rhel_6}
-BuildRequires: tomcat6
-%else
-BuildRequires: tomcat
-%endif
-BuildRequires: %{?scl_prefix_java_common}mvn(javax.servlet:servlet-api) >= 2.5
-BuildRequires: %{?scl_prefix}mvn(commons-fileupload:commons-fileupload)
-
-# thermostat web-storage-service BRs
-BuildRequires: %{?scl_prefix_java_common}mvn(org.eclipse.jetty:jetty-server)
-BuildRequires: %{?scl_prefix_java_common}mvn(org.eclipse.jetty:jetty-jaas)
-BuildRequires: %{?scl_prefix_java_common}mvn(org.eclipse.jetty:jetty-webapp)
-# FIXME: jetty-schemas not available in SCLs
-%if 0%{?fedora}
-BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-schemas)
-%endif
-
-###################################################
-# The following BRs are specified via osgi's
-# symbolic name. This is to ensure exact versions
-# as specified in thermostat's bundle list has
-# a chance of working at runtime.
-###################################################
-# 1.0.14-7 has OSGi metadata and itext dep fix
-BuildRequires: %{?scl_prefix}osgi(org.jfree.jfreechart) = %{jfreechart_bundle_version}
-# 1.0.17-4 has OSGi metadata
-BuildRequires: %{?scl_prefix}osgi(org.jfree.jcommon) = %{jcommon_bundle_version}
-BuildRequires: %{?scl_prefix_java_common}osgi(org.apache.commons.logging) =
%{logging_bundle_version}
-BuildRequires: %{?scl_prefix_java_common}osgi(org.apache.commons.beanutils) =
%{beanutils_bundle_version}
-BuildRequires: %{?scl_prefix_java_common}osgi(org.apache.commons.codec) =
%{codec_bundle_version}
-BuildRequires: %{?scl_prefix_mongodb}osgi(org.mongodb.mongo-java-driver) =
%{mongo_bundle_version}
-# Netty osgi provides are not there in SCL
-%{!?scl:
-BuildRequires: %{?scl_prefix}osgi(org.jboss.netty) = %{netty_bundle_version}
-}
-BuildRequires: %{?scl_prefix_java_common}osgi(com.google.gson) = %{gson_bundle_version}
-BuildRequires: %{?scl_prefix_java_common}osgi(org.apache.httpcomponents.httpcore) =
%{hc_core_bundle_version}
-# httpmime comes from httpcomponents-client just like httpclient itself
-BuildRequires: %{?scl_prefix_java_common}osgi(org.apache.httpcomponents.httpclient) =
%{hc_client_bundle_version}
-BuildRequires: %{?scl_prefix_java_common}osgi(org.apache.httpcomponents.httpmime) =
%{hc_client_bundle_version}
-# The thread plugin needs this for visualizing thread deadlocks
-BuildRequires: %{?scl_prefix}osgi(com.mxgraph) = %{jgraphx_bundle_version}
-# The web endpoint plugin gets this bundle baked into the bundles list.
-BuildRequires: %{?scl_prefix_java_common}osgi(%{javax_servlet_bsn}) =
%{javax_servlet_bundle_version}
-BuildRequires: %{?scl_prefix_java_common}mvn(%{object_web_asm_maven_coords}) >= 5
-
-%{?!scl:
-Requires: javapackages-tools
-Requires: java-devel >= 1:1.8.0
-}
-%{?scl:
-Requires: %{?scl_prefix}runtime
-Requires: java-1.7.0-openjdk-devel
-}
-# Only require mongodb-server on arches where it's available
-%ifarch %{arm} %{ix86} x86_64
-Requires: %{?scl_prefix_mongodb}mongodb-server
-# Fedora's thermostat-setup uses mongo directly
-Requires: %{?scl_prefix_mongodb}mongodb
-%endif
-%if 0%{?is_rhel_6}
-Requires: gnome-keyring
-%else
-# Use libsecret on Fedora
-%{?!scl:
-Requires: libsecret
-}
-%{?scl:
-Requires: libgnome-keyring
-}
-%endif
-%if 0%{?is_rhel_6}
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-%else
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
-%endif
-# Sanity requires for needed OSGi bundles.
-Requires: %{?scl_prefix}osgi(org.jfree.jfreechart) >= %{jfreechart_bundle_version}
-Requires: %{?scl_prefix}osgi(org.jfree.jcommon) >= %{jcommon_bundle_version}
-Requires: %{?scl_prefix_java_common}osgi(org.apache.commons.logging) >=
%{logging_bundle_version}
-Requires: %{?scl_prefix_java_common}osgi(org.apache.commons.beanutils) >=
%{beanutils_bundle_version}
-Requires: %{?scl_prefix_java_common}osgi(org.apache.commons.codec) >=
%{codec_bundle_version}
-# FIXME: switch back to mongodb prefix once 2.13.2 is available in
-# the mongodb collection.
-Requires: %{?scl_prefix_mongodb}osgi(org.mongodb.mongo-java-driver) >=
%{mongo_bundle_version}
-# Netty osgi provides is not there in SCL
-%{!?scl:
-Requires: %{?scl_prefix}osgi(org.jboss.netty) = %{netty_bundle_version}
-}
-Requires: %{?scl_prefix_java_common}osgi(com.google.gson) >= %{gson_bundle_version}
-Requires: %{?scl_prefix_java_common}osgi(org.apache.httpcomponents.httpcore) >=
%{hc_core_bundle_version}
-# httpmime comes from httpcomponents-client just like httpclient itself
-Requires: %{?scl_prefix_java_common}osgi(org.apache.httpcomponents.httpclient) >=
%{hc_client_bundle_version}
-Requires: %{?scl_prefix_java_common}osgi(org.apache.httpcomponents.httpmime) >=
%{hc_client_bundle_version}
-
-# The version of asm that this package builds against gets bundled in
-# See
https://fedorahosted.org/fpc/ticket/226 for the same issue in another package
-Provides: %{?scl_prefix}bundled(%{?scl_prefix_maven}mvn(%{object_web_asm_maven_coords})
-
-%description
-Thermostat is a monitoring and instrumentation tool for the Hotspot JVM,
-with support for monitoring multiple JVM instances. The system is made
-up of two processes: an Agent, which collects data, and a Client which
-allows users to visualize this data. These components communicate via
-a MongoDB-based storage layer. A pluggable agent and gui framework
-allows for collection and visualization of performance data beyond that
-which is included out of the box.
-
-%package javadoc
-Summary: Javadocs for %{pkg_name}
-Group: Documentation
-%{!?scl:
-Requires: javapackages-tools
-}
-
-BuildArch: noarch
-
-%description javadoc
-This package contains the API documentation for %{pkg_name}
-
-%package webapp
-Summary: Web storage endpoint for Thermostat
-BuildArch: noarch
-%if 0%{?is_rhel_6}
-Requires: tomcat6
-%else
-Requires: tomcat >= 7.0.54
-%endif
-Requires: %{name} = %{version}-%{release}
-Requires: %{?scl_prefix}apache-commons-fileupload
-
-%description webapp
-This package contains the exploded web archive. This web application
-contains the server-side parts for deploying thermostat with improved
-security.
-
-%prep
-%{?scl:scl enable %{scl_maven} %{scl_java_common} %{scl_mongodb} %{scl} - <<
"EOF"}
-# When Source0 is released version.
-%setup -q -n %{pkg_name}-%{version}
-# When Source0 is a snapshot from HEAD.
-#%%setup -q -n %%{pkg_name}-%%{hgrev}
-# When Source 0 is a snapshot from a release branch.
-#%%setup -q -n %%{pkg_name}-%%{major}-%%{minor}-%%{hgrev}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
-# Replace thermostatrc with Fedora's version
-cp %{SOURCE4} distribution/config/thermostatrc
-
-# Fix up artifact names which have different name upstream
-# lucene
-%pom_remove_dep
"org.apache.servicemix.bundles:org.apache.servicemix.bundles.lucene"
vm-heap-analysis/common
-%pom_remove_dep
"org.apache.servicemix.bundles:org.apache.servicemix.bundles.lucene"
vm-heap-analysis/distribution
-%pom_remove_dep
"org.apache.servicemix.bundles:org.apache.servicemix.bundles.lucene-analyzers-common"
vm-heap-analysis/common
-%pom_remove_dep
"org.apache.servicemix.bundles:org.apache.servicemix.bundles.lucene-analyzers-common"
vm-heap-analysis/distribution
-%pom_add_dep "org.apache.lucene:lucene-analyzers:%{lucene_version}"
vm-heap-analysis/common
-%pom_add_dep "org.apache.lucene:lucene-analyzers:%{lucene_version}"
vm-heap-analysis/distribution
-%pom_add_dep "org.apache.lucene:lucene-core:%{lucene_version}"
vm-heap-analysis/common
-%pom_add_dep "org.apache.lucene:lucene-core:%{lucene_version}"
vm-heap-analysis/distribution
-# Fix up artifact names for jgraphx
-%pom_remove_dep "org.tinyjee.jgraphx:jgraphx"
-%pom_add_dep "com.mxgraph:jgraphx:%{jgraphx_bundle_version}.0"
-%pom_remove_dep "org.tinyjee.jgraphx:jgraphx" thread/client-swing
-%pom_add_dep "com.mxgraph:jgraphx:%{jgraphx_bundle_version}.0"
thread/client-swing
-# httpclient
-%pom_remove_dep org.apache.httpcomponents:httpclient-osgi web/client
-%pom_add_dep org.apache.httpcomponents:httpclient:4.4.0 web/client
-%pom_remove_dep org.apache.httpcomponents:httpclient-osgi client/command
-%pom_add_dep org.apache.httpcomponents:httpclient:4.4.0 client/command
-# add httpmime dep. this is included in upstreams' strange jar
-%pom_add_dep org.apache.httpcomponents:httpmime:4.4.0 web/client
-# httpcore
-%pom_remove_dep org.apache.httpcomponents:httpcore-osgi web/client
-%pom_add_dep org.apache.httpcomponents:httpcore:4.4.0 web/client
-# need jline 2.13 (otherwise this resolves to jline 1)
-%pom_xpath_remove "pom:properties/pom:jline.version"
-%pom_xpath_inject "pom:properties"
"<jline.version>2.13</jline.version>"
-# netty
-%pom_xpath_replace
"pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId[text()='netty']]/pom:groupId"
\
- "<groupId>io.netty</groupId>"
-%pom_remove_dep org.jboss.netty:netty common/command
-%pom_remove_dep org.jboss.netty:netty client/command
-%pom_remove_dep org.jboss.netty:netty agent/command
-%pom_remove_dep org.jboss.netty:netty agent/command-server
-%pom_add_dep io.netty:netty:%{netty_bundle_version} common/command
-%pom_add_dep io.netty:netty:%{netty_bundle_version} client/command
-%pom_add_dep io.netty:netty:%{netty_bundle_version} agent/command
-%pom_add_dep io.netty:netty:%{netty_bundle_version} agent/command-server
-
-# Don't use maven-exec-plugin. We do things manually in order to avoid this
-# additional dep. It's used in agent/core/pom.xml et.al.
-%pom_remove_plugin org.codehaus.mojo:exec-maven-plugin agent/core
-%pom_remove_plugin org.codehaus.mojo:exec-maven-plugin keyring
-%pom_remove_plugin org.codehaus.mojo:exec-maven-plugin laf-utils
-
-# Remove license plugin in main pom.xml
-%pom_remove_plugin com.mycila:license-maven-plugin
-
-# Remove javacoco-coverage plugin (in main pom.xml and web/war/pom.xml)
-%pom_remove_plugin org.jacoco:jacoco-maven-plugin
-%pom_remove_plugin org.jacoco:jacoco-maven-plugin web/war
-
-# Remove pmd plugin
-%pom_remove_plugin org.apache.maven.plugins:maven-pmd-plugin
-
-# Remove m2e's lifecyle plugin
-%pom_remove_plugin org.eclipse.m2e:lifecycle-mapping
-
-# Disable test modules
-%pom_disable_module test common
-%pom_disable_module integration-tests
-%pom_disable_module testutils storage
-%pom_remove_dep com.redhat.thermostat:thermostat-storage-testutils vm-cpu/common
-%pom_remove_dep com.redhat.thermostat:thermostat-storage-testutils vm-profiler/common
-%pom_remove_dep com.redhat.thermostat:thermostat-storage-testutils thread/collector
-# Disable some dev modules we don't ship
-%pom_disable_module ide-launcher dev
-%pom_disable_module schema-info-command dev
-%pom_disable_module perflog-analyzer dev
-# SCL would need maven archetype packaging plugin for this to work. For now package in
-# Fedora only.
-%{?scl:
-%pom_disable_module archetype-ext dev
-%pom_disable_module multi-module-plugin-archetype dev
-}
-%pom_remove_dep com.redhat.thermostat:thermostat-schema-info-distribution distribution
-
-# Remove system scope and systempath from tools jar dependency.
-%pom_xpath_remove -r
"pom:dependencies/pom:dependency[pom:groupId='com.sun']/pom:scope"
-%pom_xpath_remove -r
"pom:dependencies/pom:dependency[pom:groupId='com.sun']/pom:systemPath"
-
-# Remove depencency on the web archive for web-storage-service we'll make deps
-# available manually
-%pom_remove_dep "com.redhat.thermostat:thermostat-web-war"
web/endpoint-plugin/web-service
-
-# jetty-schemas is not available in SCLs
-%{?scl:
-%pom_remove_dep org.eclipse.jetty.toolchain:jetty-schemas
web/endpoint-plugin/distribution
-}
-# Skip automatic installation of zip artifacts. We only use it for our build
-# to assemble plug-ins.
-%mvn_package com.redhat.thermostat::zip: __noinstall
-# Skip automatic installation of the war module.
-# We install it manually. Without this "config" %mvn_build -f
-# fails. See RHBZ#963838
-%mvn_package com.redhat.thermostat:thermostat-web-war __noinstall
-# Don't install :thermostat-common-test, it's a test only dep which
-# isn't run during the build.
-%mvn_package com.redhat.thermostat:thermostat-common-test __noinstall
-
-# These are just upstream build helpers. Don't install them.
-%mvn_package com.redhat.thermostat:thermostat-distribution __noinstall
-%mvn_package com.redhat.thermostat:thermostat-assembly __noinstall
-
-# thermostat-web-server and thermostat-web-endpoint should be part of
-# the webapp sub-package
-%mvn_package com.redhat.thermostat:thermostat-web-server webapp
-%mvn_package "com.redhat.thermostat:thermostat-web-endpoint-plugin" webapp
-%mvn_package "com.redhat.thermostat:thermostat-web-endpoint:pom:" webapp
-%mvn_package "com.redhat.thermostat:thermostat-web-endpoint-distribution:pom:"
webapp
-# Do not embed jgraphx dependency in thread client.
-%pom_xpath_remove
"pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:configuration/pom:instructions/pom:Embed-Dependency"
thread/client-swing
-%{?scl:EOF}
-
-%build
-%{?scl:scl enable %{scl_maven} %{scl_java_common} %{scl_mongodb} %{scl} - <<
"EOF"}
-export CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
-# Set JAVA_HOME. make uses this
-. /usr/share/java-utils/java-functions
-set_jvm
-export JAVA_HOME
-
-################## Build JNI bits ########################
-# JNI bits depend on NativeLibraryResolver so compile that
-# first and relevant Java classes with native methods
-# after.
-pushd annotations
- mkdir -p target/classes
- javac -d target/classes \
- src/main/java/com/redhat/thermostat/annotations/Service.java
-popd
-pushd config
- mkdir -p target/classes
- javac -d target/classes \
- -cp ../annotations/target/classes \
- src/main/java/com/redhat/thermostat/shared/config/NativeLibraryResolver.java
\
- src/main/java/com/redhat/thermostat/shared/config/CommonPaths.java \
-
src/main/java/com/redhat/thermostat/shared/config/internal/CommonPathsImpl.java \
-
src/main/java/com/redhat/thermostat/shared/config/InvalidConfigurationException.java \
- src/main/java/com/redhat/thermostat/shared/locale/Translate.java \
- src/main/java/com/redhat/thermostat/shared/locale/LocalizedString.java \
-
src/main/java/com/redhat/thermostat/shared/locale/internal/LocaleResources.java
-popd
-pushd keyring
- mkdir -p target/classes
- javac -cp ../config/target/classes:../annotations/target/classes \
- -d target/classes \
- src/main/java/com/redhat/thermostat/utils/keyring/Keyring.java \
- src/main/java/com/redhat/thermostat/utils/keyring/KeyringException.java \
- src/main/java/com/redhat/thermostat/utils/keyring/impl/KeyringImpl.java
- autoreconf --install
- ./configure
- make all
-popd
-pushd agent/core
- mkdir -p target/classes
- javac -cp ../../config/target/classes:../../annotations/target/classes \
- -d target/classes \
- src/main/java/com/redhat/thermostat/agent/utils/hostname/HostName.java \
- src/main/java/com/redhat/thermostat/agent/utils/username/UserNameUtil.java \
-
src/main/java/com/redhat/thermostat/agent/utils/username/UserNameLookupException.java \
-
src/main/java/com/redhat/thermostat/utils/username/internal/UserNameUtilImpl.java
- make all
-popd
-pushd laf-utils
- mkdir -p target/classes
- javac -cp ../config/target/classes \
- -d target/classes
src/main/java/com/redhat/thermostat/internal/utils/laf/gtk/GTKThemeUtils.java
- make all
-popd
-################## Build JNI bits (end) ##################
-
-# This is roughly equivalent to:
-# mvn
-# -Dthermostat.home=... \
-# install javadoc:aggregate
-# Everything after '--' is passed to plain xmvn/mvn
-%mvn_build -f -- -Dthermostat.home=%{thermostat_home} \
- -Dthermostat.jdk.home=%{jdk_base} \
- -Dthermostat.system.user=thermostat \
- -Dthermostat.system.group=thermostat \
- -Dthermostat.desktop.app.name=%{thermostat_desktop_app_name} \
- -Dnetty.version=%{netty_bundle_version}.Final \
- -Dtomcat=%{tomcat_version} \
- -Dpkg_name=%{pkg_name} \
- -Dcommons-logging.version=%{logging_bundle_version} \
- -Dcommons-collections.version=%{collections_bundle_version} \
- -Dcommons-codec.osgi-version=%{codec_bundle_version} \
- -Dcommons-beanutils.version=%{beanutils_bundle_version} \
- -Dgson.version=%{gson_bundle_version} \
- -Dmongo-driver.osgi-version=%{mongo_bundle_version} \
- -Dhttpcomponents.core.version=%{hc_core_bundle_version} \
- -Dhttpcomponents.client.version=%{hc_client_bundle_version} \
- -Dhttpcomponents.mime.version=%{hc_client_bundle_version} \
- -Djansi.version=%{jansi_version} \
- -Djcommon.osgi.version=%{jcommon_bundle_version} \
- -Djfreechart.osgi.version=%{jfreechart_bundle_version} \
- -Dlucene-core.bundle.symbolic-name=org.apache.lucene.core \
- -Dlucene-analysis.bundle.symbolic-name=%{lucene_analysis_core_bsn} \
- -Dlucene.osgi-version=%{lucene_version} \
- -Dosgi.compendium.bundle.symbolic-name=org.osgi.compendium \
- -Dosgi.compendium.osgi-version=4.1.0 \
- -Djgraphx.osgi.version=%{jgraphx_bundle_version}.0 \
- -Djetty.javax.servlet.osgi.version=%{javax_servlet_bundle_version} \
- -Djavax.servlet.bsn=%{javax_servlet_bsn} \
- -Djetty.version=%{jetty_version}
-%{?scl:EOF}
-
-
-%install
-%{?scl:scl enable %{scl_maven} %{scl_java_common} %{scl_mongodb} %{scl} - <<
"EOF"}
-#######################################################
-# Thermostat core
-#######################################################
-mkdir -p %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{_sysconfdir}/%{pkg_name}
-mkdir -p %{buildroot}%{system_confdir}/sysconfig
-# JNI things live there
-mkdir -p %{buildroot}%{_libdir}/%{pkg_name}
-mkdir -p %{buildroot}%{_jnidir}
-# Systemd/initrd files live there
-%if 0%{?is_rhel_6}
-mkdir -p %{buildroot}%{system_initrddir}
-%else
-mkdir -p %{buildroot}%{_unitdir}
-%endif
-# Thermostat icon lives there
-mkdir -p %{buildroot}%{system_root_datadir}/icons/hicolor/scalable/apps
-# Thermostat desktop file lives there
-mkdir -p %{buildroot}%{system_root_datadir}/applications
-# Thermostat app data file lives there
-mkdir -p %{buildroot}%{system_root_datadir}/appdata
-# Example config files are in docdir
-mkdir -p %{buildroot}%{_docdir}/%{pkg_name}
-# Man page
-mkdir -p %{buildroot}%{_mandir}/man1
-
-# Dance the xmvn install limbo. This only makes sense if %mvn_build does NOT
-# have the '-i' switch.
-%mvn_install
-
-pushd distribution/target/image/libs
-# JNI jars need to be in %{_jnidir}, we symlink to
-# %{_libdir}/%{pkg_name} files. Files are moved to
-# %{_libdir}/%{pkg_name} next.
-for i in thermostat-keyring-*.jar \
- thermostat-agent-core-*.jar \
- thermostat-laf-utils-*.jar; do
- ln -s %{_libdir}/%{pkg_name}/$i %{buildroot}%{_jnidir}/$i
-done
-# JNI files are in %{_libdir}
-mv thermostat-keyring-*.jar \
- thermostat-agent-core-*.jar \
- thermostat-laf-utils-*.jar \
- %{buildroot}%{_libdir}/%{pkg_name}
-# Make native libs executable so that debuginfos get properly
-# generated
-chmod +x native/*.so
-mv native/* %{buildroot}%{_libdir}/%{pkg_name}
-popd
-
-# Install systemd unit/init script files for storage
-%if 0%{?is_rhel_6}
- # FIXME: No way to run thermostat storage via init.d script.
-%else
- pushd distribution/packaging/shared/systemd
- sed -i 's/User=thermostat/User=root/g' thermostat-agent.service
- sed -i 's/Group=thermostat/Group=root/g' thermostat-agent.service
- # FIXME: install or not-to-install agent service running as root?
- # Currently: Don't install.
- %{?scl:
- sed -i 's#ExecStart=.*#ExecStart=/usr/bin/scl enable $THERMOSTAT1_SCLS_ENABLED --
%{thermostat_home}/bin/thermostat storage --start#g' thermostat-storage.service
- sed -i 's#ExecStop=.*#ExecStop=/usr/bin/scl enable $THERMOSTAT1_SCLS_ENABLED --
%{thermostat_home}/bin/thermostat storage --stop#g' thermostat-storage.service
- sed -i
's#EnvironmentFile=.*#EnvironmentFile=%{_sysconfdir}/sysconfig/%{pkg_name}#g'
thermostat-storage.service
- }
- cp -a thermostat-storage.service
%{buildroot}%{_unitdir}/%{?scl_prefix}%{pkg_name}-storage.service
- popd
-%endif
-
-# Install tmpfiles.d config file for /var/run/%{pkg_name}
-mkdir -p %{buildroot}%{system_tmpfilesdir}
-install -m 0644 distribution/packaging/shared/systemd/tmpfiles.d/%{pkg_name}.conf
%{buildroot}%{system_tmpfilesdir}/%{pkg_name}.conf
-
-# Install thermostat man page
-install -m 0644 distribution/packaging/shared/man/%{pkg_name}.1
%{buildroot}%{_mandir}/man1/%{pkg_name}.1
-
-# Install bash completions. Note those won't work on EL 6 unless somebody
-# finds a bash-completion package somewhere (e.g. via EPEL)
-# FIXME: Install it outside the SCL
-# (i.e. /usr/share directly) since there does not seem to be support
-# for it otherwise.
-# See:
https://bugzilla.redhat.com/show_bug.cgi?id=1264094
-mkdir -p %{buildroot}%{system_root_datadir}/bash-completion/completions
-install -pm 644 distribution/target/packaging/bash-completion/thermostat-completion
%{buildroot}%{system_root_datadir}/bash-completion/completions/%{pkg_name}
-
-# install files needed for proper desktop integration
-install -m 0644 distribution/target/packaging/desktop/%{pkg_name}.desktop
%{buildroot}%{system_root_datadir}/applications/%{name}.desktop
-install -m 0644 distribution/target/packaging/icons/256px.svg
%{buildroot}%{system_root_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-install -m 0644 distribution/target/packaging/desktop/%{pkg_name}.appdata.xml
%{buildroot}%{system_root_datadir}/appdata/%{name}.appdata.xml
-
-rm -rf distribution/target/image/bin/%{pkg_name}.orig
-# Remove developer setup things.
-rm distribution/target/image/bin/thermostat-devsetup
-rm distribution/target/image/etc/devsetup.input
-
-# We'll install webapp later, move it out of the way
-mv distribution/target/image/webapp webstorage-webapp
-# Move everything else into $THERMOSTAT_HOME
-cp -a distribution/target/image %{buildroot}%{thermostat_home}
-
-# Replace jars with symlinks to installed libs
-pushd %{buildroot}%{thermostat_home}/libs
- xmvn-subst %{xmvn_subst_args}
-popd
-# Do the same for thermostat plugin dirs
-pushd %{buildroot}%{thermostat_home}/plugins
-for plugin_name in $(ls); do
- pushd $plugin_name
- xmvn-subst %{xmvn_subst_args}
- popd
-done
-popd
-# Remove duplicate tools*.jar files which makes the resulting
-# RPM insanely large (21 * 20 MB) ~= 410 MB => ~90 to 100 MB compressed
-find %{buildroot}%{thermostat_home} -name 'tools*.jar' | xargs rm
-# Remove jzlib.jar/jzlib-any.jar which maven thinks we need but we don't
-# actually need.
-rm -rf %{buildroot}%{thermostat_home}/libs/jzlib*.jar
-
-pushd %{buildroot}%{_libdir}/%{pkg_name}
-# symlink JNI jars
-for i in *.jar; do
- ln -s %{_libdir}/%{pkg_name}/$i \
- %{buildroot}%{thermostat_home}/libs/$i
-done
-# symlink shared libs
-for i in *.so; do
- ln -s %{_libdir}/%{pkg_name}/$i \
- %{buildroot}%{thermostat_home}/libs/native/$i
-done
-popd
-
-# Symlink essential thermostat script(s) in /usr/bin
-ln -s %{_datarootdir}/%{pkg_name}/bin/thermostat \
- %{buildroot}%{_bindir}/thermostat
-ln -s %{_datarootdir}/%{pkg_name}/bin/thermostat-setup \
- %{buildroot}%{_bindir}/thermostat-setup
-ln -s %{_datarootdir}/%{pkg_name}/bin/thermostat-common \
- %{buildroot}%{_bindir}/thermostat-common
-
-# Move config files to /etc and symlink stuff under
-# $THERMOSTAT_HOME/etc to it. Put example configs
-# in docdir.
-mv %{buildroot}%{thermostat_home}/etc/examples \
- %{buildroot}%{_docdir}/%{pkg_name}/
-mv %{buildroot}%{thermostat_home}/etc/* \
- %{buildroot}%{_sysconfdir}/%{pkg_name}
-rmdir %{buildroot}%{thermostat_home}/etc
-ln -s %{_sysconfdir}/%{pkg_name}/ \
- %{buildroot}%{thermostat_home}/etc
-
-# Install sysconfig file. This is so as to set various env vars
-# which controls how thermostat behaves. In the systemd case we
-# want thermostat to run as system user.
-sed 's#__thermostat_home__#%{thermostat_home}/#g' %{SOURCE1} >
thermostat_sysconfig.env
-sed -i 's#__thermostat_user_home__#%{user_thermostat_home}#g'
thermostat_sysconfig.env
-cp thermostat_sysconfig.env %{buildroot}%{system_confdir}/sysconfig/%{pkg_name}
-
-# Set up directory structure for running thermostat storage/
-# thermostat agend via systemd
-%{__install} -d -m 0775 %{buildroot}%{system_datadir}
-# Create a setup-complete.stamp file so as to prevent the launcher hook from
-# successfully running the thermostat1-thermostat-storage service.
-echo "setup-complete.stamp for thermostat-storage systemd service" >
%{buildroot}%{system_datadir}/setup-complete.stamp
-%{__install} -d -m 0775 %{buildroot}%{system_cachedir}
-%{__install} -d -m 0775 %{buildroot}%{system_logdir}
-%{__install} -d -m 0775 %{buildroot}%{system_statedir}
-# Symlink storage/agent directories so that they can be run
-# as systemd services. The target directories will have
-# appropriate permissions for the thermostat user to allow
-# writing.
-ln -s %{system_datadir} %{buildroot}%{thermostat_home}/data
-ln -s %{system_statedir} %{buildroot}%{thermostat_home}/run
-ln -s %{system_logdir} %{buildroot}%{thermostat_home}/logs
-ln -s %{system_cachedir} %{buildroot}%{thermostat_home}/cache
-#######################################################
-# Thermostat web storage webapp
-#######################################################
-mkdir -p %{buildroot}%{thermostat_catalina_base}/webapps
-pushd webstorage-webapp
-# Fixup THERMOSTAT_HOME in web.xml
- sed -i
'/<param-name>THERMOSTAT_HOME<[/]param-name>/,/<param-value>.*<[/]param-value>/{
s$<param-value>.*</param-value>$<param-value>%{thermostat_home}</param-value>$
}' \
- WEB-INF/web.xml
-popd
-cp -r webstorage-webapp %{buildroot}%{thermostat_catalina_base}/webapps/%{pkg_name}
-# Provide a link to webapp in THERMOSTAT_HOME
-ln -s %{thermostat_catalina_base}/webapps/%{pkg_name}
%{buildroot}%{thermostat_home}/webapp
-
-# Replace jars with symlinks
-pushd %{buildroot}%{thermostat_catalina_base}/webapps/%{pkg_name}/WEB-INF/lib
- xmvn-subst %{xmvn_subst_args}
-popd
-
-# Remove tools.jar (coming from the JVM). We also don't need jzlib.jars.
-# The latter jar might be a (broken?) symlink which makes web-storage-service fail.
-rm -rf
%{buildroot}%{thermostat_catalina_base}/webapps/%{pkg_name}/WEB-INF/lib/jzlib*.jar
-rm -rf
%{buildroot}%{thermostat_catalina_base}/webapps/%{pkg_name}/WEB-INF/lib/tools*.jar
-
-# We use a custom CATALINA_BASE with core tomcat directories
-# symlinked. This allows us to deploy the thermostat webapp
-# nicely configured without any configuration required prior
-# starting tomcat via systemd.
-sed 's#__catalina_base__#%{thermostat_catalina_base}#g' %{SOURCE3} >
tomcat_service_thermostat.txt
-sed -i 's#__jaas_config__#%{_sysconfdir}/%{pkg_name}/%{pkg_name}_jaas.conf#g'
tomcat_service_thermostat.txt
-%{?scl:
- # install the init script on RHEL 6
- %if 0%{?is_rhel_6}
- sed 's#__service_name__#%{thermostat_tomcat_service_name}#g' %{SOURCE5} >
tomcat_initd.sh
- cp tomcat_initd.sh %{buildroot}%{system_initrddir}/%{thermostat_tomcat_service_name}
- cp tomcat_service_thermostat.txt
%{buildroot}%{system_confdir}/sysconfig/%{thermostat_tomcat_service_name}
- %else
- # RHEL 7
-
-cat <<SYSTEMD_TOMCAT_ENV >systemd_tomcat_env_thermostat.txt
-# This file is sourced via the thermostat tomcat systemd service.
-SERVICE_NAME=%{thermostat_tomcat_service_name}
-SYSTEMD_TOMCAT_ENV
-
- cp systemd_tomcat_env_thermostat.txt
%{buildroot}%{system_confdir}/sysconfig/%{thermostat_tomcat_service_name}
- # Install file twice, since RHEL 7.0 and RHEL 7.1 have different tomcat versions.
- # The first file is used by thermostat1-thermostat-tomcat's service. The second
one is
- # used by "tomcat@thermostat".
- cp tomcat_service_thermostat.txt
%{buildroot}%{system_confdir}/sysconfig/%{thermostat_tomcat_service_name}
- cp tomcat_service_thermostat.txt
%{buildroot}%{system_confdir}/sysconfig/tomcat@%{pkg_name}
- sed "s#__service_file_name__#%{thermostat_tomcat_service_name}#g"
%{SOURCE6} > systemd_tomcat_thermostat.service
- sed -i "s#__service_file_path__#%{system_confdir}/sysconfig#g"
systemd_tomcat_thermostat.service
- cp systemd_tomcat_thermostat.service
%{buildroot}%{_unitdir}/%{thermostat_tomcat_service_name}.service
- %endif
-}
-%{!?scl:
- cp tomcat_service_thermostat.txt
%{buildroot}%{system_confdir}/sysconfig/tomcat@%{pkg_name}
-}
-# Create a symlinked CATALINA_BASE in order to make tomcat deploy
-# the scl-ized tomcat web-app. We use our own copy of conf/server.xml in order
-# to not port-conflict with system tomcat. See RHBZ#1054396
-pushd %{buildroot}/%{thermostat_catalina_base}
- for i in lib logs work temp; do
- ln -s %{system_root_datadir}/tomcat/$i $i
- done
- mkdir conf
-popd
-# Symlink everything other than server.xml
-pushd %{system_root_datadir}/tomcat/conf
- for i in *; do
- ln -s %{system_root_datadir}/tomcat/conf/$i
%{buildroot}/%{thermostat_catalina_base}/conf/$i
- done
- rm %{buildroot}/%{thermostat_catalina_base}/conf/server.xml
- cp -p server.xml %{buildroot}/%{thermostat_catalina_base}/conf/server.xml
-popd
-pushd %{buildroot}/%{thermostat_catalina_base}/conf
- # Fix the connector port, use a different access log file name
- sed -i -e 's/<Connector port="8080"/<Connector
port="%{thermostat_catalina_port}"/g' \
- -e
's/prefix="localhost_access_log."/prefix="localhost_thermostat_access_log."/g'
server.xml
-popd
-%{?scl:
-# Make tomcat with custom catalina base happy (not complain about this dir missing)
-mkdir -p %{buildroot}/%{_root_localstatedir}/log/%{thermostat_tomcat_service_name}
-}
-%{?scl:EOF}
-
-%check
-# Perform a sanity check so as to ensure that JAVA_HOME will point to a
-# stable path (across OpenJDK package updates).
-JDK_HOME_CANDIDATE=$(grep 'jdk_home_candidate='
%{buildroot}/%{thermostat_home}/bin/thermostat-common | cut -d= -f2 | cut -d\" -f2)
-test "${JDK_HOME_CANDIDATE}" = "%{jdk_base}"
-
-%pre
-%{?scl:
- __bin_dir=%{system_sbindir}
-}
-%{!?scl:
- __bin_dir=%{_sbindir}
-}
-# add the thermostat user and group
-${__bin_dir}/groupadd -r thermostat 2>/dev/null || :
-${__bin_dir}/useradd -c "Thermostat system user" -g thermostat \
- -s /sbin/nologin -r -d %{thermostat_home} thermostat 2>/dev/null || :
-
-%post
-# Install but don't activate
-%systemd_post %{?scl_prefix}%{pkg_name}-storage.service
-# Required for icon cache (i.e. Thermostat icon)
-/bin/touch --no-create %{system_root_datadir}/icons/hicolor &>/dev/null || :
-
-%post webapp
-# install but don't activate
-%if 0%{?is_rhel_6}
- /sbin/chkconfig --add %{thermostat_tomcat_service_name}
-%endif
-
-%preun
-%systemd_preun %{?scl_prefix}%{pkg_name}-storage.service
-
-%postun
-# Required for icon cache (i.e. Thermostat icon)
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{system_root_datadir}/icons/hicolor &> /dev/null
- /usr/bin/gtk-update-icon-cache %{system_root_datadir}/icons/hicolor
&>/dev/null || :
-fi
-%systemd_postun %{?scl_prefix}%{pkg_name}-storage.service
-
-%posttrans
-# Required for icon cache (i.e. Thermostat icon)
-/usr/bin/gtk-update-icon-cache %{system_root_datadir}/icons/hicolor &>/dev/null ||
:
-
-%files -f .mfiles
-%doc LICENSE
-# %license macro not available in RHEL 6
-%if 0%{?is_rhel_6}
-%doc COPYING
-%doc OFL.txt
-%else
-%license COPYING
-%license OFL.txt
-%endif
-%doc README
-%doc README.api
-# Own appropriate files in /etc/ part of them belong to the
-# webapp sub-package
-%config(noreplace) %dir %{_sysconfdir}/%{pkg_name}
-# This file is only used by the systemd service running agent.
-# Only root should be able to read/write to it.
-%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/%{pkg_name}/agent.auth
-%config(noreplace) %{_sysconfdir}/%{pkg_name}/agent.properties
-%config(noreplace) %{_sysconfdir}/%{pkg_name}/db.properties
-%config(noreplace) %{_sysconfdir}/%{pkg_name}/logging.properties
-%config %{_sysconfdir}/%{pkg_name}/bash-complete-logging.properties
-%{system_root_datadir}/bash-completion/completions/%{pkg_name}
-# Own containing directories since bash-completion package might not
-# be installed
-%dir %{system_root_datadir}/bash-completion/completions
-%dir %{system_root_datadir}/bash-completion
-# Own desktop related files
-%{system_root_datadir}/applications/%{name}.desktop
-%{system_root_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{system_root_datadir}/appdata/%{name}.appdata.xml
-%config(noreplace) %{_sysconfdir}/%{pkg_name}/plugins.d
-%config(noreplace) %{_sysconfdir}/%{pkg_name}/ssl.properties
-%config %{_sysconfdir}/%{pkg_name}/commands
-%config %{_sysconfdir}/%{pkg_name}/osgi-export.properties
-%config %{_sysconfdir}/%{pkg_name}/thermostatrc
-# Required for systemd services
-%config(noreplace) %{system_confdir}/sysconfig/%{pkg_name}
-%{_datadir}/%{pkg_name}/etc
-%{_datadir}/%{pkg_name}/bin
-%{_datadir}/%{pkg_name}/libs
-%{_datadir}/%{pkg_name}/plugins/local
-%{_datadir}/%{pkg_name}/plugins/host-cpu
-%{_datadir}/%{pkg_name}/plugins/host-memory
-%{_datadir}/%{pkg_name}/plugins/host-overview
-%{_datadir}/%{pkg_name}/plugins/killvm
-%{_datadir}/%{pkg_name}/plugins/notes
-%{_datadir}/%{pkg_name}/plugins/numa
-%{_datadir}/%{pkg_name}/plugins/storage-profile
-%{_datadir}/%{pkg_name}/plugins/thread
-%{_datadir}/%{pkg_name}/plugins/validate
-%{_datadir}/%{pkg_name}/plugins/setup
-%{_datadir}/%{pkg_name}/plugins/vm-classstat
-%{_datadir}/%{pkg_name}/plugins/vm-compiler
-%{_datadir}/%{pkg_name}/plugins/vm-cpu
-%{_datadir}/%{pkg_name}/plugins/vm-gc
-%{_datadir}/%{pkg_name}/plugins/vm-heap-analysis
-%{_datadir}/%{pkg_name}/plugins/vm-io
-%{_datadir}/%{pkg_name}/plugins/vm-jmx
-%{_datadir}/%{pkg_name}/plugins/vm-memory
-%{_datadir}/%{pkg_name}/plugins/vm-numa
-%{_datadir}/%{pkg_name}/plugins/vm-overview
-%{_datadir}/%{pkg_name}/plugins/vm-profiler
-%{_datadir}/%{pkg_name}/plugins/vm-find
-%{_datadir}/%{pkg_name}/plugins/experimental
-%{_datadir}/%{pkg_name}/cache
-%{_datadir}/%{pkg_name}/data
-%{_datadir}/%{pkg_name}/logs
-%{_datadir}/%{pkg_name}/run
-%{_libdir}/%{pkg_name}
-%{_jnidir}/thermostat-*.jar
-%{_bindir}/thermostat
-%{_bindir}/thermostat-setup
-%{_bindir}/thermostat-common
-%{_mandir}/man1/%{pkg_name}.1*
-%if 0%{?with_systemd}
-%{_unitdir}/%{?scl_prefix}%{pkg_name}-storage.service
-%endif
-%{system_tmpfilesdir}/%{pkg_name}.conf
-# To these directories get written to when thermostat storage/agent
-# run as systemd services
-%attr(0770,thermostat,thermostat) %dir %{system_datadir}
-%attr(0660,thermostat,thermostat) %{system_datadir}/setup-complete.stamp
-%attr(0770,thermostat,thermostat) %dir %{system_cachedir}
-%attr(0770,thermostat,thermostat) %dir %{system_logdir}
-%attr(0770,thermostat,thermostat) %dir %{system_statedir}
-%doc %{_docdir}/%{pkg_name}
-
-%files javadoc -f .mfiles-javadoc
-%doc LICENSE
-# license macro not available in RHEL 6
-%if 0%{?is_rhel_6}
-%doc COPYING
-%doc OFL.txt
-%else
-%license COPYING
-%license OFL.txt
-%endif
-%{?scl:
- %{_datarootdir}/javadoc/%{pkg_name}
-}
-
-%files webapp -f .mfiles-webapp
-%{thermostat_catalina_base}
-%config(noreplace) %{_sysconfdir}/%{pkg_name}/%{pkg_name}_jaas.conf
-%config(noreplace) %{_sysconfdir}/%{pkg_name}/web-storage-service.properties
-# Those files should be readable by root and tomcat only
-%attr(0640,root,tomcat) %config(noreplace)
%{_sysconfdir}/%{pkg_name}/%{pkg_name}-users.properties
-%attr(0640,root,tomcat) %config(noreplace)
%{_sysconfdir}/%{pkg_name}/%{pkg_name}-roles.properties
-%attr(0640,root,tomcat) %config(noreplace) %{_sysconfdir}/%{pkg_name}/web.auth
-# We need an extra file in order to make thermostat-webapp work with
-# our custom CATALINA_BASE. This sets the JAAS-config option.
-%{?scl:
-%if 0%{?is_rhel_6}
- %config(noreplace) %{system_confdir}/sysconfig/%{thermostat_tomcat_service_name}
- # thermostat tomcat init script
- %attr(0755,root,root) %{system_initrddir}/%{thermostat_tomcat_service_name}
- %attr(0770,tomcat,tomcat) %dir
%{_root_localstatedir}/log/%{thermostat_tomcat_service_name}
-%else
- %config(noreplace) %{system_confdir}/sysconfig/%{thermostat_tomcat_service_name}
- %{_unitdir}/%{?scl_prefix}%{pkg_name}-tomcat.service
- %attr(0770,tomcat,tomcat) %dir
%{_root_localstatedir}/log/%{thermostat_tomcat_service_name}
- # File used by RHEL-7.1's tomcat@thermostat service.
- %config(noreplace) %{system_confdir}/sysconfig/tomcat@%{pkg_name}
-%endif
-}
-%{!?scl:
- %config(noreplace) %{system_confdir}/sysconfig/tomcat@%{pkg_name}
-}
-%{_datadir}/%{pkg_name}/webapp
-%{_datadir}/%{pkg_name}/plugins/embedded-web-endpoint
-
-%changelog
-* Tue Jul 24 2018 Severin Gehwolf <sgehwolf(a)redhat.com> - 1.6.6-10
-- Fix FTBFS. Closes RHBZ#1606515.
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.6.6-9.1
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Jun 04 2018 Severin Gehwolf <sgehwolf(a)redhat.com> - 1.6.6-9
-- Update
osgi.org spec fixes patch.
-- Use correct mongo-java-driver version from rawhide.
-
-* Thu Mar 22 2018 Elliott Baron <ebaron(a)redhat.com> - 1.6.6-8
-- Update bundle version for google-gson.
-
-* Fri Mar 16 2018 Elliott Baron <ebaron(a)redhat.com> - 1.6.6-7
-- Add patch to remove 'nohttpinterface' option removed in MongoDB 3.6.
-
-* Thu Mar 15 2018 Elliott Baron <ebaron(a)redhat.com> - 1.6.6-6
-- Update apache-commons-codec and httpcomponents.
-- Patch group ID for Netty in top-level POM.
-- Fixes FTBFS.
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.6.6-5.1
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Aug 28 2017 Severin Gehwolf <sgehwolf(a)redhat.com> - 1.6.6-5
-- Update bundle version for google-gson. Fixes FTBFS.
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.6.6-4.2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.6.6-4.1
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Jun 13 2017 Severin Gehwolf <sgehwolf(a)redhat.com> - 1.6.6-4
-- Fix osgi specs patch. This in turn fixes FTBFS.
-
-* Thu May 18 2017 Severin Gehwolf <sgehwolf(a)redhat.com> - 1.6.6-3
-- Rebuild for mongo-java-driver update.
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.6.6-2.1
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Jan 18 2017 Severin Gehwolf <sgehwolf(a)redhat.com> - 1.6.6-2
-- Rebuild for httpcomponents-client update.
-
-* Wed Jan 18 2017 Severin Gehwolf <sgehwolf(a)redhat.com> - 1.6.6-1
-- Update to latest upstream 1.6.6 release.
-- Sync with upstream spec file.
-
-* Thu Jan 05 2017 Severin Gehwolf <sgehwolf(a)redhat.com> - 1.6.4-5
-- Fix FTBFS (netty3 update). Resolves RHBZ#1409615.
-
-* Wed Nov 02 2016 Severin Gehwolf <sgehwolf(a)redhat.com> - 1.6.4-4
-- Add patch for fixing storage initilization on
- concurrent connections.
-- Add patch for fixing verified token removal
-
-* Wed Nov 02 2016 Severin Gehwolf <sgehwolf(a)redhat.com> - 1.6.4-3
-- Rebuild for updated apache-commons-beanutils.
-
-* Mon Sep 19 2016 Severin Gehwolf <sgehwolf(a)redhat.com> - 1.6.4-2
-- Rebuild for updated jgraphx.
-
-* Fri Sep 16 2016 Severin Gehwolf <sgehwolf(a)redhat.com> - 1.6.4-1
-- Update to latest upstream 1.6.4 release.
-
-* Wed Jul 13 2016 Severin Gehwolf <sgehwolf(a)redhat.com> - 1.6.0-2
-- Add patch to work-around RHBZ#1353999.
-
-* Fri Jul 08 2016 Severin Gehwolf <sgehwolf(a)redhat.com> - 1.6.0-1
-- Initial version using upstream spec file as base.
diff --git a/thermostat_icon_64px.svg b/thermostat_icon_64px.svg
deleted file mode 100644
index 2eadc18..0000000
--- a/thermostat_icon_64px.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build
0) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="64px" height="59.667px" viewBox="0 0 64 59.667"
enable-background="new 0 0 64 59.667" xml:space="preserve">
-<g>
- <path fill="#27426E"
d="M42.784,15.393l-2.005-1.643c-0.867-1.703-1.208-4.423-1.255-4.839l0.019-0.051c0,0-0.01,0.008-0.023,0.021
- c-0.002-0.018-0.003-0.032-0.003-0.032l-0.022,0.048c-0.327,0.264-2.485,1.951-4.301,2.548l-2.343-0.224
- C22.383,9.409,11.607,14.769,6.992,24.883C1.501,36.919,6.805,51.126,18.838,56.616c12.035,5.491,26.24,0.186,31.732-11.848
- C55.398,34.188,51.88,21.933,42.784,15.393z"/>
- <circle fill="#3970AF" cx="31.146" cy="29.642"
r="15.494"/>
- <circle fill="#FFFFFF" cx="31.464" cy="28.886"
r="13.944"/>
- <path fill="#3970AF"
d="M38.798,16.854l1.98,0.656l-1.593-1.315c-0.653-1.292-0.909-3.343-0.946-3.661l0.014-0.037
- c0,0-0.008,0.009-0.017,0.016c-0.002-0.016-0.003-0.024-0.003-0.024l-0.017,0.038c-0.248,0.197-1.889,1.479-3.268,1.934
- l-2.042-0.196l1.872,0.904l-3.314,13.718L38.798,16.854z"/>
-</g>
-<g>
- <path fill="#27426E"
d="M5.93,16.927l-3.868-2.781c-0.126-0.09-0.33-0.199-0.59-0.199c-0.312,0-0.59,0.152-0.789,0.43
- c-0.206,0.287-0.258,0.611-0.144,0.914c0.086,0.23,0.247,0.381,0.364,0.467l3.87,2.785c0.176,0.124,0.376,0.189,0.579,0.189
- c0.313,0,0.606-0.152,0.799-0.421C6.484,17.846,6.393,17.265,5.93,16.927z"/>
- <path fill="#27426E"
d="M10.119,12.554l-3.2-3.534C6.722,8.801,6.463,8.681,6.191,8.681c-0.167,0-0.42,0.049-0.67,0.273
- c-0.428,0.387-0.459,0.977-0.076,1.396l3.202,3.535c0.194,0.215,0.451,0.333,0.724,0.333c0.243,0,0.482-0.095,0.673-0.269
- c0.263-0.238,0.384-0.558,0.331-0.879C10.337,12.834,10.214,12.658,10.119,12.554z"/>
- <path fill="#27426E"
d="M12.765,5.015c-0.276-0.479-0.861-0.643-1.355-0.355c-0.495,0.286-0.648,0.854-0.366,1.35l2.39,4.128
- c0.18,0.313,0.494,0.499,0.839,0.499c0.175,0,0.354-0.05,0.514-0.143c0.308-0.179,0.493-0.465,0.508-0.789
- c0.013-0.24-0.07-0.438-0.141-0.561L12.765,5.015z"/>
- <path fill="#27426E"
d="M19.29,2.329c-0.171-0.529-0.704-0.811-1.251-0.63c-0.342,0.11-0.51,0.326-0.591,0.484
- c-0.117,0.229-0.131,0.501-0.046,0.759l1.478,4.535c0.135,0.414,0.497,0.684,0.922,0.684c0.11,0,0.221-0.018,0.33-0.055
- c0.545-0.178,0.813-0.701,0.637-1.244L19.29,2.329z"/>
- <path fill="#27426E"
d="M26.239,1.054c-0.056-0.519-0.453-0.881-0.965-0.881L25.147,0.18c-0.571,0.062-0.942,0.517-0.883,1.085
- l0.503,4.742c0.056,0.519,0.457,0.881,0.975,0.881L25.86,6.88c0.352-0.036,0.639-0.225,0.785-0.514
- c0.109-0.215,0.113-0.43,0.098-0.57L26.239,1.054z"/>
- <path fill="#27426E"
d="M32.428,0.177l-0.124-0.006c-0.515,0-0.912,0.364-0.966,0.883l-0.504,4.74
- c-0.06,0.561,0.32,1.024,0.885,1.086l0.125,0.008c0.513,0,0.91-0.364,0.966-0.883l0.501-4.742
- C33.372,0.696,33.001,0.239,32.428,0.177z"/>
- <path fill="#27426E"
d="M39.531,1.702c-0.542-0.177-1.076,0.1-1.25,0.627l-1.486,4.529c-0.174,0.533,0.098,1.07,0.637,1.248
- c0.117,0.037,0.23,0.055,0.343,0.055c0.42,0,0.767-0.262,0.907-0.684l1.485-4.528c0.045-0.134,0.085-0.346,0.024-0.579
- C40.108,2.058,39.869,1.814,39.531,1.702z"/>
- <path fill="#27426E"
d="M46.157,4.663c-0.494-0.287-1.079-0.121-1.353,0.355l-2.39,4.129c-0.28,0.487-0.121,1.066,0.369,1.352
- c0.169,0.098,0.344,0.145,0.52,0.145c0.339,0,0.65-0.188,0.831-0.502l2.389-4.128c0.139-0.24,0.179-0.507,0.114-0.755
- C46.589,5.085,46.469,4.841,46.157,4.663z"/>
- <path fill="#27426E"
d="M52.38,9.64c-0.009-0.18-0.076-0.444-0.343-0.686c-0.249-0.229-0.501-0.276-0.67-0.276
- c-0.271,0-0.527,0.121-0.728,0.338l-3.201,3.536c-0.182,0.199-0.275,0.452-0.262,0.708c0.013,0.261,0.132,0.505,0.337,0.69
- c0.25,0.226,0.503,0.273,0.671,0.273c0.272,0,0.531-0.123,0.726-0.34l3.2-3.531C52.296,10.148,52.392,9.896,52.38,9.64z"/>
- <path fill="#27426E"
d="M57.086,15.132c0.031-0.178,0.021-0.45-0.189-0.741c-0.199-0.278-0.48-0.429-0.79-0.429
- c-0.26,0-0.462,0.105-0.59,0.197l-3.874,2.783c-0.22,0.156-0.363,0.382-0.406,0.637c-0.042,0.256,0.023,0.52,0.183,0.744
- c0.201,0.276,0.48,0.43,0.792,0.43c0.258,0,0.463-0.107,0.589-0.199l3.874-2.781C56.9,15.612,57.046,15.385,57.086,15.132z"/>
- <path fill="#27426E"
d="M60.428,21.624c0.178-0.271,0.2-0.61,0.058-0.936c-0.166-0.379-0.496-0.603-0.881-0.603
- c-0.179,0-0.327,0.046-0.422,0.088l-4.366,1.918c-0.248,0.107-0.435,0.299-0.527,0.539c-0.095,0.242-0.085,0.515,0.024,0.766
- c0.166,0.377,0.496,0.605,0.879,0.605c0.141,0,0.286-0.03,0.423-0.093l4.365-1.917C60.112,21.935,60.296,21.826,60.428,21.624z"/>
- <path fill="#27426E"
d="M57.268,29.762l4.668-0.97c0.272-0.057,0.496-0.204,0.636-0.418c0.101-0.149,0.201-0.4,0.129-0.758
- c-0.101-0.48-0.472-0.792-0.945-0.792c-0.076,0-0.152,0.008-0.222,0.021l-4.671,0.971c-0.549,0.115-0.876,0.62-0.761,1.174
- c0.101,0.482,0.471,0.793,0.944,0.793C57.119,29.783,57.193,29.776,57.268,29.762z"/>
- <path fill="#27426E"
d="M63.146,34.131c-0.179-0.181-0.431-0.281-0.707-0.285l-4.773-0.028c-0.557,0-0.98,0.424-0.985,0.985
- c-0.002,0.359,0.147,0.587,0.273,0.716c0.181,0.181,0.43,0.282,0.707,0.282l4.773,0.03c0.566,0,0.979-0.415,0.983-0.985
- C63.421,34.485,63.271,34.259,63.146,34.131z"/>
-</g>
-</svg>