[thermostat] Rebuild with latest netty3.

[jerboaa]

commit 8d6d2c80ca69f52dddfbd7f2ff0893706c388549
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Mon Feb 16 13:21:21 2015 +0100

    Rebuild with latest netty3.

 thermostat.spec |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/thermostat.spec b/thermostat.spec
index 77b36d0..ea19341 100644
--- a/thermostat.spec
+++ b/thermostat.spec
@@ -7,7 +7,7 @@
 # it to set it in relevant files.
 
 # Real OSGi Bundle-Version is 3.6.6.Final
-%global netty_bundle_version       3.6.6
+%global netty_bundle_version       3.9.3
 %global jcommon_bundle_version     1.0.23
 %global jfreechart_bundle_version  1.0.19
 # apache-commons-beanutils
@@ -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:    10%{?dist}
+Release:    11%{?dist}
 Summary:    A monitoring and serviceability tool for OpenJDK
 License:    GPLv2+ with exceptions and OFL
 URL:        http://icedtea.classpath.org/thermostat/
@@ -127,7 +127,7 @@ Patch5:     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
@@ -163,7 +163,7 @@ BuildRequires: mvn(org.mongodb:mongo-java-driver)
 # Change to netty 4 once RHBZ#1053619 is
 # resolved.
 # The version number in mvn() means it's a compat package.
-BuildRequires: mvn(io.netty:netty:3.6.6)
+BuildRequires: mvn(io.netty:netty:%{netty_bundle_version})
 
 # BRs for webapp sub-package
 BuildRequires: tomcat
@@ -307,9 +307,9 @@ security.
 %pom_remove_dep org.jboss.netty:netty common/command
 %pom_remove_dep org.jboss.netty:netty client/command
 %pom_remove_dep org.jboss.netty:netty agent/command
-%pom_add_dep io.netty:netty:3.6.6 common/command
-%pom_add_dep io.netty:netty:3.6.6 client/command
-%pom_add_dep io.netty:netty:3.6.6 agent/command
+%pom_add_dep io.netty:netty:%{netty_bundle_version} common/command
+%pom_add_dep io.netty:netty:%{netty_bundle_version} client/command
+%pom_add_dep io.netty:netty:%{netty_bundle_version} agent/command
 
 # Don't use maven-exec-plugin. We do things manually in order to avoid this
 # additional dep. It's used in agent/core/pom.xml and in keyring/pom.xml
@@ -782,6 +782,10 @@ end
 %config(noreplace) %{system_confdir}/sysconfig/tomcat@%{pkg_name}
 
 %changelog
+* Mon Feb 16 2015 Severin Gehwolf <sgehwolf at redhat.com> - 1.2.0-11
+- Rebuild with latest netty3.
+- Disable self-BR.
+
 * Thu Jan 29 2015 Omair Majid <omajid at redhat.com> - 1.2.0-10
 - Do not create an admin account in thermostat database.