[thermostat] Initial 1.2 build.
jerboaa
jerboaa at fedoraproject.org
Wed Jan 21 17:08:23 UTC 2015
commit 0918fb2df4afccca61f3db84a465b8664c9fc55d
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date: Wed Jan 21 18:03:46 2015 +0100
Initial 1.2 build.
.gitignore | 6 +-
fix_bundle_loading.patch | 71 +++++++---
fix_loglevel.patch | 18 ---
osgi_spec_fixes.patch | 321 ++++++++++++++++++++++++++++++++++--------
sources | 2 +-
thermostat.spec | 99 +++++++------
update-to-lucene-4.7.0.patch | 35 -----
7 files changed, 363 insertions(+), 189 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index de32f1f..2ec3c53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,3 @@
-/thermostat-0.9.2.tar.gz
-/thermostat-0.15.0.tar.gz
-/thermostat-1.0-b7c6db90e034.tar.bz2
-/thermostat-1.0.0.tar.gz
-/thermostat-1.0.2.tar.gz
/thermostat-1.0.4.tar.gz
/thermostat-1.0.6.tar.gz
+/thermostat-1.2.0.tar.gz
diff --git a/fix_bundle_loading.patch b/fix_bundle_loading.patch
index c790c89..411b3a8 100644
--- a/fix_bundle_loading.patch
+++ b/fix_bundle_loading.patch
@@ -1,42 +1,46 @@
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,6 +3,7 @@
+@@ -3,7 +3,8 @@
com.redhat.thermostat.web.client=${project.version}, \
org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.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}, \
--- a/distribution/config/commands/clean-data.properties
+++ b/distribution/config/commands/clean-data.properties
-@@ -4,6 +4,7 @@
+@@ -4,7 +4,8 @@
com.redhat.thermostat.web.client=${project.version}, \
org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.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}, \
--- a/distribution/config/commands/connect.properties
+++ b/distribution/config/commands/connect.properties
-@@ -10,6 +10,7 @@
+@@ -10,7 +10,8 @@
org.apache.commons.logging=${commons-logging.version}, \
org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
+ ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
com.google.gson=${gson.version}
description = persistently connect to storage
--- a/distribution/config/commands/gui.properties
+++ b/distribution/config/commands/gui.properties
-@@ -20,7 +20,10 @@
+@@ -20,8 +20,11 @@
com.redhat.thermostat.process=${project.version}, \
org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
-- org.jboss.netty=${netty.version}
+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.version}, \
+ ${osgi.compendium.bundle.symbolic-name}=${osgi.compendium.osgi-version}, \
+- org.jboss.netty=${netty.version}
+ org.jboss.netty=${netty.version}, \
+ org.jfree.jcommon=${jcommon.osgi.version} , \
+ org.jfree.jfreechart=${jfreechart.osgi.version}
@@ -45,41 +49,46 @@ diff --git a/distribution/config/commands/agent.properties b/distribution/config
--- a/distribution/config/commands/list-vms.properties
+++ b/distribution/config/commands/list-vms.properties
-@@ -4,6 +4,7 @@
+@@ -4,7 +4,8 @@
com.redhat.thermostat.web.client=${project.version}, \
org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.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}, \
--- a/distribution/config/commands/ping.properties
+++ b/distribution/config/commands/ping.properties
-@@ -5,6 +5,7 @@
+@@ -5,7 +5,8 @@
com.redhat.thermostat.web.client=${project.version}, \
org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.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}, \
--- a/distribution/config/commands/vm-info.properties
+++ b/distribution/config/commands/vm-info.properties
-@@ -4,6 +4,7 @@
+@@ -4,7 +4,8 @@
com.redhat.thermostat.web.client=${project.version}, \
org.apache.httpcomponents.httpcore=${httpcomponents.core.version}, \
org.apache.httpcomponents.httpclient=${httpcomponents.client.version}, \
+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.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}, \
--- a/distribution/config/commands/vm-stat.properties
+++ b/distribution/config/commands/vm-stat.properties
-@@ -4,6 +4,7 @@
+@@ -4,8 +4,9 @@
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}, \
+ org.apache.httpcomponents.httpmime=${httpcomponents.mime.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}, \
@@ -133,18 +142,17 @@ diff --git a/distribution/config/commands/agent.properties b/distribution/config
-# FIXME: Remove once jfreechart is a real OSGi bundle upstream
-SERVICE_CLASSPATH="${SERVICE_CLASSPATH}:${THERMOSTAT_LIBS}/jfreechart- at jfreechart.version@.jar"
-SERVICE_CLASSPATH="${SERVICE_CLASSPATH}:${THERMOSTAT_LIBS}/jcommon- at jcommon.version@.jar"
+ # Needed to parse web.xml files without network connection See PR 2029.
+ SERVICE_CLASSPATH="${SERVICE_CLASSPATH}:${THERMOSTAT_HOME}/plugins/embedded-web-endpoint/jetty-schemas- at jetty-schemas.version@.jar"
SERVICE_CLASSPATH="${TOOLS_JAR}:${SERVICE_CLASSPATH}"
-
- THERMOSTAT_MAIN="com.redhat.thermostat.main.Thermostat"
--- a/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties
+++ b/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties
-@@ -4,6 +4,8 @@
+@@ -4,5 +4,8 @@
thermostat-common-core-${project.version}.jar, \
thermostat-plugin-validator-${project.version}.jar, \
thermostat-launcher-${project.version}.jar, \
- jline-${jline.version}.jar, \
-- commons-cli-${commons-cli.version}.jar, \
-- org.apache.servicemix.bundles.lucene-${lucene.version}.jar
+- commons-cli-${commons-cli.version}.jar
+ jline2.jar, \
+ jansi.jar, \
+ commons-cli.jar, \
@@ -152,87 +160,108 @@ diff --git a/distribution/config/commands/agent.properties b/distribution/config
+ lucene-analyzers.jar
--- a/vm-heap-analysis/distribution/thermostat-plugin.xml
+++ b/vm-heap-analysis/distribution/thermostat-plugin.xml
-@@ -86,8 +86,11 @@
+@@ -86,11 +86,14 @@
<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>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.mime.version}</version></bundle>
+ <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-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>org.apache.servicemix.bundles.lucene</symbolic-name><version>${lucene.osgi-version}</version></bundle>
+ <bundle><symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</symbolic-name><version>${lucene.osgi-version}</version></bundle>
</bundles>
</command>
<command>
-@@ -139,8 +142,11 @@
+@@ -139,11 +142,14 @@
<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>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.mime.version}</version></bundle>
+ <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-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>org.apache.servicemix.bundles.lucene</symbolic-name><version>${lucene.osgi-version}</version></bundle>
+ <bundle><symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</symbolic-name><version>${lucene.osgi-version}</version></bundle>
</bundles>
</command>
<command>
-@@ -195,8 +201,11 @@
+@@ -195,11 +201,14 @@
<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>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.mime.version}</version></bundle>
+ <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-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>org.apache.servicemix.bundles.lucene</symbolic-name><version>${lucene.osgi-version}</version></bundle>
+ <bundle><symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</symbolic-name><version>${lucene.osgi-version}</version></bundle>
</bundles>
</command>
<command>
-@@ -245,8 +254,11 @@
+@@ -245,11 +254,14 @@
<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>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.mime.version}</version></bundle>
+ <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-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>org.apache.servicemix.bundles.lucene</symbolic-name><version>${lucene.osgi-version}</version></bundle>
+ <bundle><symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</symbolic-name><version>${lucene.osgi-version}</version></bundle>
</bundles>
</command>
<command>
-@@ -295,8 +307,11 @@
+@@ -295,11 +307,14 @@
<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>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.mime.version}</version></bundle>
+ <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-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>org.apache.servicemix.bundles.lucene</symbolic-name><version>${lucene.osgi-version}</version></bundle>
+ <bundle><symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</symbolic-name><version>${lucene.osgi-version}</version></bundle>
</bundles>
</command>
<command>
-@@ -345,8 +360,11 @@
+@@ -345,11 +360,14 @@
<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>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.mime.version}</version></bundle>
+ <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-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>org.apache.servicemix.bundles.lucene</symbolic-name><version>${lucene.osgi-version}</version></bundle>
+ <bundle><symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</symbolic-name><version>${lucene.osgi-version}</version></bundle>
</bundles>
</command>
<command>
-@@ -388,8 +406,11 @@
+@@ -388,11 +406,14 @@
<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>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.mime.version}</version></bundle>
+ <bundle><symbolic-name>${osgi.compendium.bundle.symbolic-name}</symbolic-name><version>${osgi.compendium.osgi-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>org.apache.servicemix.bundles.lucene</symbolic-name><version>${lucene.osgi-version}</version></bundle>
+ <bundle><symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</symbolic-name><version>${lucene.osgi-version}</version></bundle>
</bundles>
</command>
</commands>
diff --git a/osgi_spec_fixes.patch b/osgi_spec_fixes.patch
index af73c7c..e85a915 100644
--- a/osgi_spec_fixes.patch
+++ b/osgi_spec_fixes.patch
@@ -29,8 +29,8 @@ diff --git a/agent/command/pom.xml b/agent/command/pom.xml
diff --git a/agent/core/pom.xml b/agent/core/pom.xml
--- a/agent/core/pom.xml
+++ b/agent/core/pom.xml
-@@ -100,8 +100,8 @@
- <scope>test</scope>
+@@ -88,8 +88,8 @@
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
@@ -98,7 +98,7 @@ diff --git a/client/core/pom.xml b/client/core/pom.xml
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
-@@ -53,15 +53,8 @@
+@@ -90,15 +90,8 @@
</dependency>
<dependency>
@@ -119,7 +119,7 @@ diff --git a/client/living-vm-filter/core/pom.xml b/client/living-vm-filter/core
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
-@@ -55,15 +55,8 @@
+@@ -92,15 +92,8 @@
</dependency>
<dependency>
@@ -160,7 +160,7 @@ diff --git a/client/swing/pom.xml b/client/swing/pom.xml
diff --git a/common/core/pom.xml b/common/core/pom.xml
--- a/common/core/pom.xml
+++ b/common/core/pom.xml
-@@ -145,14 +145,8 @@
+@@ -147,14 +147,8 @@
</dependency>
<dependency>
@@ -180,7 +180,7 @@ diff --git a/common/core/pom.xml b/common/core/pom.xml
diff --git a/config/pom.xml b/config/pom.xml
--- a/config/pom.xml
+++ b/config/pom.xml
-@@ -46,14 +46,8 @@
+@@ -91,14 +91,8 @@
</dependency>
<dependency>
@@ -200,7 +200,7 @@ diff --git a/config/pom.xml b/config/pom.xml
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
-@@ -43,14 +43,8 @@
+@@ -80,14 +80,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -220,7 +220,7 @@ diff --git a/host-cpu/agent/pom.xml b/host-cpu/agent/pom.xml
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
-@@ -62,14 +62,8 @@
+@@ -99,14 +99,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -240,7 +240,7 @@ diff --git a/host-cpu/client-core/pom.xml b/host-cpu/client-core/pom.xml
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
-@@ -50,14 +50,8 @@
+@@ -87,14 +87,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -260,7 +260,7 @@ diff --git a/host-cpu/client-swing/pom.xml b/host-cpu/client-swing/pom.xml
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
-@@ -62,14 +62,8 @@
+@@ -99,14 +99,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -280,7 +280,7 @@ diff --git a/host-cpu/common/pom.xml b/host-cpu/common/pom.xml
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
-@@ -43,14 +43,8 @@
+@@ -80,14 +80,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -300,7 +300,7 @@ diff --git a/host-memory/agent/pom.xml b/host-memory/agent/pom.xml
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
-@@ -62,14 +62,8 @@
+@@ -99,14 +99,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -320,7 +320,7 @@ diff --git a/host-memory/client-core/pom.xml b/host-memory/client-core/pom.xml
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
-@@ -50,14 +50,8 @@
+@@ -87,14 +87,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -340,7 +340,7 @@ diff --git a/host-memory/client-swing/pom.xml b/host-memory/client-swing/pom.xml
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
-@@ -62,14 +62,8 @@
+@@ -99,14 +99,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -360,7 +360,7 @@ diff --git a/host-memory/common/pom.xml b/host-memory/common/pom.xml
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
-@@ -62,14 +62,8 @@
+@@ -99,14 +99,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -380,7 +380,7 @@ diff --git a/host-overview/client-core/pom.xml b/host-overview/client-core/pom.x
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
-@@ -50,14 +50,8 @@
+@@ -87,14 +87,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -400,7 +400,7 @@ diff --git a/host-overview/client-swing/pom.xml b/host-overview/client-swing/pom
diff --git a/keyring/pom.xml b/keyring/pom.xml
--- a/keyring/pom.xml
+++ b/keyring/pom.xml
-@@ -109,14 +109,8 @@
+@@ -146,14 +146,8 @@
</dependency>
<dependency>
@@ -434,7 +434,7 @@ diff --git a/killvm/agent/pom.xml b/killvm/agent/pom.xml
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
-@@ -63,14 +63,8 @@
+@@ -100,14 +100,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -451,10 +451,37 @@ diff --git a/killvm/client-swing/pom.xml b/killvm/client-swing/pom.xml
</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,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>org.apache.felix</groupId>
+@@ -120,4 +114,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
-@@ -100,14 +100,8 @@
+@@ -137,14 +137,8 @@
</dependency>
<dependency>
@@ -471,10 +498,50 @@ diff --git a/laf-utils/pom.xml b/laf-utils/pom.xml
</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
-@@ -43,9 +43,8 @@
+@@ -80,9 +80,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -489,7 +556,7 @@ diff --git a/numa/agent/pom.xml b/numa/agent/pom.xml
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
-@@ -46,14 +46,8 @@
+@@ -83,14 +83,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -509,7 +576,7 @@ diff --git a/numa/client-core/pom.xml b/numa/client-core/pom.xml
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
-@@ -50,14 +50,8 @@
+@@ -87,14 +87,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -529,7 +596,7 @@ diff --git a/numa/client-swing/pom.xml b/numa/client-swing/pom.xml
diff --git a/numa/common/pom.xml b/numa/common/pom.xml
--- a/numa/common/pom.xml
+++ b/numa/common/pom.xml
-@@ -45,14 +45,8 @@
+@@ -82,14 +82,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -549,9 +616,9 @@ diff --git a/numa/common/pom.xml b/numa/common/pom.xml
diff --git a/pom.xml b/pom.xml
--- a/pom.xml
+++ b/pom.xml
-@@ -188,11 +188,22 @@
- <jline.version>2.9</jline.version>
- <lucene.version>3.6.0_1</lucene.version>
+@@ -241,13 +241,22 @@
+ <lucene.version>4.7.0_1</lucene.version>
+ <lucene.osgi-version>4.7.0.1</lucene.osgi-version>
<!--
- felix 4.0 is compliant with osgi 4.3
- for osgi clients, 4.3 is backwards compatible with 4.2
@@ -573,10 +640,12 @@ diff --git a/pom.xml b/pom.xml
-->
- <osgi.core.version>4.3.1</osgi.core.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>
-@@ -431,16 +442,6 @@
+@@ -632,16 +641,6 @@
</dependency>
<dependency>
@@ -610,9 +679,9 @@ diff --git a/storage/cli/pom.xml b/storage/cli/pom.xml
diff --git a/system-backend/pom.xml b/system-backend/pom.xml
--- a/system-backend/pom.xml
+++ b/system-backend/pom.xml
-@@ -94,14 +94,8 @@
+@@ -87,14 +87,8 @@
</dependency>
-
+
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
@@ -690,9 +759,9 @@ diff --git a/thread/client-swing/pom.xml b/thread/client-swing/pom.xml
diff --git a/thread/collector/pom.xml b/thread/collector/pom.xml
--- a/thread/collector/pom.xml
+++ b/thread/collector/pom.xml
-@@ -78,14 +78,8 @@
+@@ -85,14 +85,8 @@
</dependency>
-
+
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
@@ -730,7 +799,7 @@ diff --git a/thread/harvester/pom.xml b/thread/harvester/pom.xml
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
-@@ -40,14 +40,8 @@
+@@ -77,14 +77,8 @@
</dependency>
<dependency>
@@ -750,7 +819,7 @@ diff --git a/unix-process-handler/pom.xml b/unix-process-handler/pom.xml
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
-@@ -43,14 +43,8 @@
+@@ -80,14 +80,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -770,7 +839,7 @@ diff --git a/vm-classstat/agent/pom.xml b/vm-classstat/agent/pom.xml
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
-@@ -62,14 +62,8 @@
+@@ -99,14 +99,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -790,7 +859,7 @@ diff --git a/vm-classstat/client-core/pom.xml b/vm-classstat/client-core/pom.xml
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
-@@ -50,14 +50,8 @@
+@@ -87,14 +87,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -810,7 +879,7 @@ diff --git a/vm-classstat/client-swing/pom.xml b/vm-classstat/client-swing/pom.x
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
-@@ -62,14 +62,8 @@
+@@ -99,14 +99,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -830,7 +899,7 @@ diff --git a/vm-classstat/common/pom.xml b/vm-classstat/common/pom.xml
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
-@@ -43,14 +43,8 @@
+@@ -80,14 +80,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -850,7 +919,7 @@ diff --git a/vm-cpu/agent/pom.xml b/vm-cpu/agent/pom.xml
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
-@@ -43,14 +43,8 @@
+@@ -80,14 +80,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -870,7 +939,7 @@ diff --git a/vm-cpu/client-cli/pom.xml b/vm-cpu/client-cli/pom.xml
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
-@@ -62,14 +62,8 @@
+@@ -99,14 +99,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -890,7 +959,7 @@ diff --git a/vm-cpu/client-core/pom.xml b/vm-cpu/client-core/pom.xml
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
-@@ -50,14 +50,8 @@
+@@ -87,14 +87,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -910,7 +979,7 @@ diff --git a/vm-cpu/client-swing/pom.xml b/vm-cpu/client-swing/pom.xml
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
-@@ -62,14 +62,8 @@
+@@ -99,14 +99,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -930,7 +999,7 @@ diff --git a/vm-cpu/common/pom.xml b/vm-cpu/common/pom.xml
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
-@@ -43,14 +43,8 @@
+@@ -80,14 +80,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -950,7 +1019,7 @@ diff --git a/vm-gc/agent/pom.xml b/vm-gc/agent/pom.xml
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
-@@ -62,14 +62,8 @@
+@@ -99,14 +99,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -970,7 +1039,7 @@ diff --git a/vm-gc/client-core/pom.xml b/vm-gc/client-core/pom.xml
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
-@@ -50,14 +50,8 @@
+@@ -87,14 +87,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -987,10 +1056,32 @@ diff --git a/vm-gc/client-swing/pom.xml b/vm-gc/client-swing/pom.xml
</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
-@@ -62,14 +62,8 @@
+@@ -99,14 +99,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -1190,7 +1281,7 @@ diff --git a/vm-heap-analysis/common/pom.xml b/vm-heap-analysis/common/pom.xml
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
-@@ -49,14 +49,8 @@
+@@ -86,14 +86,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -1210,7 +1301,7 @@ diff --git a/vm-jmx/agent/pom.xml b/vm-jmx/agent/pom.xml
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
-@@ -51,14 +51,8 @@
+@@ -88,14 +88,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -1230,7 +1321,7 @@ diff --git a/vm-jmx/client-core/pom.xml b/vm-jmx/client-core/pom.xml
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
-@@ -59,14 +59,8 @@
+@@ -96,14 +96,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -1250,7 +1341,7 @@ diff --git a/vm-jmx/client-swing/pom.xml b/vm-jmx/client-swing/pom.xml
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
-@@ -51,14 +51,8 @@
+@@ -88,14 +88,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -1270,7 +1361,7 @@ diff --git a/vm-jmx/common/pom.xml b/vm-jmx/common/pom.xml
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
-@@ -43,14 +43,8 @@
+@@ -80,14 +80,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -1290,7 +1381,7 @@ diff --git a/vm-memory/agent/pom.xml b/vm-memory/agent/pom.xml
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
-@@ -43,14 +43,8 @@
+@@ -80,14 +80,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -1310,7 +1401,7 @@ diff --git a/vm-memory/client-cli/pom.xml b/vm-memory/client-cli/pom.xml
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
-@@ -47,14 +47,8 @@
+@@ -84,14 +84,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -1330,7 +1421,7 @@ diff --git a/vm-memory/client-core/pom.xml b/vm-memory/client-core/pom.xml
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
-@@ -53,14 +53,8 @@
+@@ -90,14 +90,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -1350,7 +1441,7 @@ diff --git a/vm-memory/client-swing/pom.xml b/vm-memory/client-swing/pom.xml
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
-@@ -62,14 +62,8 @@
+@@ -99,14 +99,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -1370,7 +1461,7 @@ diff --git a/vm-memory/common/pom.xml b/vm-memory/common/pom.xml
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
-@@ -46,14 +46,8 @@
+@@ -83,14 +83,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -1390,7 +1481,7 @@ diff --git a/vm-overview/client-core/pom.xml b/vm-overview/client-core/pom.xml
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
-@@ -50,14 +50,8 @@
+@@ -87,14 +87,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -1407,12 +1498,12 @@ diff --git a/vm-overview/client-swing/pom.xml b/vm-overview/client-swing/pom.xml
</dependency>
<dependency>
<groupId>org.jfree</groupId>
-diff --git a/web/client/pom.xml b/web/client/pom.xml
---- a/web/client/pom.xml
-+++ b/web/client/pom.xml
-@@ -64,14 +64,8 @@
+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>
@@ -1425,12 +1516,118 @@ diff --git a/web/client/pom.xml b/web/client/pom.xml
+ <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
+@@ -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-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
+@@ -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/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/server/pom.xml b/web/server/pom.xml
--- a/web/server/pom.xml
+++ b/web/server/pom.xml
-@@ -127,9 +127,8 @@
+@@ -131,9 +131,8 @@
</dependency>
<dependency>
diff --git a/sources b/sources
index c439959..c6ba00f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd30ec85d76df3140dc0957820f50a6f thermostat-1.0.6.tar.gz
+3ec19de4f0bbbf04d47a3f7dd0551d34 thermostat-1.2.0.tar.gz
diff --git a/thermostat.spec b/thermostat.spec
index 2f791d8..61c70cf 100644
--- a/thermostat.spec
+++ b/thermostat.spec
@@ -1,7 +1,7 @@
# Thermostat version
%global major 1
-%global minor 0
-%global patchlevel 6
+%global minor 2
+%global patchlevel 0
# 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.
@@ -20,8 +20,8 @@
%global logging_bundle_version 1.2.0
# Real OSGi Bundle-Version is 2.11.3.RELEASE
%global mongo_bundle_version 2.11.3
-%global hc_core_bundle_version 4.3.2
-%global hc_client_bundle_version 4.3.5
+%global hc_core_bundle_version 4.4.0
+%global hc_client_bundle_version 4.4.0
%global gson_bundle_version 2.2.4
# Flag set to 1 if it's an SCL build. 0 otherwise.
@@ -74,7 +74,7 @@
%global thermostat_catalina_port 8999
# Uncomment to build from snapshot out of hg. See also Release and Source0
-#%global hgrev b7c6db90e034
+#%%global hgrev b7c6db90e034
Name: %{?scl_prefix}thermostat
Version: %{major}.%{minor}.%{patchlevel}
@@ -110,21 +110,13 @@ Patch0: fix_bundle_loading.patch
# is 4.3 OSGi spec.
Patch1: osgi_spec_fixes.patch
# This is _NOT_ suitable for upstream at this point.
-# Sets the default log level to something reasonable (if during release procedure
-# it was forgotten to set it). Not upstream-able.
-Patch2: fix_loglevel.patch
-# This is _NOT_ suitable for upstream at this point.
# Adds an CLI option to the Thermostat main class so that it ignores
# bundle symbolic names and versions it has in the config files.
# The config files are set in stone at build time and updates of
# transitive deps (which we can't control) might break thermostat.
# We rely on RPM's dep solving mechanism instead.
# See: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1591
-Patch3: ignore_bundle_versions.patch
-# FIXME: Remove once equivalent upstream patch has been pushed.
-# See: http://icedtea.classpath.org/pipermail/thermostat/2014-March/009327.html
-# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1694
-Patch4: update-to-lucene-4.7.0.patch
+Patch2: ignore_bundle_versions.patch
# BRs for core thermostat
BuildRequires: java-devel >= 1:1.8.0
@@ -262,21 +254,21 @@ security.
# When Source0 is released version.
%setup -q -n %{pkg_name}-%{version}
# When Source0 is a snapshot from HEAD.
-#%setup -q -n %{pkg_name}-%{hgrev}
+#%%setup -q -n %%{pkg_name}-%%{hgrev}
# When Source 0 is a snapshot from a release branch.
-#%setup -q -n %{pkg_name}-%{major}-%{minor}-%{hgrev}
+#%%setup -q -n %%{pkg_name}-%%{major}-%%{minor}-%%{hgrev}
%patch0 -p1
%patch1 -p1
-# Log level set appropriately in current release
-#%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch2 -p1
# Fix up artifact names which have different name upstream
# lucene
-%pom_remove_dep "org.apache.servicemix.bundles:org.apache.servicemix.bundles.lucene" common/core
-%pom_add_dep "org.apache.lucene:lucene-analyzers:4.7.0" common/core
-%pom_add_dep "org.apache.lucene:lucene-core:4.7.0" common/core
+%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:4.7.0" vm-heap-analysis/common
+%pom_add_dep "org.apache.lucene:lucene-core:4.7.0" vm-heap-analysis/common
# httpclient
%pom_remove_dep org.apache.httpcomponents:httpclient-osgi web/client
%pom_add_dep org.apache.httpcomponents:httpclient:4.1.2 web/client
@@ -291,7 +283,7 @@ security.
%pom_xpath_remove "pom:properties/pom:jline.version"
%pom_xpath_inject "pom:properties" "<jline.version>2.10</jline.version>"
# netty
-#%pom_remove_dep org.jboss.netty:netty
+#%%pom_remove_dep org.jboss.netty:netty
%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
@@ -305,7 +297,10 @@ security.
%pom_remove_plugin org.codehaus.mojo:exec-maven-plugin keyring
%pom_remove_plugin org.codehaus.mojo:exec-maven-plugin laf-utils
-# Remove jacoco-coverage plugin (in main pom.xml and web/war/pom.xml)
+# 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
@@ -317,11 +312,19 @@ security.
# Disable dev and integation-tests modules
%pom_disable_module dev
+%pom_disable_module testutils storage
%pom_disable_module integration-tests
+%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
+
# Part of the disable webservice patch can be done with pom macros
-%pom_remove_dep org.eclipse.jetty:jetty-server distribution
-%pom_remove_dep org.eclipse.jetty:jetty-webapp distribution
+# FIXME i have no idea what i am doing!
+#%pom_remove_dep org.eclipse.jetty:jetty-server distribution
+#%pom_remove_dep org.eclipse.jetty:jetty-webapp distribution
+%pom_disable_module endpoint-plugin web
+%pom_remove_dep com.redhat.thermostat:thermostat-web-endpoint-distribution build-deps
# Remove system scope and systemPath for com.sun:tools dependencies.
# xmvn complains about those at install time.
@@ -442,11 +445,6 @@ rm -rf %{buildroot}/%{_datarootdir}/java/%{?scl_prefix}%{pkg_name}
-Djcommon.osgi.version=%{jcommon_bundle_version} \
-Djfreechart.osgi.version=%{jfreechart_bundle_version}
-# the build puts all depdency jars into distribution/target/image/lib as well
-mv distribution/target/image/libs/thermostat-*jar .
-rm -f distribution/target/image/libs/*jar
-mv thermostat-*jar distribution/target/image/libs/
-
# Make path to java so that it keeps working after updates.
# We require java >= 1.7.0
sed -i 's|^JAVA=.*|JAVA="%{jdk_base}/bin/java"|' distribution/target/image/bin/thermostat
@@ -482,7 +480,7 @@ mv distribution/symlink-map-filenames-filtered distribution/symlink-map-filename
pushd webstorage-webapp
rm -rf WEB-INF/lib/*
popd
-mv distribution/target/image/libs/thermostat-web-server*.jar webstorage-webapp/WEB-INF/lib
+mv distribution/target/image/webapp/WEB-INF/lib/thermostat-web-server*.jar webstorage-webapp/WEB-INF/lib
%install
#######################################################
@@ -569,21 +567,25 @@ ln -s $(build-classpath hawtjni/hawtjni-runtime.jar) %{buildroot}%{thermostat_ho
# need to be symlinked from $THERMOSTAT_HOME/{libs,plugins/<plugin-name>/}
# The following list is that set and will get started by the OSGi framework as
# bundles in an OSGi sense.
-ln -s %{system_javadir}/httpcomponents/httpcore.jar %{buildroot}%{thermostat_home}/libs/httpcomponents-core.jar
-ln -s %{system_javadir}/httpcomponents/httpclient.jar %{buildroot}%{thermostat_home}/libs/httpcomponents-client.jar
-ln -s %{system_javadir}/apache-commons-cli.jar %{buildroot}%{thermostat_home}/libs/commons-cli.jar
-ln -s %{system_javadir}/apache-commons-collections.jar %{buildroot}%{thermostat_home}/libs/commons-collections.jar
-ln -s %{system_javadir}/apache-commons-beanutils.jar %{buildroot}%{thermostat_home}/libs/commons-beanutils.jar
-ln -s %{system_javadir}/apache-commons-logging.jar %{buildroot}%{thermostat_home}/libs/commons-logging.jar
-ln -s %{system_javadir}/netty3-3.6.6.jar %{buildroot}%{thermostat_home}/libs/netty.jar
-ln -s %{system_javadir}/mongo-java-driver.jar %{buildroot}%{thermostat_home}/libs/mongo-java-driver.jar
+# TODO can we use xmvn-subst
+pushd %{buildroot}%{thermostat_home}/libs
+xmvn-subst .
+popd
+#ln -s %{system_javadir}/httpcomponents/httpcore.jar %{buildroot}%{thermostat_home}/libs/httpcomponents-core.jar
+#ln -s %{system_javadir}/httpcomponents/httpclient.jar %{buildroot}%{thermostat_home}/libs/httpcomponents-client.jar
+#ln -s %{system_javadir}/apache-commons-cli.jar %{buildroot}%{thermostat_home}/libs/commons-cli.jar
+#ln -s %{system_javadir}/apache-commons-collections.jar %{buildroot}%{thermostat_home}/libs/commons-collections.jar
+#ln -s %{system_javadir}/apache-commons-beanutils.jar %{buildroot}%{thermostat_home}/libs/commons-beanutils.jar
+#ln -s %{system_javadir}/apache-commons-logging.jar %{buildroot}%{thermostat_home}/libs/commons-logging.jar
+#ln -s %{system_javadir}/netty3-3.6.6.jar %{buildroot}%{thermostat_home}/libs/netty.jar
+#ln -s %{system_javadir}/mongo-java-driver.jar %{buildroot}%{thermostat_home}/libs/mongo-java-driver.jar
# The following deps are packaged as part of the thermostat-scl
-ln -s %{scl_javadir}/jfreechart/jfreechart.jar %{buildroot}%{thermostat_home}/libs/jfreechart.jar
-ln -s %{scl_javadir}/jcommon/jcommon.jar %{buildroot}%{thermostat_home}/libs/jcommon.jar
-ln -s %{scl_javadir}/jline/jline.jar %{buildroot}%{thermostat_home}/libs/jline2.jar
-ln -s %{scl_javadir}/lucene/lucene-core.jar %{buildroot}%{thermostat_home}/libs/lucene.jar
-ln -s %{scl_javadir}/lucene/lucene-analyzers-common.jar %{buildroot}%{thermostat_home}/libs/lucene-analyzers.jar
-ln -s %{scl_javadir}/google-gson/gson.jar %{buildroot}%{thermostat_home}/libs/gson.jar
+#ln -s %{scl_javadir}/jfreechart/jfreechart.jar %{buildroot}%{thermostat_home}/libs/jfreechart.jar
+#ln -s %{scl_javadir}/jcommon/jcommon.jar %{buildroot}%{thermostat_home}/libs/jcommon.jar
+#ln -s %{scl_javadir}/jline/jline.jar %{buildroot}%{thermostat_home}/libs/jline2.jar
+#ln -s %{scl_javadir}/lucene/lucene-core.jar %{buildroot}%{thermostat_home}/libs/lucene.jar
+#ln -s %{scl_javadir}/lucene/lucene-analyzers-common.jar %{buildroot}%{thermostat_home}/libs/lucene-analyzers.jar
+#ln -s %{scl_javadir}/google-gson/gson.jar %{buildroot}%{thermostat_home}/libs/gson.jar
# The following are additional Fedora specific symlinks for transitive deps
# see fix_bundle_loading.patch
# some of them have their deps embedded upstream (or whatever is available in the maven repos)
@@ -834,6 +836,9 @@ end
%config(noreplace) %{system_confdir}/sysconfig/tomcat@%{pkg_name}
%changelog
+* Wed Jan 21 2015 Severin Gehwolf <sgehwolf at redhat.com> - 1.2.0-1
+- Initial 1.2 build (contributed by Omair Majid <omajid at redhat.com>).
+
* Thu Dec 18 2014 Elliott Baron <ebaron at redhat.com> - 1.0.6-1
- Update to latest maintenance release.
- Update apache-commons-codec to v1.10.0.
More information about the scm-commits
mailing list