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 <[email protected]> Reviewed-by: Sharath George
braegelno5 · Apr 26, 2018 · ec165e0 · ec165e0
1 parent 5d822c2
commit ec165e0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 30 deletions.
diff --git a/SPECS/cassandra/cassandra.spec b/SPECS/cassandra/cassandra.spec
@@ -3,7 +3,7 @@
 Summary:        Cassandra is a highly scalable, eventually consistent, distributed, structured key-value store
 Name:           cassandra
 Version:        3.10
-Release:        7%{?dist}
+Release:        8%{?dist}
 URL:            http://cassandra.apache.org/
 License:        Apache License, Version 2.0
 Group:          Applications/System
@@ -13,7 +13,6 @@ Source0:        https://repo1.maven.org/maven2/org/apache/cassandra/apache-cassa
 %define sha1    apache-cassandra=fa2bbeb62f930f5ff6fccee60cfb837d0794633a
 Source1:        cassandra.service
 Patch0:         build-fix.patch
-Patch1:         fix-building-openjdk-1.8.0.162.patch
 BuildRequires:  apache-ant
 BuildRequires:  unzip zip
 BuildRequires:  openjdk8
@@ -26,7 +25,6 @@ Cassandra is a highly scalable, eventually consistent, distributed, structured k
 %prep
 %setup -qn apache-%{name}-%{version}-src
 %patch0 -p1
-%patch1 -p1
 sed -i 's#\"logback-core\" version=\"1.1.3\"#\"logback-core\" version=\"1.2.0\"#g' build.xml
 sed -i 's#\"logback-classic\" version=\"1.1.3\"#\"logback-classic\" version=\"1.2.0\"#g' build.xml
 rm lib/logback-*
@@ -130,6 +128,8 @@ fi
 %exclude /var/opt/cassandra/build/lib
 
 %changelog
+*   Tue Apr 24 2018 Harish Udaiya Kumar <[email protected]> 3.10-8
+-   Remove patch to build on openjdk-1.8.0.162, updated openjdk to 1.8.0.172
 *   Sat Jan 20 2018 Harish Udaiya Kumar <[email protected]> 3.10-7
 -   Add patch to build on openjdk-1.8.0.162
 *   Thu Aug 17 2017 Harish Udaiya Kumar <[email protected]> 3.10-6

diff --git a/SPECS/cassandra/fix-building-openjdk-1.8.0.162.patch b/SPECS/cassandra/fix-building-openjdk-1.8.0.162.patch
diff --git a/SPECS/openjdk8/openjdk8.spec b/SPECS/openjdk8/openjdk8.spec
@@ -2,15 +2,15 @@
 %global security_hardening none
 Summary:	OpenJDK
 Name:		openjdk8
-Version:	1.8.0.162
+Version:	1.8.0.172
 Release:	1%{?dist}
 License:	GNU GPL
 URL:		https://openjdk.java.net
 Group:		Development/Tools
 Vendor:		VMware, Inc.
 Distribution:   Photon
 Source0:	http://www.java.net/download/openjdk/jdk8/promoted/b162/openjdk-%{version}.tar.gz
-%define sha1 openjdk=e639499b4e333ac4a9e0fe530af58a1a63dda32a
+%define sha1 openjdk=c159933c1432409890dcfd7dcaad516b727669c7
 Patch0:		Awt_build_headless_only.patch
 Patch1:		check-system-ca-certs.patch
 BuildRequires:  pcre-devel
@@ -164,6 +164,7 @@ alternatives --remove javac %{_libdir}/jvm/OpenJDK-%{version}/bin/javac
 %postun -n openjre8
 alternatives --remove java %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/java
 /sbin/ldconfig
+rm -rf %{_libdir}/jvm/OpenJDK-%{version}
 
 %clean
 rm -rf %{buildroot}/*
@@ -237,6 +238,8 @@ rm -rf %{buildroot}/*
 %{_libdir}/jvm/OpenJDK-%{version}/src.zip
 
 %changelog
+*   Mon Apr 23 2018 Harish Udaiya Kumar <[email protected]> 1.8.0.172-1
+-   Upgraded to version 1.8.0.172
 *   Fri Jan 19 2018 Harish Udaiya Kumar <[email protected]> 1.8.0.162-1
 -   Upgraded to version 1.8.0.162
 *   Thu Dec 21 2017 Alexey Makhalov <[email protected]> 1.8.0.152-2