Updated to version 14

6 files changed, 34 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 559ae7a35b5f..ccd00caabd8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,28 @@
 pkgbase = jdk
 	pkgdesc = Oracle Java Development Kit
-	pkgver = 13.0.2
+	pkgver = 14
 	pkgrel = 1
 	url = https://www.oracle.com/java/
 	install = jdk.install
 	arch = x86_64
 	license = custom
 	depends = java-environment-common
-	depends = jre>=13
-	depends = jre<14
+	depends = jre>=14
+	depends = jre<15
 	depends = zlib
 	depends = hicolor-icon-theme
-	provides = java-environment=13
-	provides = java-environment-jdk=13
-	source = https://download.oracle.com/otn-pub/java/jdk/13.0.2+8/d4173c853231432d94f001e99d882ca7/jdk-13.0.2_linux-x64_bin.tar.gz
+	provides = java-environment=14
+	provides = java-environment-jdk=14
+	source = https://download.oracle.com/otn-pub/java/jdk/14+36/076bab302c7b4508975440c56f6cc26a/jdk-14_linux-x64_bin.tar.gz
 	source = java.desktop
 	source = jconsole.desktop
 	source = jshell.desktop
 	source = java_16.png
 	source = java_48.png
-	sha256sums = e2214a723d611b4a781641061a24ca6024f2c57dbd9f75ca9d857cad87d9475f
-	sha256sums = 91c70275116cdfea1a0459fe76dd0d916bfecd12faafb8fd1bcf9b7306e85cb6
-	sha256sums = b9ad3acc8ba7ead6e8374f590588bb136d3a0e6d80e80a048d75ff63ca2325d0
-	sha256sums = 34f05e1ce1a33ec65d94388428ccbad2a441460f9cc7b42a69dbc75255ec92bf
+	sha256sums = 4639bbaecc9cc606f1a4b99fda1efcaefcbf57a7025b3828b095093a6c866afd
+	sha256sums = 4b38647428fc576f423197104a5721c0a07c825196dad426359c78fd19d1f823
+	sha256sums = b517c7883a81a9951b3b1ddae0427619212808324482b5f02a9b7810328c2ce6
+	sha256sums = 3061d6d325067b6a0e7f900ee699322741b53fd6da200209844edc54530e2bef
 	sha256sums = d27fec1d74f7a3081c3d175ed184d15383666dc7f02cc0f7126f11549879c6ed
 	sha256sums = 7cf8ca096e6d6e425b3434446b0835537d0fc7fe64b3ccba7a55f7bd86c7e176
 
diff --git a/PKGBUILD b/PKGBUILD
index ac80cea3dc70..78a8b2fbedde 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
-# Maintainer : Daniel Bermond < gmail-com: danielbermond >
+# Maintainer : Daniel Bermond <dbermond@archlinux.org>
 # Contributor: Det <nimetonmaili g-mail>
 
 pkgname=jdk
-pkgver=13.0.2
-_build=8
-_hash=d4173c853231432d94f001e99d882ca7
+pkgver=14
+_build=36
+_hash=076bab302c7b4508975440c56f6cc26a
 _majver="${pkgver%%.*}"
 _next="$((_majver + 1))"
 pkgrel=1
@@ -21,10 +21,10 @@ source=("https://download.oracle.com/otn-pub/java/jdk/${pkgver}+${_build}/${_has
         'jshell.desktop'
         'java_16.png'
         'java_48.png')
