Updated: openj9_14.0.1_7_openj9-0.20.0

2 files changed, 60 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca4db79c57df..461aedaf6882 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,24 @@
 pkgbase = jdk-openj9-bin
-	pkgdesc = Eclipse (former IBM) OpenJ9 with latest GA release of openjdk (jdk13)
-	pkgver = 13.0.2b8_openj9_0.18.0
-	pkgrel = 4
-	url = https://adoptopenjdk.net/index.html?variant=openjdk13&jvmVariant=openj9
+	pkgdesc = Eclipse (former IBM) OpenJ9 with openjdk14
+	pkgver = 14.0.1b7_openj9_0.20.0
+	pkgrel = 1
+	url = https://adoptopenjdk.net/index.html?variant=openjdk14&jvmVariant=openj9
 	arch = x86_64
 	license = GPL2
-	depends = ca-certificates-utils
 	depends = java-environment-common
-	depends = java-runtime-common
+	depends = ca-certificates-utils
 	depends = nss
-	provides = java-environment=13
-	provides = java-environment-openjdk=13
-	provides = java-runtime=13
-	provides = java-runtime-openjdk=13
-	provides = java-runtime-headless=13
-	provides = java-runtime-headless-openjdk=13
-	conflicts = jdk13-openj9-bin
-	conflicts = jdk13-openj9
+	provides = java-environment=14
+	provides = java-environment-openjdk=14
+	provides = java-runtime=14
+	provides = java-runtime-openjdk=14
+	provides = java-runtime-headless=14
+	provides = java-runtime-headless-openjdk=14
+	conflicts = jdk14-openj9-bin
+	conflicts = jdk14-openj9
 	options = !strip
-	source = https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz
-	sha256sums = aeecf6d30d0c847db81d07793cf97e5dc44890c29366d7d9f8f9f397f6c52590
+	source = https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.1%2B7_openj9-0.20.0/OpenJDK14U-jdk_x64_linux_openj9_14.0.1_7_openj9-0.20.0.tar.gz
+	sha256sums = 2350592f4b0db1439fdd48d4fa7e05b270f271dcc79b2c7f174489ee2f6b14c1
 
 pkgname = jdk-openj9-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 7ac82463c8f5..161fad33c240 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,61 @@
-# Maintainer: M A <morealaz at gmail dot com>
+# Maintainer: Felix Golatofski <contact@xdfr.de>
+# Contributor: M A <morealaz at gmail dot com>
+# Contributor: Mariell Hoversholm <proximyst at proximyst dot com>
+# Contributor: Schrodinger Zhu <i at zhuyi dot fan>
+# Contributor: Davide Depau <davide at depau dot eu>
+# Contributor: Mohammadreza Abdollahzadeh <morealaz at gmail dot com>
 
 pkgname=jdk-openj9-bin
-_jdkver=13
-_openj9ver=0.18.0
-_majorver=${_jdkver}.0.2
-_buildvershort=8
+_jdkver=14
+_jdkminor=0
+_jdkpatch=1
+_jdkfullver=${_jdkver}.${_jdkminor}.${_jdkpatch}
+_openj9ver=0.20.0
+_buildvershort=7
 _buildver=${_buildvershort}_openj9-${_openj9ver}
