Skip to content
This repository was archived by the owner on Dec 19, 2024. It is now read-only.

Commit 31c1b47

Browse files
antoinecoantoineco
committed
Add support for Java 9
1 parent 33285f7 commit 31c1b47

File tree

6 files changed

+144
-14
lines changed

6 files changed

+144
-14
lines changed

‎manifests/alternative/deb.pp‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
update-alternatives --install /usr/bin/jcontrol jcontrol ${install_path}/${longversion}/bin/jcontrol ${priority};
3131
update-alternatives --install /usr/bin/jjs jjs ${install_path}/${longversion}/bin/jjs ${priority} \
3232
--slave /usr/share/man/man1/jjs.1 jjs.1 ${install_path}/${longversion}/man/man1/jjs.1;
33+
update-alternatives --install /usr/bin/jlink jlink ${install_path}/${longversion}/bin/jlink ${priority} \
34+
--slave /usr/share/man/man1/jlink.1 jlink.1 ${install_path}/${longversion}/man/man1/jlink.1;
3335
update-alternatives --install /usr/bin/keytool keytool ${install_path}/${longversion}/bin/keytool ${priority} \
3436
--slave /usr/share/man/man1/keytool.1 keytool.1 ${install_path}/${longversion}/man/man1/keytool.1;
3537
update-alternatives --install /usr/bin/orbd orbd ${install_path}/${longversion}/bin/orbd ${priority} \
@@ -54,6 +56,8 @@
5456
--slave /usr/share/man/man1/extcheck.1 extcheck.1 ${install_path}/${longversion}/man/man1/extcheck.1;
5557
update-alternatives --install /usr/bin/idlj idlj ${install_path}/${longversion}/bin/idlj ${priority} \
5658
--slave /usr/share/man/man1/idlj.1 idlj.1 ${install_path}/${longversion}/man/man1/idlj.1;
59+
update-alternatives --install /usr/bin/jaotc jaotc ${install_path}/${longversion}/bin/jaotc ${priority} \
60+
--slave /usr/share/man/man1/jaotc.1 jaotc.1 ${install_path}/${longversion}/man/man1/jaotc.1;
5761
update-alternatives --install /usr/bin/jar jar ${install_path}/${longversion}/bin/jar ${priority} \
5862
--slave /usr/share/man/man1/jar.1 jar.1 ${install_path}/${longversion}/man/man1/jar.1;
5963
update-alternatives --install /usr/bin/jarsigner jarsigner ${install_path}/${longversion}/bin/jarsigner ${priority} \
@@ -81,18 +85,26 @@
8185
--slave /usr/share/man/man1/jdeps.1 jdeps.1 ${install_path}/${longversion}/man/man1/jdeps.1;
8286
update-alternatives --install /usr/bin/jhat jhat ${install_path}/${longversion}/bin/jhat ${priority} \
8387
--slave /usr/share/man/man1/jhat.1 jhat.1 ${install_path}/${longversion}/man/man1/jhat.1;
88+
update-alternatives --install /usr/bin/jhsdb jhsdb ${install_path}/${longversion}/bin/jhsdb ${priority} \
89+
--slave /usr/share/man/man1/jhsdb.1 jhsdb.1 ${install_path}/${longversion}/man/man1/jhsdb.1;
90+
update-alternatives --install /usr/bin/jimage jimage ${install_path}/${longversion}/bin/jimage ${priority} \
91+
--slave /usr/share/man/man1/jimage.1 jimage.1 ${install_path}/${longversion}/man/man1/jimage.1;
8492
update-alternatives --install /usr/bin/jinfo jinfo ${install_path}/${longversion}/bin/jinfo ${priority} \
8593
--slave /usr/share/man/man1/jinfo.1 jinfo.1 ${install_path}/${longversion}/man/man1/jinfo.1;
8694
update-alternatives --install /usr/bin/jmap jmap ${install_path}/${longversion}/bin/jmap ${priority} \
8795
--slave /usr/share/man/man1/jmap.1 jmap.1 ${install_path}/${longversion}/man/man1/jmap.1;
8896
update-alternatives --install /usr/bin/jmc jmc ${install_path}/${longversion}/bin/jmc ${priority} \
8997
--slave /usr/share/man/man1/jmc.1 jmc.1 ${install_path}/${longversion}/man/man1/jmc.1;
98+
update-alternatives --install /usr/bin/jmod jmod ${install_path}/${longversion}/bin/jmod ${priority} \
99+
--slave /usr/share/man/man1/jmod.1 jmod.1 ${install_path}/${longversion}/man/man1/jmod.1;
90100
update-alternatives --install /usr/bin/jps jps ${install_path}/${longversion}/bin/jps ${priority} \
91101
--slave /usr/share/man/man1/jps.1 jps.1 ${install_path}/${longversion}/man/man1/jps.1;
92102
update-alternatives --install /usr/bin/jrunscript jrunscript ${install_path}/${longversion}/bin/jrunscript ${priority} \
93103
--slave /usr/share/man/man1/jrunscript.1 jrunscript.1 ${install_path}/${longversion}/man/man1/jrunscript.1;
94104
update-alternatives --install /usr/bin/jsadebugd jsadebugd ${install_path}/${longversion}/bin/jsadebugd ${priority} \
95105
--slave /usr/share/man/man1/jsadebugd.1 jsadebugd.1 ${install_path}/${longversion}/man/man1/jsadebugd.1;
106+
update-alternatives --install /usr/bin/jshell jshell ${install_path}/${longversion}/bin/jshell ${priority} \
107+
--slave /usr/share/man/man1/jshell.1 jshell.1 ${install_path}/${longversion}/man/man1/jshell.1;
96108
update-alternatives --install /usr/bin/jstack jstack ${install_path}/${longversion}/bin/jstack ${priority} \
97109
--slave /usr/share/man/man1/jstack.1 jstack.1 ${install_path}/${longversion}/man/man1/jstack.1;
98110
update-alternatives --install /usr/bin/jstat jstat ${install_path}/${longversion}/bin/jstat ${priority} \
@@ -101,6 +113,8 @@
101113
--slave /usr/share/man/man1/jstatd.1 jstatd.1 ${install_path}/${longversion}/man/man1/jstatd.1;
102114
update-alternatives --install /usr/bin/jvisualvm jvisualvm ${install_path}/${longversion}/bin/jvisualvm ${priority} \
103115
--slave /usr/share/man/man1/jvisualvm.1 jvisualvm.1 ${install_path}/${longversion}/man/man1/jvisualvm.1;
116+
update-alternatives --install /usr/bin/jweblauncher jweblauncher ${install_path}/${longversion}/bin/jweblauncher ${priority} \
117+
--slave /usr/share/man/man1/jweblauncher.1 jweblauncher.1 ${install_path}/${longversion}/man/man1/jweblauncher.1;
104118
update-alternatives --install /usr/bin/native2ascii native2ascii ${install_path}/${longversion}/bin/native2ascii ${priority} \
105119
--slave /usr/share/man/man1/native2ascii.1 native2ascii.1 ${install_path}/${longversion}/man/man1/native2ascii.1;
106120
update-alternatives --install /usr/bin/rmic rmic ${install_path}/${longversion}/bin/rmic ${priority} \
@@ -120,12 +134,20 @@
120134
default : {
121135
exec { "add java alternative ${oracle_java::version_final}":
122136
command => "update-alternatives --install /usr/bin/java java ${install_path}/${longversion}/bin/java ${priority} \
123-
--slave /usr/share/man/man1/java.1 java.1 ${install_path}/${longversion}/man/man1/java.1;
137+
--slave /usr/share/man/man1/java.1 java.1 ${install_path}/${longversion}/man/man1/java.1;
138+
update-alternatives --install /usr/bin/appletviewer appletviewer ${install_path}/${longversion}/bin/appletviewer ${priority} \
139+
--slave /usr/share/man/man1/appletviewer.1 appletviewer.1 ${install_path}/${longversion}/man/man1/appletviewer.1;
124140
update-alternatives --install /usr/bin/javaws javaws ${install_path}/${longversion}/bin/javaws ${priority} \
125141
--slave /usr/share/man/man1/javaws.1 javaws.1 ${install_path}/${longversion}/man/man1/javaws.1;
126142
update-alternatives --install /usr/bin/jcontrol jcontrol ${install_path}/${longversion}/bin/jcontrol ${priority};
143+
update-alternatives --install /usr/bin/idlj idlj ${install_path}/${longversion}/bin/idlj ${priority} \
144+
--slave /usr/share/man/man1/idlj.1 idlj.1 ${install_path}/${longversion}/man/man1/idlj.1;
127145
update-alternatives --install /usr/bin/jjs jjs ${install_path}/${longversion}/bin/jjs${priority} \
128146
--slave /usr/share/man/man1/jjs.1 jjs.1 ${install_path}/${longversion}/man/man1/jjs.1;
147+
update-alternatives --install /usr/bin/jrunscript jrunscript ${install_path}/${longversion}/bin/jrunscript ${priority} \
148+
--slave /usr/share/man/man1/jrunscript.1 jrunscript.1 ${install_path}/${longversion}/man/man1/jrunscript.1;
149+
update-alternatives --install /usr/bin/jweblauncher jweblauncher ${install_path}/${longversion}/bin/jweblauncher ${priority} \
150+
--slave /usr/share/man/man1/jweblauncher.1 jweblauncher.1 ${install_path}/${longversion}/man/man1/jweblauncher.1;
129151
update-alternatives --install /usr/bin/keytool keytool ${install_path}/${longversion}/bin/keytool ${priority} \
130152
--slave /usr/share/man/man1/keytool.1 keytool.1 ${install_path}/${longversion}/man/man1/keytool.1;
131153
update-alternatives --install /usr/bin/orbd orbd ${install_path}/${longversion}/bin/orbd ${priority} \

‎manifests/alternative/rpm.pp‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
--slave /usr/bin/appletviewer appletviewer ${install_path}/${longversion}/bin/appletviewer \
2828
--slave /usr/bin/extcheck extcheck ${install_path}/${longversion}/bin/extcheck \
2929
--slave /usr/bin/idlj idlj ${install_path}/${longversion}/bin/idlj \
30+
--slave /usr/bin/jaotc jaotc ${install_path}/${longversion}/bin/jaotc \
3031
--slave /usr/bin/jar jar ${install_path}/${longversion}/bin/jar \
3132
--slave /usr/bin/jarsigner jarsigner ${install_path}/${longversion}/bin/jarsigner \
3233
--slave /usr/bin/javac javac ${install_path}/${longversion}/bin/javac \
@@ -41,19 +42,26 @@
4142
--slave /usr/bin/jconsole jconsole ${install_path}/${longversion}/bin/jconsole \
4243
--slave /usr/bin/jcontrol jcontrol ${install_path}/${longversion}/bin/jcontrol \
4344
--slave /usr/bin/jdb jdb ${install_path}/${longversion}/bin/jdb \
45+
--slave /usr/bin/jdeprscan jdeprscan ${install_path}/${longversion}/bin/jdeprscan \
4446
--slave /usr/bin/jdeps jdeps ${install_path}/${longversion}/bin/jdeps \
4547
--slave /usr/bin/jhat jhat ${install_path}/${longversion}/bin/jhat \
48+
--slave /usr/bin/jhsdb jhsdb ${install_path}/${longversion}/bin/jhsdb \
49+
--slave /usr/bin/jimage jimage ${install_path}/${longversion}/bin/jimage \
4650
--slave /usr/bin/jinfo jinfo ${install_path}/${longversion}/bin/jinfo \
4751
--slave /usr/bin/jjs jjs ${install_path}/${longversion}/bin/jjs \
52+
--slave /usr/bin/jlink jlink ${install_path}/${longversion}/bin/jlink \
4853
--slave /usr/bin/jmap jmap ${install_path}/${longversion}/bin/jmap \
4954
--slave /usr/bin/jmc jmc ${install_path}/${longversion}/bin/jmc \
55+
--slave /usr/bin/jmod jmod ${install_path}/${longversion}/bin/jmod \
5056
--slave /usr/bin/jps jps ${install_path}/${longversion}/bin/jps \
5157
--slave /usr/bin/jrunscript jrunscript ${install_path}/${longversion}/bin/jrunscript \
5258
--slave /usr/bin/jsadebugd jsadebugd ${install_path}/${longversion}/bin/jsadebugd \
59+
--slave /usr/bin/jshell jshell ${install_path}/${longversion}/bin/jshell \
5360
--slave /usr/bin/jstack jstack ${install_path}/${longversion}/bin/jstack \
5461
--slave /usr/bin/jstat jstat ${install_path}/${longversion}/bin/jstat \
5562
--slave /usr/bin/jstatd jstatd ${install_path}/${longversion}/bin/jstatd \
5663
--slave /usr/bin/jvisualvm jvisualvm ${install_path}/${longversion}/bin/jvisualvm \
64+
--slave /usr/bin/jweblauncher jweblauncher ${install_path}/${longversion}/bin/jweblauncher \
5765
--slave /usr/bin/keytool keytool ${install_path}/${longversion}/bin/keytool \
5866
--slave /usr/bin/native2ascii native2ascii ${install_path}/${longversion}/bin/native2ascii \
5967
--slave /usr/bin/orbd orbd ${install_path}/${longversion}/bin/orbd \
@@ -73,6 +81,7 @@
7381
--slave /usr/share/man/man1/appletviewer.1 appletviewer.1 ${install_path}/${longversion}/man/man1/appletviewer.1 \
7482
--slave /usr/share/man/man1/extcheck.1 extcheck.1 ${install_path}/${longversion}/man/man1/extcheck.1 \
7583
--slave /usr/share/man/man1/idlj.1 idlj.1 ${install_path}/${longversion}/man/man1/idlj.1 \
84+
--slave /usr/share/man/man1/jaotc.1 jaotc.1 ${install_path}/${longversion}/man/man1/jaotc.1 \
7685
--slave /usr/share/man/man1/jar.1 jar.1 ${install_path}/${longversion}/man/man1/jar.1 \
7786
--slave /usr/share/man/man1/jarsigner.1 jarsigner.1 ${install_path}/${longversion}/man/man1/jarsigner.1 \
7887
--slave /usr/share/man/man1/java.1 java.1 ${install_path}/${longversion}/man/man1/java.1 \
@@ -86,19 +95,26 @@
8695
--slave /usr/share/man/man1/jcmd.1 jcmd.1 ${install_path}/${longversion}/man/man1/jcmd.1 \
8796
--slave /usr/share/man/man1/jconsole.1 jconsole.1 ${install_path}/${longversion}/man/man1/jconsole.1 \
8897
--slave /usr/share/man/man1/jdb.1 jdb.1 ${install_path}/${longversion}/man/man1/jdb.1 \
98+
--slave /usr/share/man/man1/jdeprscan.1 jdeprscan.1 ${install_path}/${longversion}/man/man1/jdeprscan.1 \
8999
--slave /usr/share/man/man1/jdeps.1 jdeps.1 ${install_path}/${longversion}/man/man1/jdeps.1 \
90100
--slave /usr/share/man/man1/jhat.1 jhat.1 ${install_path}/${longversion}/man/man1/jhat.1 \
101+
--slave /usr/share/man/man1/jhsdb.1 jhsdb.1 ${install_path}/${longversion}/man/man1/jhsdb.1 \
102+
--slave /usr/share/man/man1/jimage.1 jimage.1 ${install_path}/${longversion}/man/man1/jimage.1 \
91103
--slave /usr/share/man/man1/jinfo.1 jinfo.1 ${install_path}/${longversion}/man/man1/jinfo.1 \
92104
--slave /usr/share/man/man1/jjs.1 jjs.1 ${install_path}/${longversion}/man/man1/jjs.1 \
105+
--slave /usr/share/man/man1/jlink.1 jlink.1 ${install_path}/${longversion}/man/man1/jlink.1 \
93106
--slave /usr/share/man/man1/jmap.1 jmap.1 ${install_path}/${longversion}/man/man1/jmap.1 \
94107
--slave /usr/share/man/man1/jmc.1 jmc.1 ${install_path}/${longversion}/man/man1/jmc.1 \
108+
--slave /usr/share/man/man1/jmod.1 jmod.1 ${install_path}/${longversion}/man/man1/jmod.1 \
95109
--slave /usr/share/man/man1/jps.1 jps.1 ${install_path}/${longversion}/man/man1/jps.1 \
96110
--slave /usr/share/man/man1/jrunscript.1 jrunscript.1 ${install_path}/${longversion}/man/man1/jrunscript.1 \
97111
--slave /usr/share/man/man1/jsadebugd.1 jsadebugd.1 ${install_path}/${longversion}/man/man1/jsadebugd.1 \
112+
--slave /usr/share/man/man1/jshell.1 jshell.1 ${install_path}/${longversion}/man/man1/jshell.1 \
98113
--slave /usr/share/man/man1/jstack.1 jstack.1 ${install_path}/${longversion}/man/man1/jstack.1 \
99114
--slave /usr/share/man/man1/jstat.1 jstat.1 ${install_path}/${longversion}/man/man1/jstat.1 \
100115
--slave /usr/share/man/man1/jstatd.1 jstatd.1 ${install_path}/${longversion}/man/man1/jstatd.1 \
101116
--slave /usr/share/man/man1/jvisualvm.1 jvisualvm.1 ${install_path}/${longversion}/man/man1/jvisualvm.1 \
117+
--slave /usr/share/man/man1/jweblauncher.1 jweblauncher.1 ${install_path}/${longversion}/man/man1/jweblauncher.1 \
102118
--slave /usr/share/man/man1/keytool.1 keytool.1 ${install_path}/${longversion}/man/man1/keytool.1 \
103119
--slave /usr/share/man/man1/native2ascii.1 native2ascii.1 ${install_path}/${longversion}/man/man1/native2ascii.1 \
104120
--slave /usr/share/man/man1/orbd.1 orbd.1 ${install_path}/${longversion}/man/man1/orbd.1 \
@@ -120,9 +136,13 @@
120136
default : {
121137
exec { "add java alternative ${oracle_java::version_final}":
122138
command => "update-alternatives --install /usr/bin/java java ${install_path}/${longversion}/bin/java ${priority} \
139+
--slave /usr/bin/appletviewer appletviewer ${install_path}/${longversion}/bin/appletviewer \
140+
--slave /usr/bin/idlj idlj ${install_path}/${longversion}/bin/idlj \
123141
--slave /usr/bin/javaws javaws ${install_path}/${longversion}/bin/javaws \
124142
--slave /usr/bin/jcontrol jcontrol ${install_path}/${longversion}/bin/jcontrol \
125143
--slave /usr/bin/jjs jjs ${install_path}/${longversion}/bin/jjs \
144+
--slave /usr/bin/jrunscript jrunscript ${install_path}/${longversion}/bin/jrunscript \
145+
--slave /usr/bin/jweblauncher jweblauncher ${install_path}/${longversion}/bin/jweblauncher \
126146
--slave /usr/bin/keytool keytool ${install_path}/${longversion}/bin/keytool \
127147
--slave /usr/bin/orbd orbd ${install_path}/${longversion}/bin/orbd \
128148
--slave /usr/bin/pack200 pack200 ${install_path}/${longversion}/bin/pack200 \
@@ -132,9 +152,13 @@
132152
--slave /usr/bin/servertool servertool ${install_path}/${longversion}/bin/servertool \
133153
--slave /usr/bin/tnameserv tnameserv ${install_path}/${longversion}/bin/tnameserv \
134154
--slave /usr/bin/unpack200 unpack200 ${install_path}/${longversion}/bin/unpack200 \
155+
--slave /usr/share/man/man1/appletviewer.1 appletviewer.1 ${install_path}/${longversion}/man/man1/appletviewer.1 \
156+
--slave /usr/share/man/man1/idlj.1 idlj.1 ${install_path}/${longversion}/man/man1/idlj.1 \
135157
--slave /usr/share/man/man1/java.1 java.1 ${install_path}/${longversion}/man/man1/java.1 \
136158
--slave /usr/share/man/man1/javaws.1 javaws.1 ${install_path}/${longversion}/man/man1/javaws.1 \
137159
--slave /usr/share/man/man1/jjs.1 jjs.1 ${install_path}/${longversion}/man/man1/jjs.1 \
160+
--slave /usr/share/man/man1/jrunscript.1 jrunscript.1 ${install_path}/${longversion}/man/man1/jrunscript.1 \
161+
--slave /usr/share/man/man1/jweblauncher.1 jweblauncher.1 ${install_path}/${longversion}/man/man1/jweblauncher.1 \
138162
--slave /usr/share/man/man1/keytool.1 keytool.1 ${install_path}/${longversion}/man/man1/keytool.1 \
139163
--slave /usr/share/man/man1/orbd.1 orbd.1 ${install_path}/${longversion}/man/man1/orbd.1 \
140164
--slave /usr/share/man/man1/pack200.1 pack200.1 ${install_path}/${longversion}/man/man1/pack200.1 \

‎manifests/checksums.pp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010

1111
if !$oracle_java::checksum {
1212
case $oracle_java::filename_real {
13+
# 9
14+
'jdk-9_linux-x64_bin.rpm' : { $md5checksum = '5f2c490f08d6da7ce8807cdeea2f282d' }
15+
'jdk-9_linux-x64_bin.tar.gz' : { $md5checksum = 'abe68b8ba280d11cb8f937410543750c' }
16+
'jre-9_linux-x64_bin.rpm' : { $md5checksum = '3d0bd97925fa3d68746c2849c6aa1d2b' }
17+
'jre-9_linux-x64_bin.tar.gz' : { $md5checksum = '113a784957235eb78ef418f89e3e6b88' }
1318
# 8u144
1419
'jdk-8u144-linux-i586.rpm' : { $md5checksum = 'eb35a77bcbd2466d9c96142e5a0d9b87' }
1520
'jdk-8u144-linux-i586.tar.gz' : { $md5checksum = '13d771707f326b02e2497c99e0a2ca37' }

0 commit comments

Comments
 (0)