Mercurial > hg > thermostat-ng > agent

changeset 2445:710a1d37c0ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up dependencies of built in commands in the .properties files Reviewed-by: jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-September/020824.html
author Joshua Matsuoka <jmatsuok@redhat.com>
date Fri, 09 Sep 2016 08:51:50 -0400
parents 386c025be97a
children bc7fbc2c3512
files distribution/config/commands/agent-info.properties distribution/config/commands/agent.properties distribution/config/commands/clean-data.properties distribution/config/commands/connect.properties distribution/config/commands/gui.properties distribution/config/commands/list-agents.properties distribution/config/commands/list-vms.properties distribution/config/commands/ping.properties distribution/config/commands/service.properties distribution/config/commands/storage.properties distribution/config/commands/vm-info.properties distribution/config/commands/vm-stat.properties distribution/packaging/fedora/0001_shared_fix_bundle_loading.patch
diffstat 13 files changed, 6 insertions(+), 307 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/config/commands/agent-info.properties	Thu Sep 08 09:14:29 2016 -0400
+++ b/distribution/config/commands/agent-info.properties	Fri Sep 09 08:51:50 2016 -0400
@@ -2,15 +2,6 @@
           com.redhat.thermostat.storage.mongodb=${project.version}, \
           com.redhat.thermostat.web.common=${project.version}, \
           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}, \
-          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}, \
 
 summary = show info for an agent
 
--- a/distribution/config/commands/agent.properties	Thu Sep 08 09:14:29 2016 -0400
+++ b/distribution/config/commands/agent.properties	Fri Sep 09 08:51:50 2016 -0400
@@ -1,44 +1,10 @@
-bundles = com.redhat.thermostat.agent.core=${project.version}, \
-          com.redhat.thermostat.web.common=${project.version}, \
-          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}, \
-          com.google.gson=${gson.version}, \
-          com.redhat.thermostat.process=${project.version}, \
-          com.redhat.thermostat.common.core=${project.version}, \
+bundles = com.redhat.thermostat.web.client=${project.version}, \
           com.redhat.thermostat.agent.cli=${project.version}, \
-          com.redhat.thermostat.common.command=${project.version}, \
-          com.redhat.thermostat.agent.command=${project.version}, \
-          com.redhat.thermostat.agent.ipc.server=${project.version}, \
+          com.redhat.thermostat.backend.system=${project.version}, \
           com.redhat.thermostat.agent.ipc.unixsocket.server=${project.version}, \
-          com.redhat.thermostat.agent.ipc.common=${project.version}, \
-          com.redhat.thermostat.agent.ipc.unixsocket.common=${project.version}, \
-          ${jnr-unixsocket.bundle.symbolic.name}=${jnr-unixsocket.bundle.version}, \
-          ${jnr-enxio.bundle.symbolic.name}=${jnr-enxio.bundle.version}, \
-          ${jnr-constants.bundle.symbolic.name}=${jnr-constants.version}, \
-          ${jnr-posix.bundle.symbolic.name}=${jnr-posix.version}, \
-          ${jnr-ffi.bundle.symbolic.name}=${jnr-ffi.version}, \
-          ${jnr-x86asm.bundle.symbolic.name}=${jnr-x86asm.version}, \
-          ${jffi.bundle.symbolic.name}=${jffi.version}, \
           ${jffi-native.bundle.symbolic.name}=${jffi.version}, \
-          org.objectweb.asm=${asm.version}, \
-          org.objectweb.asm.commons=${asm.version}, \
-          org.objectweb.asm.util=${asm.version}, \
-          org.objectweb.asm.analysis=${asm.version}, \
-          org.objectweb.asm.tree=${asm.version}, \
-          com.redhat.thermostat.backend.system=${project.version}, \
           com.redhat.thermostat.storage.mongodb=${project.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}, \
-          io.netty.common=${netty.version}, \
-          io.netty.buffer=${netty.version}, \
-          io.netty.transport=${netty.version}, \
-          io.netty.handler=${netty.version}, \
-          io.netty.codec=${netty.version}
+          com.redhat.thermostat.process=${project.version}
 
 summary = run the thermostat agent
 
--- a/distribution/config/commands/clean-data.properties	Thu Sep 08 09:14:29 2016 -0400
+++ b/distribution/config/commands/clean-data.properties	Fri Sep 09 08:51:50 2016 -0400
@@ -2,15 +2,6 @@
           com.redhat.thermostat.storage.mongodb=${project.version}, \
           com.redhat.thermostat.web.common=${project.version}, \
           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}, \
-          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}, \
 
 summary = drop all data related to all of the specified agents
 