-pkgver=${_majorver}b${_buildver//-/_}
-pkgrel=4
-pkgdesc="Eclipse (former IBM) OpenJ9 with latest GA release of openjdk (jdk${_jdkver})"
+pkgver=${_jdkfullver}b${_buildver//-/_}
+pkgrel=1
+pkgdesc="Eclipse (former IBM) OpenJ9 with openjdk${_jdkver}"
 arch=('x86_64')
 url="https://adoptopenjdk.net/index.html?variant=openjdk${_jdkver}&jvmVariant=openj9"
 license=('GPL2')
-depends=('ca-certificates-utils' 'java-environment-common' 'java-runtime-common' 'nss')
+depends=('java-environment-common' 'ca-certificates-utils' 'nss')
 provides=(
-    "java-environment=${_jdkver}"
-    "java-environment-openjdk=${_jdkver}"
-    "java-runtime=${_jdkver}"
-    "java-runtime-openjdk=${_jdkver}"
-    "java-runtime-headless=${_jdkver}"
-    "java-runtime-headless-openjdk=${_jdkver}"
+  "java-environment=${_jdkver}"
+  "java-environment-openjdk=${_jdkver}"
+  "java-runtime=${_jdkver}"
+  "java-runtime-openjdk=${_jdkver}"
+  "java-runtime-headless=${_jdkver}"
+  "java-runtime-headless-openjdk=${_jdkver}"
 )
 conflicts=("jdk${_jdkver}-openj9-bin" "jdk${_jdkver}-openj9")
 options=(!strip)
-source=("https://github.com/AdoptOpenJDK/openjdk${_jdkver}-binaries/releases/download/jdk-${_majorver}%2B${_buildver}/OpenJDK${_jdkver}U-jdk_x64_linux_openj9_${_majorver}_${_buildver}.tar.gz")
-sha256sums=('aeecf6d30d0c847db81d07793cf97e5dc44890c29366d7d9f8f9f397f6c52590')
+source=("https://github.com/AdoptOpenJDK/openjdk${_jdkver}-binaries/releases/download/jdk-${_jdkfullver}%2B${_buildver}/OpenJDK${_jdkver}U-jdk_x64_linux_openj9_${_jdkfullver}_${_buildver}.tar.gz")
+
+sha256sums=('2350592f4b0db1439fdd48d4fa7e05b270f271dcc79b2c7f174489ee2f6b14c1')
 
 _jvmdir=usr/lib/jvm/java-${_jdkver}-j9
 
 package() {
-    # Install
-    install -d "${pkgdir}/${_jvmdir}"
-    cd jdk-${_majorver}+${_buildvershort}
-    cp -a bin demo include jmods lib release "${pkgdir}/${_jvmdir}/"
-    # Link JKS keystore from ca-certificates-utils
-    rm -f "${pkgdir}/${_jvmdir}/lib/security/cacerts"
-    ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/lib/security/cacerts"
-    # Legal
-    install -d "${pkgdir}/usr/share/licenses/java${_jdkver}-j9"
-    cp -a legal "${pkgdir}/usr/share/licenses/java${_jdkver}-j9/"
-    ln -s /usr/share/licenses/java${_jdkver}-j9 "${pkgdir}/${_jvmdir}/legal"
-    # Conf
-    install -d "${pkgdir}/etc"
-    cp -r conf "${pkgdir}/etc/java${_jdkver}-j9"
-    ln -s /etc/java${_jdkver}-j9 "${pkgdir}/${_jvmdir}/conf"
-    # Man pages
-    for f in man/man1/*; do
-        install -Dm 644 "${f}" "${pkgdir}/usr/share/${f/\.1/-openjdk${_jdkver}-j9.1}"
-    done
-    ln -s /usr/share/man "${pkgdir}/${_jvmdir}/man"
+  # Install
+  install -d "${pkgdir}/${_jvmdir}"
+  cd jdk-${_jdkfullver}+${_buildvershort}
+  cp -a bin include jmods lib release "${pkgdir}/${_jvmdir}/"
+  # Link JKS keystore from ca-certificates-utils
+  rm -f "${pkgdir}/${_jvmdir}/lib/security/cacerts"
+  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/lib/security/cacerts"
+  # Legal
+  install -d "${pkgdir}/usr/share/licenses/java${_jdkver}-j9"
+  cp -a legal "${pkgdir}/usr/share/licenses/java${_jdkver}-j9/"
+  ln -s /usr/share/licenses/java${_jdkver}-j9 "${pkgdir}/${_jvmdir}/legal"
+  # Conf
+  install -d "${pkgdir}/etc"
+  cp -r conf "${pkgdir}/etc/java${_jdkver}-j9"
+  ln -s /etc/java${_jdkver}-j9 "${pkgdir}/${_jvmdir}/conf"
+  # Man pages
+  for f in man/man1/*; do
+    install -Dm 644 "${f}" "${pkgdir}/usr/share/${f/\.1/-openjdk14-j9.1}"
+  done
+  ln -s /usr/share/man "${pkgdir}/${_jvmdir}/man"
 }
 # vim:set ts=4 sw=4 et: