Mercurial > hg > release > thermostat-2.0

changeset 2491:ca32ab5d3635

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[RPM] Packaging updates for netty 4.0.42.Final Reviewed-by: neugens Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-October/021398.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Tue, 25 Oct 2016 12:05:45 +0200
parents 8fe388c911d2
children afecd793c82f
files distribution/packaging/fedora/0001_shared_fix_bundle_loading.patch distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch distribution/packaging/fedora/0003_rhel_lucene_4.patch distribution/packaging/fedora/0004_shared-remove-jnr-assembly-exclusion.patch distribution/packaging/fedora/0005_shared_netty_jctools_classpath.patch distribution/packaging/fedora/thermostat.spec
diffstat 6 files changed, 59 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/packaging/fedora/0001_shared_fix_bundle_loading.patch	Fri Oct 21 17:02:28 2016 +0200
+++ b/distribution/packaging/fedora/0001_shared_fix_bundle_loading.patch	Tue Oct 25 12:05:45 2016 +0200
@@ -10,6 +10,33 @@
          <bundle><symbolic-name>com.google.gson</symbolic-name><version>${symbol_dollar}{gson.version}</version></bundle>
        </bundles>
      </command>
+diff --git a/distribution/config/osgi-export.properties b/distribution/config/osgi-export.properties
+--- a/distribution/config/osgi-export.properties
++++ b/distribution/config/osgi-export.properties
+@@ -32,23 +32,6 @@
+ # library, but you are not obligated to do so.  If you do not wish
+ # to do so, delete this exception statement from your version.
+ 
+-# jfreechart is no OSGi bundle upstream. The jar is on the
+-# classpath and packages thus made available this way.
+-org.jfree.chart
+-org.jfree.chart.axis
+-org.jfree.chart.event
+-org.jfree.chart.labels
+-org.jfree.chart.plot
+-org.jfree.chart.panel
+-org.jfree.chart.renderer.xy
+-org.jfree.data
+-org.jfree.data.category
+-org.jfree.data.general
+-org.jfree.data.time
+-org.jfree.data.xy
+-org.jfree.ui
+-org.jfree.data.gantt
+-
+ sun.swing
+ sun.swing.table
+ sun.misc
 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
@@ -25,12 +52,12 @@
 diff --git a/pom.xml b/pom.xml
 --- a/pom.xml
 +++ b/pom.xml
-@@ -271,6 +271,8 @@
+@@ -305,6 +305,8 @@
      <felix.scr.version>1.8.2</felix.scr.version>
      <felix.scr.annotations.version>1.9.12</felix.scr.annotations.version>
      <kxml2.version>2.3.0</kxml2.version>
 +    <!-- kxml2 needs xpp3 classes at runtime -->
 +    <xpp3.version>1.1.4c</xpp3.version>
  
-     <netty.version>4.0.28.Final</netty.version>
+     <netty.version>4.0.42.Final</netty.version>
      <httpcomponents.core.version>4.3.2</httpcomponents.core.version>
--- a/distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch	Fri Oct 21 17:02:28 2016 +0200
+++ b/distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch	Tue Oct 25 12:05:45 2016 +0200
@@ -543,7 +543,7 @@
 diff --git a/keyring/pom.xml b/keyring/pom.xml
 --- a/keyring/pom.xml
 +++ b/keyring/pom.xml
-@@ -167,14 +167,8 @@
+@@ -188,14 +188,8 @@
      </dependency>
      
      <dependency>
--- a/distribution/packaging/fedora/0003_rhel_lucene_4.patch	Fri Oct 21 17:02:28 2016 +0200
+++ b/distribution/packaging/fedora/0003_rhel_lucene_4.patch	Tue Oct 25 12:05:45 2016 +0200
@@ -1,7 +1,7 @@
 diff --git a/pom.xml b/pom.xml
 --- a/pom.xml
 +++ b/pom.xml
-@@ -232,8 +232,8 @@
+@@ -286,8 +286,8 @@
      <jffi.version>1.2.12</jffi.version>
  
      <jline.version>2.13</jline.version>