-sha256sums=('e2214a723d611b4a781641061a24ca6024f2c57dbd9f75ca9d857cad87d9475f'
-            '91c70275116cdfea1a0459fe76dd0d916bfecd12faafb8fd1bcf9b7306e85cb6'
-            'b9ad3acc8ba7ead6e8374f590588bb136d3a0e6d80e80a048d75ff63ca2325d0'
-            '34f05e1ce1a33ec65d94388428ccbad2a441460f9cc7b42a69dbc75255ec92bf'
+sha256sums=('4639bbaecc9cc606f1a4b99fda1efcaefcbf57a7025b3828b095093a6c866afd'
+            '4b38647428fc576f423197104a5721c0a07c825196dad426359c78fd19d1f823'
+            'b517c7883a81a9951b3b1ddae0427619212808324482b5f02a9b7810328c2ce6'
+            '3061d6d325067b6a0e7f900ee699322741b53fd6da200209844edc54530e2bef'
             'd27fec1d74f7a3081c3d175ed184d15383666dc7f02cc0f7126f11549879c6ed'
             '7cf8ca096e6d6e425b3434446b0835537d0fc7fe64b3ccba7a55f7bd86c7e176')
             
@@ -40,8 +40,7 @@ package() {
     
     # bin
     cp -a bin "${pkgdir}/${_jvmdir}"
-    rm "${pkgdir}/${_jvmdir}/bin/"{java,jjs,jrunscript,keytool,pack200}
-    rm "${pkgdir}/${_jvmdir}/bin/"{rmid,rmiregistry,unpack200}
+    rm "${pkgdir}/${_jvmdir}/bin/"{java,jjs,jpackage,jrunscript,keytool,rmid,rmiregistry}
     
     # libs
     install -D -m644 lib/ct.sym       -t "${pkgdir}/${_jvmdir}/lib"
@@ -67,8 +66,7 @@ package() {
     do
         install -D -m644 "$_file" "${pkgdir}/usr/share/${_file%.1}-jdk${_majver}.1"
     done < <(find man/man1 -type f -print0)
-    rm "${pkgdir}/usr/share/man/man1/"{java,jjs,jrunscript,keytool,pack200}-jdk"${_majver}".1
-    rm "${pkgdir}/usr/share/man/man1/"{rmid,rmiregistry,unpack200}-jdk"${_majver}".1
+    rm "${pkgdir}/usr/share/man/man1/"{java,jjs,jpackage,jrunscript,keytool,rmid,rmiregistry}-jdk"${_majver}".1
     
     # legal/licenses
     cp -a legal/* "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/java.desktop b/java.desktop
index 2416be9293b1..49de0e4f32e4 100644
--- a/java.desktop
+++ b/java.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
-Name=Oracle Java 13 Runtime
-Comment=Oracle Java 13 Runtime
+Name=Oracle Java 14 Runtime
+Comment=Oracle Java 14 Runtime
 Keywords=java;runtime
-Exec=/usr/lib/jvm/java-13-jdk/bin/java -jar
+Exec=/usr/lib/jvm/java-14-jdk/bin/java -jar
 Terminal=false
 Type=Application
-Icon=java13-jdk
+Icon=java14-jdk
 MimeType=application/x-java-archive;application/java-archive;application/x-jar;
 NoDisplay=true
diff --git a/jconsole.desktop b/jconsole.desktop
index b0b85d728b46..fdbd534ad8cf 100644
--- a/jconsole.desktop
+++ b/jconsole.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=Oracle Java 13 Console
-Comment=Oracle Java 13 Monitoring and Management Console
+Name=Oracle Java 14 Console
+Comment=Oracle Java 14 Monitoring and Management Console
 Keywords=java;console;monitoring
-Exec=/usr/lib/jvm/java-13-jdk/bin/jconsole
+Exec=/usr/lib/jvm/java-14-jdk/bin/jconsole
 Terminal=false
 Type=Application
-Icon=java13-jdk
+Icon=java14-jdk
 Categories=Application;System;
diff --git a/jdk.install b/jdk.install
index a3b72260fd8e..8fdeedcb65d1 100644
--- a/jdk.install
+++ b/jdk.install
@@ -1,4 +1,4 @@
-THIS_JDK='java-13-jdk'
+THIS_JDK='java-14-jdk'
 
 fix_default() {
   if [ ! -x /usr/bin/java ]; then
@@ -42,7 +42,7 @@ post_upgrade() {
 
 pre_remove() {
   if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then
-    # Check JRE13 is still available
+    # Check JRE14 is still available
     if [ -x /usr/lib/jvm/${THIS_JDK}/bin/java ]; then
       /usr/bin/archlinux-java unset
     fi
diff --git a/jshell.desktop b/jshell.desktop
index 0f35b827506f..4a943cde4f5b 100644
--- a/jshell.desktop
+++ b/jshell.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=Oracle Java 13 Shell
-Comment=Oracle Java 13 Shell
+Name=Oracle Java 14 Shell
+Comment=Oracle Java 14 Shell
 Keywords=java;shell
-Exec=/usr/lib/jvm/java-13-jdk/bin/jshell
+Exec=/usr/lib/jvm/java-14-jdk/bin/jshell
 Terminal=true
 Type=Application
-Icon=java13-jdk
+Icon=java14-jdk
 Categories=Application;System;