--- a/distribution/config/commands/connect.properties	Thu Sep 08 09:14:29 2016 -0400
+++ b/distribution/config/commands/connect.properties	Fri Sep 09 08:51:50 2016 -0400
@@ -3,15 +3,6 @@
           com.redhat.thermostat.web.common=${project.version}, \
           com.redhat.thermostat.web.client=${project.version}, \
           com.redhat.thermostat.storage.mongodb=${project.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.httpcomponents.httpcore=${httpcomponents.core.version}, \
-          org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
-          ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
-          com.google.gson=${gson.version}
 
 summary = persistently connect to storage
 
--- a/distribution/config/commands/gui.properties	Thu Sep 08 09:14:29 2016 -0400
+++ b/distribution/config/commands/gui.properties	Fri Sep 09 08:51:50 2016 -0400
@@ -1,10 +1,4 @@
 bundles = com.redhat.thermostat.storage.mongodb=${project.version}, \
-          org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
-          org.apache.commons.beanutils=${commons-beanutils.version}, \
-          org.apache.commons.collections=${commons-collections.version}, \
-          org.apache.commons.codec=${commons-codec.osgi-version}, \
-          org.apache.commons.logging=${commons-logging.version}, \
-          com.google.gson=${gson.version}, \
           com.redhat.thermostat.web.common=${project.version}, \
           com.redhat.thermostat.web.client=${project.version}, \
           com.redhat.thermostat.common.command=${project.version}, \
@@ -12,19 +6,9 @@
           com.redhat.thermostat.client.cli=${project.version}, \
           com.redhat.thermostat.client.swing=${project.version}, \
           com.redhat.thermostat.client.swing.components=${project.version}, \
-          com.redhat.thermostat.internal.utils.laf=${project.version}, \
-          com.redhat.thermostat.client.command=${project.version}, \
           com.redhat.thermostat.filter.livingvm.core=${project.version}, \
           com.redhat.thermostat.filter.livingvm.swing=${project.version}, \
           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}, \
-          io.netty.common=${netty.version}, \
-          io.netty.buffer=${netty.version}, \
-          io.netty.transport=${netty.version}, \
-          io.netty.handler=${netty.version}, \
-          io.netty.codec=${netty.version}
 
 summary = launch the GUI client
 
--- a/distribution/config/commands/list-agents.properties	Thu Sep 08 09:14:29 2016 -0400
+++ b/distribution/config/commands/list-agents.properties	Fri Sep 09 08:51:50 2016 -0400
@@ -2,15 +2,6 @@
           com.redhat.thermostat.storage.mongodb=${project.version}, \
           com.redhat.thermostat.web.common=${project.version}, \
           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}, \
-          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}, \
 
 
 summary = list all agents
--- a/distribution/config/commands/list-vms.properties	Thu Sep 08 09:14:29 2016 -0400
+++ b/distribution/config/commands/list-vms.properties	Fri Sep 09 08:51:50 2016 -0400
@@ -2,15 +2,7 @@
           com.redhat.thermostat.storage.mongodb=${project.version}, \
           com.redhat.thermostat.web.common=${project.version}, \
           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}, \
-          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}, \
+
 
 summary = list all known VMs
 
--- a/distribution/config/commands/ping.properties	Thu Sep 08 09:14:29 2016 -0400
+++ b/distribution/config/commands/ping.properties	Fri Sep 09 08:51:50 2016 -0400
@@ -1,22 +1,7 @@
-bundles = com.redhat.thermostat.common.command=${project.version}, \
-          com.redhat.thermostat.client.command=${project.version}, \
+bundles = com.redhat.thermostat.client.command=${project.version}, \
           com.redhat.thermostat.storage.mongodb=${project.version}, \
           com.redhat.thermostat.web.common=${project.version}, \
           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}, \
-          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}, \
-          io.netty.common=${netty.version}, \
-          io.netty.buffer=${netty.version}, \
-          io.netty.transport=${netty.version}, \
-          io.netty.handler=${netty.version}, \
-          io.netty.codec=${netty.version}
 
 summary = send a ping to a running agent
 
--- a/distribution/config/commands/service.properties	Thu Sep 08 09:14:29 2016 -0400
+++ b/distribution/config/commands/service.properties	Fri Sep 09 08:51:50 2016 -0400
@@ -1,38 +1,10 @@
-bundles = com.redhat.thermostat.agent.core=${project.version}, \
-          com.redhat.thermostat.storage.mongodb=${project.version}, \
-          org.mongodb.mongo-java-driver=${mongo-driver.osgi-version}, \
-          org.apache.commons.beanutils=${commons-beanutils.version}, \
-          org.apache.commons.collections=${commons-collections.version}, \
-          org.apache.commons.logging=${commons-logging.version}, \
-          org.apache.commons.codec=${commons-codec.osgi-version}, \
+bundles = com.redhat.thermostat.storage.mongodb=${project.version}, \
           com.redhat.thermostat.process=${project.version}, \
-          com.redhat.thermostat.common.command=${project.version}, \
           com.redhat.thermostat.agent.command=${project.version}, \
           com.redhat.thermostat.storage.cli=${project.version}, \
           com.redhat.thermostat.agent.cli=${project.version}, \
