[arch-commits] Commit in java-openjdk/trunk (7 files)

[Frederik Schwan]

    Date: Tuesday, April 5, 2022 @ 16:33:42
  Author: freswa
Revision: 441593

fix leftovers of java 17

Modified:
  java-openjdk/trunk/PKGBUILD
  java-openjdk/trunk/freedesktop-java.desktop
  java-openjdk/trunk/freedesktop-jconsole.desktop
  java-openjdk/trunk/freedesktop-jshell.desktop
  java-openjdk/trunk/install_jdk-openjdk.sh
  java-openjdk/trunk/install_jre-openjdk-headless.sh
  java-openjdk/trunk/install_jre-openjdk.sh

---------------------------------+
 PKGBUILD                        |    8 ++++----
 freedesktop-java.desktop        |   12 ++++++------
 freedesktop-jconsole.desktop    |   12 ++++++------
 freedesktop-jshell.desktop      |    8 ++++----
 install_jdk-openjdk.sh          |    2 +-
 install_jre-openjdk-headless.sh |    2 +-
 install_jre-openjdk.sh          |    2 +-
 7 files changed, 23 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-05 16:23:59 UTC (rev 441592)
+++ PKGBUILD	2022-04-05 16:33:42 UTC (rev 441593)
@@ -13,7 +13,7 @@
 # pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
 #pkgver=${_majorver}.u${_updatever}
 pkgver=${_majorver}
-pkgrel=1
+pkgrel=2
 # _git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
 #_git_tag=jdk-${_majorver}+${_updatever}
 _git_tag=jdk-${_majorver}-ga
@@ -30,9 +30,9 @@
         freedesktop-jconsole.desktop
         freedesktop-jshell.desktop)
 sha256sums=('d01149413acd484e9c098919d6e092a514a90cab45831e3832791556900c5b28'
-            '85c4742764590783160af74587a47269e6797fbdf17ec485c7644bd239adf61d'
-            'abac1ab09a33a3654378bc69be5a7cf075263ab3ae9efec1eb25cf388e711bb7'
-            'e7cce0ecf868f656d8dc2eb25ab82ab665526a0a28aba20f02632dd29962dac3')
+            '58bf779332d21151ba47719926ddcc8811ac7bbf414222141dcf40ac54cfaa2d'
+            '3a50ded3918024de4e441a46744c8e342faf46441b53c8bac7d589055a28a13c'
+            '2cace78ec911f73578991370914753c5b6abe9f7304bcbcb7a3077b8dbc7c867')
 
 case "${CARCH}" in
   x86_64) _JARCH='x86_64';;

Modified: freedesktop-java.desktop
===================================================================
--- freedesktop-java.desktop	2022-04-05 16:23:59 UTC (rev 441592)
+++ freedesktop-java.desktop	2022-04-05 16:33:42 UTC (rev 441593)
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Name=OpenJDK Java 17 Runtime
-Name[fi]=OpenJDK Java 17 - ajonaikainen ympäristö
-Comment=OpenJDK Java 17 Runtime
-Comment[fi]=OpenJDK Java 17 - ajonaikainen ympäristö
+Name=OpenJDK Java 18 Runtime
+Name[fi]=OpenJDK Java 18 - ajonaikainen ympäristö
+Comment=OpenJDK Java 18 Runtime
+Comment[fi]=OpenJDK Java 18 - ajonaikainen ympäristö
 Keywords=java;runtime
-Exec=/usr/lib/jvm/java-17-openjdk/bin/java -jar
+Exec=/usr/lib/jvm/java-18-openjdk/bin/java -jar
 Terminal=false
 Type=Application
-Icon=java17-openjdk
+Icon=java18-openjdk
 MimeType=application/x-java-archive;application/java-archive;application/x-jar;
 NoDisplay=true

Modified: freedesktop-jconsole.desktop
===================================================================
--- freedesktop-jconsole.desktop	2022-04-05 16:23:59 UTC (rev 441592)
+++ freedesktop-jconsole.desktop	2022-04-05 16:33:42 UTC (rev 441593)
@@ -1,11 +1,11 @@
 [Desktop Entry]
-Name=OpenJDK Java 17 Console
-Name[fi]=OpenJDK Java 17 - konsoli
-Comment=OpenJDK Java 17 Monitoring & Management Console
-Comment[fi]=OpenJDK Java 17 - valvonta- ja hallintakonsoli
+Name=OpenJDK Java 18 Console
+Name[fi]=OpenJDK Java 18 - konsoli
+Comment=OpenJDK Java 18 Monitoring & Management Console
+Comment[fi]=OpenJDK Java 18 - valvonta- ja hallintakonsoli
 Keywords=java;console;monitoring
-Exec=/usr/lib/jvm/java-17-openjdk/bin/jconsole
+Exec=/usr/lib/jvm/java-18-openjdk/bin/jconsole
 Terminal=false
 Type=Application
-Icon=java17-openjdk
+Icon=java18-openjdk
 Categories=Application;System;

Modified: freedesktop-jshell.desktop
===================================================================
--- freedesktop-jshell.desktop	2022-04-05 16:23:59 UTC (rev 441592)
+++ freedesktop-jshell.desktop	2022-04-05 16:33:42 UTC (rev 441593)
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=OpenJDK Java 17 Shell
-Comment=OpenJDK Java 17 Shell
+Name=OpenJDK Java 18 Shell
+Comment=OpenJDK Java 18 Shell
 Keywords=java;shell
-Exec=/usr/lib/jvm/java-17-openjdk/bin/jshell
+Exec=/usr/lib/jvm/java-18-openjdk/bin/jshell
 Terminal=true
 Type=Application
-Icon=java17-openjdk
+Icon=java18-openjdk
 Categories=Application;System;

Modified: install_jdk-openjdk.sh
===================================================================
--- install_jdk-openjdk.sh	2022-04-05 16:23:59 UTC (rev 441592)
+++ install_jdk-openjdk.sh	2022-04-05 16:33:42 UTC (rev 441593)
@@ -1,4 +1,4 @@
-THIS_JDK='java-17-openjdk'
+THIS_JDK='java-18-openjdk'
 
 fix_default() {
   if [ ! -x /usr/bin/java ]; then

Modified: install_jre-openjdk-headless.sh
===================================================================
--- install_jre-openjdk-headless.sh	2022-04-05 16:23:59 UTC (rev 441592)
+++ install_jre-openjdk-headless.sh	2022-04-05 16:33:42 UTC (rev 441593)
@@ -1,4 +1,4 @@
-THIS_JRE='java-17-openjdk'
+THIS_JRE='java-18-openjdk'
 
 fix_default() {
   if [ ! -x /usr/bin/java ]; then

Modified: install_jre-openjdk.sh
===================================================================
--- install_jre-openjdk.sh	2022-04-05 16:23:59 UTC (rev 441592)
+++ install_jre-openjdk.sh	2022-04-05 16:33:42 UTC (rev 441593)
@@ -1,4 +1,4 @@
-THIS_JRE='java-17-openjdk'
+THIS_JRE='java-18-openjdk'
 
 fix_default() {
   if [ ! -x /usr/bin/java ]; then