Browse code
Update openjdk8 to version 1.8.0.172
Change-Id: Idc68ff2a8b625b878c0bd39e8dc95b39bc62d1c2
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5077
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George
Harish Udaiya Kumar authored on 2018/04/24 04:18:53Showing 3 changed files
- SPECS/cassandra/cassandra.spec
- SPECS/cassandra/fix-building-openjdk-1.8.0.162.patch
- SPECS/openjdk8/openjdk8.spec
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
Summary: Cassandra is a highly scalable, eventually consistent, distributed, structured key-value store |
| 4 | 4 |
Name: cassandra |
| 5 | 5 |
Version: 3.10 |
| 6 |
-Release: 7%{?dist}
|
|
| 6 |
+Release: 8%{?dist}
|
|
| 7 | 7 |
URL: http://cassandra.apache.org/ |
| 8 | 8 |
License: Apache License, Version 2.0 |
| 9 | 9 |
Group: Applications/System |
| ... | ... |
@@ -13,7 +13,6 @@ Source0: https://repo1.maven.org/maven2/org/apache/cassandra/apache-cassa |
| 13 | 13 |
%define sha1 apache-cassandra=fa2bbeb62f930f5ff6fccee60cfb837d0794633a |
| 14 | 14 |
Source1: cassandra.service |
| 15 | 15 |
Patch0: build-fix.patch |
| 16 |
-Patch1: fix-building-openjdk-1.8.0.162.patch |
|
| 17 | 16 |
BuildRequires: apache-ant |
| 18 | 17 |
BuildRequires: unzip zip |
| 19 | 18 |
BuildRequires: openjdk8 |
| ... | ... |
@@ -26,7 +25,6 @@ Cassandra is a highly scalable, eventually consistent, distributed, structured k |
| 26 | 26 |
%prep |
| 27 | 27 |
%setup -qn apache-%{name}-%{version}-src
|
| 28 | 28 |
%patch0 -p1 |
| 29 |
-%patch1 -p1 |
|
| 30 | 29 |
sed -i 's#\"logback-core\" version=\"1.1.3\"#\"logback-core\" version=\"1.2.0\"#g' build.xml |
| 31 | 30 |
sed -i 's#\"logback-classic\" version=\"1.1.3\"#\"logback-classic\" version=\"1.2.0\"#g' build.xml |
| 32 | 31 |
rm lib/logback-* |
| ... | ... |
@@ -130,6 +128,8 @@ fi |
| 130 | 130 |
%exclude /var/opt/cassandra/build/lib |
| 131 | 131 |
|
| 132 | 132 |
%changelog |
| 133 |
+* Tue Apr 24 2018 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.10-8 |
|
| 134 |
+- Remove patch to build on openjdk-1.8.0.162, updated openjdk to 1.8.0.172 |
|
| 133 | 135 |
* Sat Jan 20 2018 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.10-7 |
| 134 | 136 |
- Add patch to build on openjdk-1.8.0.162 |
| 135 | 137 |
* Thu Aug 17 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.10-6 |
| 136 | 138 |
deleted file mode 100644 |
| ... | ... |
@@ -1,25 +0,0 @@ |
| 1 |
-diff --git a/src/java/org/apache/cassandra/utils/JMXServerUtils.java b/src/java/org/apache/cassandra/utils/JMXServerUtils.java |
|
| 2 |
-index e78ed01746..072f237049 100644 |
|
| 3 |
-+++ b/src/java/org/apache/cassandra/utils/JMXServerUtils.java |
|
| 4 |
-@@ -46,6 +46,7 @@ import org.slf4j.LoggerFactory; |
|
| 5 |
- import com.sun.jmx.remote.internal.RMIExporter; |
|
| 6 |
- import com.sun.jmx.remote.security.JMXPluggableAuthenticator; |
|
| 7 |
- import org.apache.cassandra.auth.jmx.AuthenticationProxy; |
|
| 8 |
-+import sun.misc.ObjectInputFilter; |
|
| 9 |
- import sun.rmi.registry.RegistryImpl; |
|
| 10 |
- import sun.rmi.server.UnicastServerRef2; |
|
| 11 |
- |
|
| 12 |
-@@ -308,10 +309,10 @@ public class JMXServerUtils |
|
| 13 |
- // to our custom Registry too. |
|
| 14 |
- private Remote connectorServer; |
|
| 15 |
- |
|
| 16 |
-- public Remote exportObject(Remote obj, int port, RMIClientSocketFactory csf, RMIServerSocketFactory ssf) |
|
| 17 |
-+ public Remote exportObject(Remote obj, int port, RMIClientSocketFactory csf, RMIServerSocketFactory ssf, ObjectInputFilter filter) |
|
| 18 |
- throws RemoteException |
|
| 19 |
- {
|
|
| 20 |
-- Remote remote = new UnicastServerRef2(port, csf, ssf).exportObject(obj, null, true); |
|
| 21 |
-+ Remote remote = new UnicastServerRef2(port, csf, ssf, filter).exportObject(obj, null, true); |
|
| 22 |
- // Keep a reference to the first object exported, the JMXConnectorServer |
|
| 23 |
- if (connectorServer == null) |
|
| 24 |
- connectorServer = remote; |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
%global security_hardening none |
| 3 | 3 |
Summary: OpenJDK |
| 4 | 4 |
Name: openjdk8 |
| 5 |
-Version: 1.8.0.162 |
|
| 5 |
+Version: 1.8.0.172 |
|
| 6 | 6 |
Release: 1%{?dist}
|
| 7 | 7 |
License: GNU GPL |
| 8 | 8 |
URL: https://openjdk.java.net |
| ... | ... |
@@ -10,7 +10,7 @@ Group: Development/Tools |
| 10 | 10 |
Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| 12 | 12 |
Source0: http://www.java.net/download/openjdk/jdk8/promoted/b162/openjdk-%{version}.tar.gz
|
| 13 |
-%define sha1 openjdk=e639499b4e333ac4a9e0fe530af58a1a63dda32a |
|
| 13 |
+%define sha1 openjdk=c159933c1432409890dcfd7dcaad516b727669c7 |
|
| 14 | 14 |
Patch0: Awt_build_headless_only.patch |
| 15 | 15 |
Patch1: check-system-ca-certs.patch |
| 16 | 16 |
BuildRequires: pcre-devel |
| ... | ... |
@@ -164,6 +164,7 @@ alternatives --remove javac %{_libdir}/jvm/OpenJDK-%{version}/bin/javac
|
| 164 | 164 |
%postun -n openjre8 |
| 165 | 165 |
alternatives --remove java %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/java
|
| 166 | 166 |
/sbin/ldconfig |
| 167 |
+rm -rf %{_libdir}/jvm/OpenJDK-%{version}
|
|
| 167 | 168 |
|
| 168 | 169 |
%clean |
| 169 | 170 |
rm -rf %{buildroot}/*
|
| ... | ... |
@@ -237,6 +238,8 @@ rm -rf %{buildroot}/*
|
| 237 | 237 |
%{_libdir}/jvm/OpenJDK-%{version}/src.zip
|
| 238 | 238 |
|
| 239 | 239 |
%changelog |
| 240 |
+* Mon Apr 23 2018 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.0.172-1 |
|
| 241 |
+- Upgraded to version 1.8.0.172 |
|
| 240 | 242 |
* Fri Jan 19 2018 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.0.162-1 |
| 241 | 243 |
- Upgraded to version 1.8.0.162 |
| 242 | 244 |
* Thu Dec 21 2017 Alexey Makhalov <amakhalov@vmware.com> 1.8.0.152-2 |