[thermostat/f20] Update to latest upstream release.
jerboaa
jerboaa at fedoraproject.org
Fri Feb 14 13:24:30 UTC 2014
commit 56eae31aa36118143395b8a88f2219a18d18003e
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date: Fri Feb 14 13:56:36 2014 +0100
Update to latest upstream release.
.gitignore | 1 +
fix_keyring_warnings.patch | 25 ---------------------
osgi_spec_fixes.patch | 51 ++++++++++++++++++++++++++++++++-----------
sources | 2 +-
thermostat.spec | 12 +++++-----
5 files changed, 46 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 614da24..5809162 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/thermostat-0.15.0.tar.gz
/thermostat-1.0-b7c6db90e034.tar.bz2
/thermostat-1.0.0.tar.gz
+/thermostat-1.0.2.tar.gz
diff --git a/osgi_spec_fixes.patch b/osgi_spec_fixes.patch
index 33f709d..af73c7c 100644
--- a/osgi_spec_fixes.patch
+++ b/osgi_spec_fixes.patch
@@ -29,7 +29,7 @@ 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
-@@ -90,8 +90,8 @@
+@@ -100,8 +100,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -43,7 +43,7 @@ diff --git a/agent/core/pom.xml b/agent/core/pom.xml
diff --git a/client/cli/pom.xml b/client/cli/pom.xml
--- a/client/cli/pom.xml
+++ b/client/cli/pom.xml
-@@ -96,14 +96,8 @@
+@@ -101,14 +101,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
@@ -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
-@@ -51,15 +51,8 @@
+@@ -53,15 +53,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
-@@ -52,15 +52,8 @@
+@@ -55,15 +55,8 @@
</dependency>
<dependency>
@@ -140,7 +140,7 @@ diff --git a/client/living-vm-filter/swing/pom.xml b/client/living-vm-filter/swi
diff --git a/client/swing/pom.xml b/client/swing/pom.xml
--- a/client/swing/pom.xml
+++ b/client/swing/pom.xml
-@@ -115,14 +115,8 @@
+@@ -110,14 +110,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
-@@ -41,14 +41,8 @@
+@@ -46,14 +46,8 @@
</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
-@@ -106,14 +106,8 @@
+@@ -109,14 +109,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
-@@ -61,14 +61,8 @@
+@@ -63,14 +63,8 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -549,23 +549,34 @@ 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
-@@ -184,11 +184,11 @@
+@@ -188,11 +188,22 @@
<jline.version>2.9</jline.version>
<lucene.version>3.6.0_1</lucene.version>
<!--
- felix 4.0 is compliant with osgi 4.3
- for osgi clients, 4.3 is backwards compatible with 4.2
++ Since we use felix framework at runtime, try to avoid introducing an
++ extra dependency for OSGi API-only (e.g. org.osgi:org.osgi.core) in order to
++ make packaging Thermostat easier. While org.osgi:org.osgi.core v4.3.x would
++ satisfy OSGi 4.3 spec API, org.apache.felix:org.osgi.core v1.4 is OSGi 4.2 spec
++ only at this point.
++
+ Felix framework 4.2 is an implementation of the 4.3 OSGi
+ spec: https://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Framework+OSGi+R4.3+CT+Results
-+ Since org.osgi:org.osgi.core are non-free use everything
-+ (API) and impl directly from felix framework.
++
++ Note that between OSGi spec 4.2 and 4.3 generics (a.k.a type parameters)
++ have been introduced. Howerver, felix's API-only package,
++ org.apache.felix:org.osgi.core, is OSGi spec 4.2 and we use OSGi spec 4.3
++ specific code in thermostat.
++
++ We should be careful not to introduce felix specific API, though.
-->
- <osgi.core.version>4.3.1</osgi.core.version>
- <osgi.compendium.version>4.3.1</osgi.compendium.version>
<felix.framework.version>4.2.0</felix.framework.version>
<netty.version>3.2.4.Final</netty.version>
-@@ -425,16 +425,6 @@
+@@ -431,16 +442,6 @@
</dependency>
<dependency>
@@ -582,6 +593,20 @@ diff --git a/pom.xml b/pom.xml
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>${felix.framework.version}</version>
+diff --git a/storage/cli/pom.xml b/storage/cli/pom.xml
+--- a/storage/cli/pom.xml
++++ b/storage/cli/pom.xml
+@@ -67,8 +67,8 @@
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+- <groupId>org.osgi</groupId>
+- <artifactId>org.osgi.core</artifactId>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>org.apache.felix.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.redhat.thermostat</groupId>
diff --git a/system-backend/pom.xml b/system-backend/pom.xml
--- a/system-backend/pom.xml
+++ b/system-backend/pom.xml
@@ -1405,7 +1430,7 @@ diff --git a/web/client/pom.xml b/web/client/pom.xml
diff --git a/web/server/pom.xml b/web/server/pom.xml
--- a/web/server/pom.xml
+++ b/web/server/pom.xml
-@@ -120,9 +120,8 @@
+@@ -127,9 +127,8 @@
</dependency>
<dependency>
diff --git a/sources b/sources
index f70e40e..63bbbff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8700f2d408d6684ea2e424a7e3fb333d thermostat-1.0.0.tar.gz
+1beb6b49b6730dceefc8d23c06e10969 thermostat-1.0.2.tar.gz
diff --git a/thermostat.spec b/thermostat.spec
index 4285b06..5fbaf95 100644
--- a/thermostat.spec
+++ b/thermostat.spec
@@ -1,7 +1,7 @@
# Thermostat version
%global major 1
%global minor 0
-%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.
@@ -78,7 +78,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: 3%{?dist}
+Release: 1%{?dist}
Summary: A monitoring and serviceability tool for OpenJDK
License: GPLv2+ with exceptions and OFL
URL: http://icedtea.classpath.org/thermostat/
@@ -119,9 +119,6 @@ Patch2: fix_loglevel.patch
# 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
-# This has been proposed upstream. See:
-# http://icedtea.classpath.org/pipermail/thermostat/2013-November/008962.html
-Patch4: fix_keyring_warnings.patch
BuildRequires: java-devel >= 1:1.7.0
BuildRequires: jpackage-utils
@@ -262,7 +259,6 @@ security.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
# Fix up artifact names which have different name upstream
# lucene
@@ -379,6 +375,7 @@ pushd keyring
javac -cp ../config/target/classes:../annotations/target/classes \
-d target/classes \
src/main/java/com/redhat/thermostat/utils/keyring/Keyring.java \
+ src/main/java/com/redhat/thermostat/utils/keyring/KeyringException.java \
src/main/java/com/redhat/thermostat/utils/keyring/impl/KeyringImpl.java
make all
popd
@@ -800,6 +797,9 @@ fi
%config(noreplace) %{system_confdir}/sysconfig/tomcat@%{pkg_name}
%changelog
+* Fri Feb 14 2014 Severin Gehwolf <sgehwolf at redhat.com> - 1.0.2-1
+- Update to latest upstream release.
+
* Tue Feb 11 2014 Omair Majid <omajid at redhat.com> - 1.0.0-3
- Update license field to match the tarball license
More information about the scm-commits
mailing list