--- a/distribution/packaging/fedora/0004_shared-remove-jnr-assembly-exclusion.patch	Fri Oct 21 17:02:28 2016 +0200
+++ b/distribution/packaging/fedora/0004_shared-remove-jnr-assembly-exclusion.patch	Tue Oct 25 12:05:45 2016 +0200
@@ -1,7 +1,7 @@
 diff --git a/distribution/assembly/core-assembly.xml b/distribution/assembly/core-assembly.xml
 --- a/distribution/assembly/core-assembly.xml
 +++ b/distribution/assembly/core-assembly.xml
-@@ -74,13 +74,9 @@
+@@ -76,13 +76,9 @@
          <include>com.redhat.thermostat:thermostat-laf-utils</include>
          <include>org.osgi:org.osgi.compendium</include>
          <include>org.apache:org.apache.felix.scr</include>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distribution/packaging/fedora/0005_shared_netty_jctools_classpath.patch	Tue Oct 25 12:05:45 2016 +0200
@@ -0,0 +1,22 @@
+diff --git a/distribution/scripts/thermostat-command-channel b/distribution/scripts/thermostat-command-channel
+--- a/distribution/scripts/thermostat-command-channel
++++ b/distribution/scripts/thermostat-command-channel
+@@ -67,6 +67,7 @@
+ IPC_CLASSPATH="${IPC_CLASSPATH}:${THERMOSTAT_LIBS}/netty-transport-@netty.version@.jar"
+ IPC_CLASSPATH="${IPC_CLASSPATH}:${THERMOSTAT_LIBS}/netty-codec-@netty.version@.jar"
+ IPC_CLASSPATH="${IPC_CLASSPATH}:${THERMOSTAT_LIBS}/netty-handler-@netty.version@.jar"
++IPC_CLASSPATH="${IPC_CLASSPATH}:${THERMOSTAT_LIBS}/jctools-core-@jctools.version@.jar"
+ IPC_CLASSPATH="${IPC_CLASSPATH}:${THERMOSTAT_LIBS}/gson-@gson.version@.jar"
+ 
+ CMD_CHANNEL_CLASS="com.redhat.thermostat.agent.command.server.internal.CommandChannelServerMain"
+diff --git a/pom.xml b/pom.xml
+--- a/pom.xml
++++ b/pom.xml
+@@ -321,6 +321,7 @@
+     <xpp3.version>1.1.4c</xpp3.version>
+ 
+     <netty.version>4.0.42.Final</netty.version>
++    <jctools.version>1.2.1</jctools.version>
+     <httpcomponents.core.version>4.3.2</httpcomponents.core.version>
+     <httpcomponents.client.version>4.3.4</httpcomponents.client.version>
+     <gson.version>2.2.2</gson.version>
--- a/distribution/packaging/fedora/thermostat.spec	Fri Oct 21 17:02:28 2016 +0200
+++ b/distribution/packaging/fedora/thermostat.spec	Tue Oct 25 12:05:45 2016 +0200
@@ -123,8 +123,8 @@
 # Real OSGi Bundle-Version is 3.2.1.RELEASE
 %global mongo_bundle_version         3.2.1
 
-# Real OSGi Bundle-Version is 4.0.28.Final
-%global netty_bundle_version          4.0.28
+# Real OSGi Bundle-Version is 4.0.42.Final
+%global netty_bundle_version          4.0.42
 %global kxml2_version                 2.3.0
 
 # apache-commons-collections
@@ -283,6 +283,8 @@
 # This patch can be removed when upstream jnr-x86asm adds OSGi metadata to its
 # manifest. See https://github.com/jnr/jnr-x86asm/pull/1
 Patch4:     0004_shared-remove-jnr-assembly-exclusion.patch
+# Upstream netty 4 bundles jctools. We don't do that downstream.
+Patch5:     0005_shared_netty_jctools_classpath.patch
 
 %{?scl:
 %if 0%{?non_bootstrap_build}
@@ -539,6 +541,7 @@
 %patch3 -p1
 }
 %patch4 -p1
+%patch5 -p1
 
 # Replace thermostatrc with Fedora's version
 cp %{SOURCE4} distribution/config/thermostatrc