1. photon
  2. Commit e02163c5b85523bf2f17c87b116788982c06ed37
Browse code

Updating JDK and all its dependenct and JNA packages

Change-Id: Ic31a56220d6123e46d4e7ab7cf2667f3d0bf7304
Reviewed-on: http://photon-jenkins.eng.vmware.com/583
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: suezzelur <anishs@vmware.com>

Kumar Kaushik authored on 2016/02/27 11:19:14
Showing 6 changed files
SPECS/ant-contrib/ant-contrib.spec
History View file @ e02163c
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Ant contrib
2 2 
 Name:		ant-contrib
3 3 
 Version:	1.0b3
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://ant-contrib.sourceforget.net
7 7 
 Group:		Applications/System
... ... 
@@ -23,7 +23,7 @@ The Ant Contrib project is a collection of tasks for Apache Ant.
23 23 
 %setup -n %{name}
24 24 
 %build
25 25 
 ANT_HOME=/var/opt/apache-ant-1.9.4
26 
-export JAVA_HOME=/var/opt/OpenJDK-1.8.0.51-bin
26 
+export JAVA_HOME=/var/opt/OpenJDK-1.8.0.72-bin
27 27 
 mkdir -p -m 700 %{_prefix}
28 28 
 $ANT_HOME/bin/ant -Ddist.dir="%{_prefix}" -Dproject.version="1.0b3" dist
29 29 
 %install
