summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lass2020-09-18 20:22:47 +0200
committerMichael Lass2020-09-18 20:22:47 +0200
commita714cbc14a69a0e819a8bf48a4dac10ffddda03e (patch)
tree98d7cc1df4a5574bc30b4683c8162de145bfbb96
parent55d1f143b29af37b16b6a902a990d5b402fd4af6 (diff)
downloadaur-a714cbc14a69a0e819a8bf48a4dac10ffddda03e.tar.gz
Update to 15+36
-rw-r--r--.SRCINFO42
-rw-r--r--PKGBUILD14
-rw-r--r--freedesktop-java.desktop6
-rw-r--r--freedesktop-jconsole.desktop6
-rw-r--r--freedesktop-jshell.desktop6
-rw-r--r--install_jdk-adoptopenjdk.sh2
6 files changed, 38 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index faffb0db6cfa..0fcd8d525259 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = jdk-adoptopenjdk
- pkgdesc = OpenJDK Java 14 development kit (AdoptOpenJDK build)
- pkgver = 14.0.2.u12
+ pkgdesc = OpenJDK Java 15 development kit (AdoptOpenJDK build)
+ pkgver = 15.u36
pkgrel = 1
url = https://adoptopenjdk.net/
install = install_jdk-adoptopenjdk.sh
@@ -14,20 +14,20 @@ pkgbase = jdk-adoptopenjdk
depends = alsa-lib
optdepends = gtk2: for the Gtk+ 2 look and feel
optdepends = gtk3: for the Gtk+ 3 look and feel
- provides = java-runtime-headless=14
- provides = java-runtime-headless-openjdk=14
- provides = jre14-openjdk-headless=14.0.2.u12
- provides = jre-openjdk-headless=14.0.2.u12
- provides = java-runtime=14
- provides = java-runtime-openjdk=14
- provides = jre14-openjdk=14.0.2.u12
- provides = jre-openjdk=14.0.2.u12
- provides = java-environment=14
- provides = java-environment-openjdk=14
- provides = jdk14-openjdk=14.0.2.u12
- provides = jdk-openjdk=14.0.2.u12
- provides = openjdk14-src=14.0.2.u12
- provides = openjdk-src=14.0.2.u12
+ provides = java-runtime-headless=15
+ provides = java-runtime-headless-openjdk=15
+ provides = jre15-openjdk-headless=15.u36
+ provides = jre-openjdk-headless=15.u36
+ provides = java-runtime=15
+ provides = java-runtime-openjdk=15
+ provides = jre15-openjdk=15.u36
+ provides = jre-openjdk=15.u36
+ provides = java-environment=15
+ provides = java-environment-openjdk=15
+ provides = jdk15-openjdk=15.u36
+ provides = jdk-openjdk=15.u36
+ provides = openjdk15-src=15.u36
+ provides = openjdk-src=15.u36
backup = etc/jdk-adoptopenjdk/logging.properties
backup = etc/jdk-adoptopenjdk/management/jmxremote.access
backup = etc/jdk-adoptopenjdk/management/jmxremote.password.template
@@ -43,14 +43,14 @@ pkgbase = jdk-adoptopenjdk
backup = etc/jdk-adoptopenjdk/security/policy/unlimited/default_local.policy
backup = etc/jdk-adoptopenjdk/security/policy/unlimited/default_US_export.policy
backup = etc/jdk-adoptopenjdk/sound.properties
- source = https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_x64_linux_hotspot_14.0.2_12.tar.gz
+ source = https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_x64_linux_hotspot_15_36.tar.gz
source = freedesktop-java.desktop
source = freedesktop-jconsole.desktop
source = freedesktop-jshell.desktop
- sha256sums = 7d5ee7e06909b8a99c0d029f512f67b092597aa5b0e78c109bd59405bbfa74fe
- sha256sums = e5853506c880f0c68372a0be0acfd8852dd1a1d414352155c1cd4ad49ce3c248
- sha256sums = a645b7079c572dabe18f2ea6c2cbdef00866b8b8e22a82530858ea49e2cf8343
- sha256sums = b8705290f505cb368c204eb02c179fc1b10e70554903fb04b7dbe809dd1bed01
+ sha256sums = c198593d1b5188ee3570e2ca33c3bc004aaefbda2c11e68e58ae7296cf5c3982
+ sha256sums = b221b6b040fd73e081fe679c106726309cdab8977bb4be25986ddda7068ccb4f
+ sha256sums = dafd84555287f16a59d4c7603167efc2a64a632780b6d8de109e75d6aa29782e
+ sha256sums = 4f05bf04f6397e9586881951116b3a12ae8336142e8be0caf196eaee1444c03f
pkgname = jdk-adoptopenjdk
diff --git a/PKGBUILD b/PKGBUILD
index a3422ca7d98c..1baed7770953 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,9 +7,9 @@
# This PKGBUILD is maintained on github:
# https://github.com/michaellass/AUR
-_majorver=14
-_completever=14.0.2
-_updatever=12
+_majorver=15
+_completever=15
+_updatever=36
pkgrel=1
pkgver=${_completever}.u${_updatever}
_tag_ver=${_completever}+${_updatever}
@@ -58,10 +58,10 @@ source=(https://github.com/AdoptOpenJDK/openjdk${_majorver}-binaries/releases/do
freedesktop-java.desktop
freedesktop-jconsole.desktop
freedesktop-jshell.desktop)
-sha256sums=('7d5ee7e06909b8a99c0d029f512f67b092597aa5b0e78c109bd59405bbfa74fe'
- 'e5853506c880f0c68372a0be0acfd8852dd1a1d414352155c1cd4ad49ce3c248'
- 'a645b7079c572dabe18f2ea6c2cbdef00866b8b8e22a82530858ea49e2cf8343'
- 'b8705290f505cb368c204eb02c179fc1b10e70554903fb04b7dbe809dd1bed01')
+sha256sums=('c198593d1b5188ee3570e2ca33c3bc004aaefbda2c11e68e58ae7296cf5c3982'
+ 'b221b6b040fd73e081fe679c106726309cdab8977bb4be25986ddda7068ccb4f'
+ 'dafd84555287f16a59d4c7603167efc2a64a632780b6d8de109e75d6aa29782e'
+ '4f05bf04f6397e9586881951116b3a12ae8336142e8be0caf196eaee1444c03f')
_jvmdir=/usr/lib/jvm/java-${_majorver}-adoptopenjdk
_jdkdir=jdk-${_tag_ver}
diff --git a/freedesktop-java.desktop b/freedesktop-java.desktop
index b0943bb25a9d..871643afe4ef 100644
--- a/freedesktop-java.desktop
+++ b/freedesktop-java.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
-Name=AdoptOpenJDK Java 14 Runtime
-Comment=AdoptOpenJDK Java 14 Runtime
+Name=AdoptOpenJDK Java 15 Runtime
+Comment=AdoptOpenJDK Java 15 Runtime
Keywords=java;runtime
-Exec=/usr/lib/jvm/java-14-adoptopenjdk/bin/java -jar
+Exec=/usr/lib/jvm/java-15-adoptopenjdk/bin/java -jar
Terminal=false
Type=Application
MimeType=application/x-java-archive;application/java-archive;application/x-jar;
diff --git a/freedesktop-jconsole.desktop b/freedesktop-jconsole.desktop
index c6022819d678..f2625bd1170b 100644
--- a/freedesktop-jconsole.desktop
+++ b/freedesktop-jconsole.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
-Name=AdoptOpenJDK Java 14 Console
-Comment=AdoptOpenJDK Java 14 Monitoring & Management Console
+Name=AdoptOpenJDK Java 15 Console
+Comment=AdoptOpenJDK Java 15 Monitoring & Management Console
Keywords=java;console;monitoring
-Exec=/usr/lib/jvm/java-14-adoptopenjdk/bin/jconsole
+Exec=/usr/lib/jvm/java-15-adoptopenjdk/bin/jconsole
Terminal=false
Type=Application
Categories=Application;System;
diff --git a/freedesktop-jshell.desktop b/freedesktop-jshell.desktop
index e0630f9139f9..b4c9182f7ab0 100644
--- a/freedesktop-jshell.desktop
+++ b/freedesktop-jshell.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
-Name=AdoptOpenJDK Java 14 Shell
-Comment=AdoptOpenJDK Java 14 Shell
+Name=AdoptOpenJDK Java 15 Shell
+Comment=AdoptOpenJDK Java 15 Shell
Keywords=java;shell
-Exec=/usr/lib/jvm/java-14-adoptopenjdk/bin/jshell
+Exec=/usr/lib/jvm/java-15-adoptopenjdk/bin/jshell
Terminal=true
Type=Application
Categories=Application;System;
diff --git a/install_jdk-adoptopenjdk.sh b/install_jdk-adoptopenjdk.sh
index 3346492e3bbf..753eddac5796 100644
--- a/install_jdk-adoptopenjdk.sh
+++ b/install_jdk-adoptopenjdk.sh
@@ -1,4 +1,4 @@
-THIS_JDK='java-14-adoptopenjdk'
+THIS_JDK='java-15-adoptopenjdk'
fix_default() {
if [ ! -x /usr/bin/java ]; then