[thermostat/f22] Update to upstream 1.2.2 release.
jerboaa
jerboaa at fedoraproject.org
Mon Mar 16 14:46:43 UTC 2015
commit ce992c537051376c338b15f92f2e47ecf4e887ca
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date: Mon Mar 16 15:44:01 2015 +0100
Update to upstream 1.2.2 release.
Resolves RHBZ#1201577.
fix_assembly_filtering.patch | 25 ---------
fix_bundle_loading.patch | 116 ++++++++++++++++++++---------------------
fix_lucene_symbolic_name.patch | 114 ----------------------------------------
osgi_spec_fixes.patch | 22 ++++----
sources | 2 +-
thermostat.spec | 17 +++---
6 files changed, 78 insertions(+), 218 deletions(-)
---
diff --git a/fix_bundle_loading.patch b/fix_bundle_loading.patch
index c5425e5..941045c 100644
--- a/fix_bundle_loading.patch
+++ b/fix_bundle_loading.patch
@@ -146,10 +146,21 @@ diff --git a/distribution/scripts/thermostat b/distribution/scripts/thermostat
# 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}"
+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
+@@ -80,6 +80,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>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>
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
-@@ -4,5 +4,8 @@
+@@ -4,5 +4,6 @@
thermostat-common-core-${project.version}.jar, \
thermostat-plugin-validator-${project.version}.jar, \
thermostat-launcher-${project.version}.jar, \
@@ -157,9 +168,29 @@ diff --git a/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbu
- commons-cli-${commons-cli.version}.jar
+ jline2.jar, \
+ jansi.jar, \
-+ commons-cli.jar, \
-+ jcommon.jar, \
-+ jfreechart.jar
++ commons-cli.jar
+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
+@@ -68,6 +68,7 @@
+ <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-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
+@@ -74,6 +74,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>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>
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
@@ -173,8 +204,8 @@ diff --git a/vm-heap-analysis/distribution/thermostat-plugin.xml b/vm-heap-analy
<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>
+ <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>
@@ -142,9 +145,12 @@
<bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
@@ -186,8 +217,8 @@ diff --git a/vm-heap-analysis/distribution/thermostat-plugin.xml b/vm-heap-analy
<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>
+ <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>
@@ -201,9 +207,12 @@
<bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
@@ -199,8 +230,8 @@ diff --git a/vm-heap-analysis/distribution/thermostat-plugin.xml b/vm-heap-analy
<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>
+ <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>
@@ -254,9 +263,12 @@
<bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
@@ -212,8 +243,8 @@ diff --git a/vm-heap-analysis/distribution/thermostat-plugin.xml b/vm-heap-analy
<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>
+ <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>
@@ -307,9 +319,12 @@
<bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
@@ -225,8 +256,8 @@ diff --git a/vm-heap-analysis/distribution/thermostat-plugin.xml b/vm-heap-analy
<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>
+ <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>
@@ -360,9 +375,12 @@
<bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
@@ -238,8 +269,8 @@ diff --git a/vm-heap-analysis/distribution/thermostat-plugin.xml b/vm-heap-analy
<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>
+ <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>
@@ -406,9 +424,12 @@
<bundle><symbolic-name>org.apache.commons.logging</symbolic-name><version>${commons-logging.version}</version></bundle>
@@ -251,61 +282,28 @@ diff --git a/vm-heap-analysis/distribution/thermostat-plugin.xml b/vm-heap-analy
<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>
+ <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 -ruN thermostat-1.2.0.orig/killvm/distribution/thermostat-plugin.xml thermostat-1.2.0/killvm/distribution/thermostat-plugin.xml
---- thermostat-1.2.0.orig/killvm/distribution/thermostat-plugin.xml 2014-12-17 03:32:32.000000000 -0500
-+++ thermostat-1.2.0/killvm/distribution/thermostat-plugin.xml 2015-01-26 17:56:06.987350535 -0500
-@@ -80,6 +80,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>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>
-diff -ruN thermostat-1.2.0.orig/storage-profile/distribution/thermostat-plugin.xml thermostat-1.2.0/storage-profile/distribution/thermostat-plugin.xml
---- thermostat-1.2.0.orig/storage-profile/distribution/thermostat-plugin.xml 2014-12-17 03:32:32.000000000 -0500
-+++ thermostat-1.2.0/storage-profile/distribution/thermostat-plugin.xml 2015-01-26 17:59:27.671536349 -0500
-@@ -68,6 +68,7 @@
- <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 -ruN thermostat-1.2.0.orig/vm-gc/distribution/thermostat-plugin.xml thermostat-1.2.0/vm-gc/distribution/thermostat-plugin.xml
---- thermostat-1.2.0.orig/vm-gc/distribution/thermostat-plugin.xml 2014-12-17 03:32:32.000000000 -0500
-+++ thermostat-1.2.0/vm-gc/distribution/thermostat-plugin.xml 2015-01-26 17:57:15.691756500 -0500
-@@ -74,6 +74,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>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>
-diff -ruN thermostat-1.2.0.orig/vm-profiler/distribution/thermostat-plugin.xml thermostat-1.2.0/vm-profiler/distribution/thermostat-plugin.xml
---- thermostat-1.2.0.orig/vm-profiler/distribution/thermostat-plugin.xml 2014-12-17 03:32:32.000000000 -0500
-+++ thermostat-1.2.0/vm-profiler/distribution/thermostat-plugin.xml 2015-01-26 17:56:51.727614899 -0500
+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
@@ -94,6 +94,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>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.httpmime.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>
</bundles>
</command>
-diff -ruN thermostat-1.2.0.orig/web/endpoint-plugin/distribution/thermostat-plugin.xml thermostat-1.2.0/web/endpoint-plugin/distribution/thermostat-plugin.xml
---- thermostat-1.2.0.orig/web/endpoint-plugin/distribution/thermostat-plugin.xml 2014-12-17 03:32:32.000000000 -0500
-+++ thermostat-1.2.0/web/endpoint-plugin/distribution/thermostat-plugin.xml 2015-01-26 17:55:43.624212486 -0500
+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
@@ -68,6 +68,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>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.mime.version}</version></bundle>
++ <bundle><symbolic-name>org.apache.httpcomponents.httpmime</symbolic-name><version>${httpcomponents.httpmime.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>com.redhat.thermostat.process</symbolic-name><version>${project.version}</version></bundle>
diff --git a/osgi_spec_fixes.patch b/osgi_spec_fixes.patch
index bae3115..76514e2 100644
--- a/osgi_spec_fixes.patch
+++ b/osgi_spec_fixes.patch
@@ -160,7 +160,8 @@ 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
-@@ -147,14 +147,4 @@
+@@ -146,16 +146,6 @@
+ <artifactId>commons-cli</artifactId>
</dependency>
- <dependency>
@@ -175,6 +176,7 @@ diff --git a/common/core/pom.xml b/common/core/pom.xml
- </dependency>
<dependency>
+ <groupId>com.sun</groupId>
diff --git a/config/pom.xml b/config/pom.xml
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -467,10 +469,10 @@ diff --git a/killvm/command/pom.xml b/killvm/command/pom.xml
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,4 @@
+@@ -88,16 +88,6 @@
<scope>test</scope>
</dependency>
-- <dependency>
+ <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
@@ -480,9 +482,11 @@ diff --git a/killvm/common/pom.xml b/killvm/common/pom.xml
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
+- <dependency>
<groupId>org.apache.felix</groupId>
-@@ -120,4 +114,4 @@
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>4.2.0</version>
+@@ -120,4 +110,4 @@
</dependency>
</dependencies>
@@ -627,9 +631,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
-@@ -241,14 +241,26 @@
- <lucene.version>4.7.0_1</lucene.version>
- <lucene.osgi-version>4.7.0.1</lucene.osgi-version>
+@@ -243,14 +243,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
@@ -658,7 +662,7 @@ diff --git a/pom.xml b/pom.xml
<netty.version>3.2.4.Final</netty.version>
<httpcomponents.core.version>4.3.2</httpcomponents.core.version>
-@@ -630,12 +642,7 @@
+@@ -632,12 +644,7 @@
<artifactId>tools</artifactId>
<version>${jdktools.version}</version>
</dependency>
diff --git a/sources b/sources
index c6ba00f..c0efc62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3ec19de4f0bbbf04d47a3f7dd0551d34 thermostat-1.2.0.tar.gz
+90d2f2320d9dd4948e04cbd3d7b286bd thermostat-1.2.2.tar.gz
diff --git a/thermostat.spec b/thermostat.spec
index f5e7fa4..3122a6c 100644
--- a/thermostat.spec
+++ b/thermostat.spec
@@ -1,7 +1,7 @@
# Thermostat version
%global major 1
%global minor 2
-%global patchlevel 0
+%global patchlevel 2
# 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.
@@ -80,7 +80,7 @@ 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: 13%{?dist}
+Release: 1%{?dist}
Summary: A monitoring and serviceability tool for OpenJDK
License: GPLv2+ with exceptions and OFL
URL: http://icedtea.classpath.org/thermostat/
@@ -117,17 +117,13 @@ Patch1: osgi_spec_fixes.patch
# We rely on RPM's dep solving mechanism instead.
# See: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1591
Patch2: ignore_bundle_versions.patch
-# FIXME: Propose upstream
-Patch3: fix_lucene_symbolic_name.patch
-# FIXME: Propose upstream
-Patch4: fix_assembly_filtering.patch
# Play nice with mongodb 2.6
# FIXME: Propose a variant of this upstream
-Patch5: mongodb26_setup_changes.patch
+Patch3: mongodb26_setup_changes.patch
# Self-BR in order for xmvn-subst to work for symlinking
# thermostat deps.
-BuildRequires: thermostat-webapp = %{version}
+#BuildRequires: thermostat-webapp = %{version}
# BRs for core thermostat
BuildRequires: java-devel >= 1:1.8.0
BuildRequires: javapackages-tools
@@ -278,8 +274,6 @@ security.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
# Fix up artifact names which have different name upstream
# lucene
@@ -784,6 +778,9 @@ end
%config(noreplace) %{system_confdir}/sysconfig/tomcat@%{pkg_name}
%changelog
+* Mon Mar 16 2015 Severin Gehwolf <sgehwolf at redhat.com> - 1.2.2-1
+- Update to upstream 1.2.2 release.
+
* Thu Feb 26 2015 Severin Gehwolf <sgehwolf at redhat.com> - 1.2.0-13
- Add mongodb requirement for thermostat-setup.
More information about the scm-commits
mailing list