... ... 
@@ -38,9 +38,11 @@ cd %{buildroot}/var/opt && tar xvzf %{_prefix}/ant-contrib-1.0b3-bin.tar.gz --wi
38 38 
 %{_prefix}/lib/*.jar
39 39
40 40 
 %changelog
41 
+*   Fri Feb 26 2016 Kumar Kaushik <kaushikk@vmware.com> 1.0b3.0-4
42 
+-   Updated JAVA_HOME path to point to latest.
41 43 
 *   Mon Nov 16 2015 Sharath George <sharathg@vmware.com> 1.0b3.0-2
42 
--	Change path to /var/opt.
44 
+-   Change path to /var/opt.
43 45 
 *   Wed Sep 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.0b3.0-1
44 
--	Updated dependencies after repackaging openjdk.
46 
+-   Updated dependencies after repackaging openjdk.
45 47 
 *   Tue Jun 9 2015 Sriram Nambakam <snambakam@vmware.com> 1.0b3.0-0
46 48 
 -   Initial commit
SPECS/apache-ant/apache-ant.spec
History View file @ e02163c
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Apache Ant
2 2 
 Name:		apache-ant
3 3 
 Version:	1.9.4
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://ant.apache.org
7 7 
 Group:		Applications/System
... ... 
@@ -36,7 +36,7 @@ cp -v ./hamcrest-1.3/hamcrest-core-1.3.jar ./lib/optional
36 36
37 37 
 mkdir -p -m 700 $ANT_DIST_DIR
38 38
39 
-export JAVA_HOME=/var/opt/OpenJDK-1.8.0.51-bin
39 
+export JAVA_HOME=/var/opt/OpenJDK-1.8.0.72-bin
40 40
41 41 
 ./bootstrap.sh && ./build.sh -Ddist.dir=$ANT_DIST_DIR
42 42
... ... 
@@ -66,11 +66,13 @@ chmod 644 $MAVEN_ANT_TASKS_DIR/*
66 66 
 %{_prefix}/maven-ant-tasks/*
67 67
68 68 
 %changelog
69 
+*   Fri Feb 26 2016 Kumar Kaushik <kaushikk@vmware.com> 1.9.4-4
70 
+-   Updated JAVA_HOME path to point to latest JDK.
69 71 
 *   Mon Nov 16 2015 Sharath George <sharathg@vmware.com> 1.9.4-3
70 
--	Changed path to /var/opt.
72 
+-   Changed path to /var/opt.
71 73 
 *   Wed Sep 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.9.4-2
72 
--	Updated dependencies after repackaging openjdk.
74 
+-   Updated dependencies after repackaging openjdk.
73 75 
 *   Wed Aug 12 2015 Sriram Nambakam <snambakam@vmware.com> 1.9.4
74 76 
 -   Added maven ant tasks
75 
-*	Fri May 22 2015 Sriram Nambakam <snambakam@vmware.com> 1.9.4
76 
--	Initial build.	First version
77 
+*   Fri May 22 2015 Sriram Nambakam <snambakam@vmware.com> 1.9.4
78 
+-   Initial build.	First version
SPECS/apache-maven/apache-maven.spec
History View file @ e02163c
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Apache Maven
2 2 
 Name:		apache-maven
3 3 
 Version:	3.3.9
4 
-Release:	1%{?dist}
4 
+Release:	2%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://maven.apache.org
7 7 
 Group:		Applications/System
... ... 
@@ -28,7 +28,7 @@ find . -name build.xml | xargs sed -i 's/timeout="600000"/timeout="1200000"/g'
28 28 
 %build
29 29 
 MAVEN_DIST_DIR=/var/opt/apache-maven-3.3.9
30 30
31 
-export JAVA_HOME=/var/opt/OpenJDK-1.8.0.51-bin
31 
+export JAVA_HOME=/var/opt/OpenJDK-1.8.0.72-bin
32 32 
 export ANT_HOME=/var/opt/apache-ant-1.9.4
33 33 
 export PATH=$PATH:$ANT_HOME/bin
34 34
... ... 
@@ -62,15 +62,17 @@ echo 'export MAVEN_OPTS=-Xms256m' >> %{buildroot}/etc/profile.d/%{name}.sh
62 62 
 %{_prefix}/conf/toolchains.xml
63 63
64 64 
 %changelog
65 
+*   Fri Feb 26 2016 Kumar Kaushik <kaushikk@vmware.com> 3.3.9-2
66 
+-   Updated JAVA_HOME path to point to latest JDK.
65 67 
 *   Thu Jan 21 2016 Xiaolin Li <xiaolinl@vmware.com> 3.3.9-1
66 68 
 -   Updated to version 3.3.9
67 69 
 *   Tue Jan 5 2016 Xiaolin Li <xiaolinl@vmware.com> 3.3.3-4
68 70 
 -   Increase build timeout from 600000 to 1200000
69 71 
 *   Mon Nov 16 2015 Sharath George <sharathg@vmware.com> 3.3.3-3
70 
--	Change path to /var/opt.
72 
+-   Change path to /var/opt.
71 73 
 *   Wed Sep 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.3.3-2
72 
--	Updated dependencies after repackaging openjdk.
73 
-*	Thu Jul 9 2015 	Sarah Choi<sarahc@vmware.com> 3.3.3-1
74 
--	Add a script to set environment variables for MAVEN
75 
-*	Fri May 22 2015 Sriram Nambakam <snambakam@vmware.com> 1.9.4
76 
--	Initial build.	First version
74 
+-   Updated dependencies after repackaging openjdk.
75 
+*   Thu Jul 9 2015 	Sarah Choi<sarahc@vmware.com> 3.3.3-1
76 
+-   Add a script to set environment variables for MAVEN
77 
+*   Fri May 22 2015 Sriram Nambakam <snambakam@vmware.com> 1.9.4
78 
+-   Initial build.	First version
SPECS/commons-daemon/commons-daemon.spec
History View file @ e02163c
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Apache Commons Daemon
2 2 
 Name:		commons-daemon
3 3 
 Version:	1.0.15
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://commons.apache.org/proper/commons-daemon
7 7 
 Group:		Applications/System
... ... 
@@ -24,7 +24,7 @@ The JNA package contains libraries for interop from Java to native libraries.
24 24 
 %setup -q -n %{name}-%{version}-src
25 25 
 %build
26 26 
 ANT_HOME=/var/opt/apache-ant-1.9.4
27 
-export JAVA_HOME=/var/opt/OpenJDK-1.8.0.51-bin
27 
+export JAVA_HOME=/var/opt/OpenJDK-1.8.0.72-bin
28 28
29 29 
 $ANT_HOME/bin/ant dist
30 30
... ... 
@@ -58,9 +58,11 @@ chmod -R 755 $DIST_DIR
58 58 
 %{_prefix}/*.jar
59 59
60 60 
 %changelog
61 
+*   Fri Feb 26 2016 Kumar Kaushik <kaushikk@vmware.com> 1.0.15-4
62 
+-   Updated JAVA_HOME path to point to latest JDK.
61 63 
 *   Mon Nov 16 2015 Sharath George <sharathg@vmware.com> 1.0.15-3
62 
--	Changing path to /var/opt.
64 
+-   Changing path to /var/opt.
63 65 
 *   Wed Sep 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.0.15-2
64 
--	Updated dependencies after repackaging openjdk.
66 
+-   Updated dependencies after repackaging openjdk.
65 67 
 *   Wed Jul 15 2015 Sriram Nambakam <snambakam@vmware.com> 1.0.15-1
66 68 
 -   Initial commit
SPECS/jna/jna.spec
History View file @ e02163c
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Java Native Access
2 2 
 Name:		jna
3 
-Version:	4.1.0
4 
-Release:	3%{?dist}
3 
+Version:	4.2.1
4 
+Release:	1%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://github.com/twall/jna
7 7 
 Group:		Applications/System
... ... 
@@ -9,11 +9,11 @@ Vendor:		VMware, Inc.
9 9 
 Distribution: 	Photon
10 10 
 BuildArch:      x86_64
11 11 
 Source0:	http://dl.bintray.com/vmware/photon_release_1.0_TP1_x86_64/%{name}-%{version}.tar.gz
12 
-%define sha1 jna=c520c1be533619d3cbc3ad448d49a8f24ee60bda
12 
+%define sha1 jna=30a1132f9ca6b3222eccd380a3f4149aa7df3f59
13 13 
 Requires: openjre >= 1.8.0.45
14 14 
 BuildRequires: openjre >= 1.8.0.45, openjdk >= 1.8.0.45, apache-ant >= 1.9.4
15 15
16 
-%define _prefix /var/opt/jna-4.1.0
16 
+%define _prefix /var/opt/jna-4.2.1
17 17
18 18 
 %description
19 19 
 The JNA package contains libraries for interop from Java to native libraries.
... ... 
@@ -31,7 +31,7 @@ Sources for JNA
31 31 
 %setup -q
32 32 
 %build
33 33 
 ANT_HOME=/var/opt/apache-ant-1.9.4
34 
-export JAVA_HOME=/var/opt/OpenJDK-1.8.0.51-bin
34 
+export JAVA_HOME=/var/opt/OpenJDK-1.8.0.72-bin
35 35
36 36 
 #disabling all tests
37 37 
 $ANT_HOME/bin/ant -Dcflags_extra.native=-DNO_JAWT -Dtests.exclude-patterns="**/*.java" -Drelease=true