-          com.redhat.thermostat.agent.ipc.server=${project.version}, \
           com.redhat.thermostat.agent.ipc.unixsocket.server=${project.version}, \
-          com.redhat.thermostat.agent.ipc.common=${project.version}, \
-          com.redhat.thermostat.agent.ipc.unixsocket.common=${project.version}, \
-          ${jnr-unixsocket.bundle.symbolic.name}=${jnr-unixsocket.bundle.version}, \
-          ${jnr-enxio.bundle.symbolic.name}=${jnr-enxio.bundle.version}, \
-          ${jnr-constants.bundle.symbolic.name}=${jnr-constants.version}, \
-          ${jnr-posix.bundle.symbolic.name}=${jnr-posix.version}, \
-          ${jnr-ffi.bundle.symbolic.name}=${jnr-ffi.version}, \
-          ${jnr-x86asm.bundle.symbolic.name}=${jnr-x86asm.version}, \
-          ${jffi.bundle.symbolic.name}=${jffi.version}, \
           ${jffi-native.bundle.symbolic.name}=${jffi.version}, \
-          org.objectweb.asm=${asm.version}, \
-          org.objectweb.asm.commons=${asm.version}, \
-          org.objectweb.asm.util=${asm.version}, \
-          org.objectweb.asm.analysis=${asm.version}, \
-          org.objectweb.asm.tree=${asm.version}, \
-          com.google.gson=${gson.version}, \
-          io.netty.common=${netty.version}, \
-          io.netty.buffer=${netty.version}, \
-          io.netty.transport=${netty.version}, \
-          io.netty.handler=${netty.version}, \
-          io.netty.codec=${netty.version}
 
 summary = run the thermostat storage and agent
 
--- a/distribution/config/commands/storage.properties	Thu Sep 08 09:14:29 2016 -0400
+++ b/distribution/config/commands/storage.properties	Fri Sep 09 08:51:50 2016 -0400
@@ -1,12 +1,5 @@
 bundles = com.redhat.thermostat.process=${project.version}, \
-          com.redhat.thermostat.common.command=${project.version}, \
           com.redhat.thermostat.storage.cli=${project.version}, \
-          org.apache.commons.codec=${commons-codec.osgi-version}, \
-          io.netty.common=${netty.version}, \
-          io.netty.buffer=${netty.version}, \
-          io.netty.transport=${netty.version}, \
-          io.netty.handler=${netty.version}, \
-          io.netty.codec=${netty.version}
 
 summary = control or view the status of the thermostat storage
 
--- a/distribution/config/commands/vm-info.properties	Thu Sep 08 09:14:29 2016 -0400
+++ b/distribution/config/commands/vm-info.properties	Fri Sep 09 08:51:50 2016 -0400
@@ -2,15 +2,6 @@
           com.redhat.thermostat.storage.mongodb=${project.version}, \
           com.redhat.thermostat.web.common=${project.version}, \
           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}, \
-          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}
 
 summary = show basic information about a VM
 
--- a/distribution/config/commands/vm-stat.properties	Thu Sep 08 09:14:29 2016 -0400
+++ b/distribution/config/commands/vm-stat.properties	Fri Sep 09 08:51:50 2016 -0400
@@ -2,16 +2,6 @@
           com.redhat.thermostat.storage.mongodb=${project.version}, \
           com.redhat.thermostat.web.common=${project.version}, \
           com.redhat.thermostat.web.client=${project.version}, \
-          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}, \
-          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}
 
 summary = show various statistics about a VM
 
--- a/distribution/packaging/fedora/0001_shared_fix_bundle_loading.patch	Thu Sep 08 09:14:29 2016 -0400
+++ b/distribution/packaging/fedora/0001_shared_fix_bundle_loading.patch	Fri Sep 09 08:51:50 2016 -0400
@@ -10,144 +10,6 @@
          <bundle><symbolic-name>com.google.gson</symbolic-name><version>${symbol_dollar}{gson.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,12 +19,15 @@
-           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}, \
-           io.netty.common=${netty.version}, \
-           io.netty.buffer=${netty.version}, \
-           io.netty.transport=${netty.version}, \
-           io.netty.handler=${netty.version}, \
--          io.netty.codec=${netty.version}
-+          io.netty.codec=${netty.version}, \
-+          org.apache.httpcomponents.httpmime=${httpcomponents.mime.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/main/src/main/resources/com/redhat/thermostat/main/internal/bootstrapbundles.properties b/main/src/main/resources/com/redhat/thermostat/main/internal/bootstrapbundles.properties
 --- a/main/src/main/resources/com/redhat/thermostat/main/internal/bootstrapbundles.properties
 +++ b/main/src/main/resources/com/redhat/thermostat/main/internal/bootstrapbundles.properties