... ... 
@@ -65,6 +65,8 @@ $ANT_HOME/bin/ant -Ddist=$JNA_DIST_DIR dist -Drelease=true
65 65 
 %{_prefix}/*sources.jar
66 66
67 67 
 %changelog
68 
+*   Fri Feb 26 2016 Kumar Kaushik <kaushikk@vmware.com> 4.2.1-1
69 
+-   Updating version
68 70 
 *   Mon Nov 16 2015 Sharath George <sharathg@vmware.com> 4.1.0-3
69 71 
 -   Changing path to /var/optttt.
70 72 
 *   Fri Sep 18 2015 Divya Thaluru <dthaluru@vmware.com> 4.1.0-2
SPECS/openjdk/openjdk.spec
History View file @ e02163c
... ... 
@@ -1,8 +1,8 @@
1 1 
 %define _use_internal_dependency_generator 0
2 2 
 Summary:	OpenJDK
3 3 
 Name:		openjdk
4 
-Version:	1.8.0.51
5 
-Release:	3%{?dist}
4 
+Version:	1.8.0.72
5 
+Release:	1%{?dist}
6 6 
 License:	GNU GPL
7 7 
 URL:		https://openjdk.java.net
8 8 
 Group:		Development/Tools
... ... 
@@ -10,7 +10,7 @@ Vendor:		VMware, Inc.
10 10 
 Distribution:   Photon
11 11 
 AutoReqProv: 	no
12 12 
 Source0:	http://anduin.linuxfromscratch.org/files/BLFS/OpenJDK-%{version}/OpenJDK-%{version}-x86_64-bin.tar.xz
13 
-%define sha1 OpenJDK=498263b52777406f02405ed610fa756f6b36f5df
13 
+%define sha1 OpenJDK=0c705d7b13f4e22611d2da654209f469a6297f26
14 14 
 %description
15 15 
 The OpenJDK package installs java class library and javac java compiler.
16 16
... ... 
@@ -92,6 +92,8 @@ rm -rf %{buildroot}/*
92 92 
 /var/opt/OpenJDK-%{version}-bin/src.zip
93 93
94 94 
 %changelog
95 
+*       Fri Feb 26 2016 Kumar Kaushik <kaushikk@vmware.com> 1.8.0.72-1
96 
+-       Updating Version.
95 97 
 *	Mon Nov 16 2015 Sharath George <sharathg@vmware.com> 1.8.0.51-3
96 98 
 -	Change to use /var/opt path
97 99 
 *	Fri Sep 11 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.0.51-2