feat: Switch to java 17 for runtime (#5118)

* feat: Switch to java 17 for runtime Signed-off-by: MMaiero <[email protected]> * chore: cleanup Signed-off-by: MMaiero <[email protected]> * fix: Updated debug directive Signed-off-by: MMaiero <[email protected]> --------- Signed-off-by: MMaiero <[email protected]>
eclipse-kura · Feb 13, 2024 · a47167f · a47167f
1 parent 6223fa5
commit a47167f
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 15 deletions.
diff --git a/kura/distrib/src/main/ant/build_equinox_distrib.xml b/kura/distrib/src/main/ant/build_equinox_distrib.xml
@@ -378,7 +378,7 @@ if [ -z "$KURA_RUNNING" ] ; then
         -XX:+IgnoreUnrecognizedVMOptions \
         ${OPEN_MODULE_OPTIONS} \
         --add-modules=ALL-SYSTEM \
-        -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8000,suspend=n \
+        -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=*:8000,suspend=n \
         -Dkura.os.version=${kura.os.version} \
         -Dkura.arch=${kura.arch} \
         -Dtarget.device=${target.device} \

diff --git a/kura/distrib/src/main/resources/docker-alpine-x86_64-nn/Dockerfile b/kura/distrib/src/main/resources/docker-alpine-x86_64-nn/Dockerfile
@@ -21,7 +21,7 @@ ENV \
 
 RUN chmod a+x -R /usr/local/bin && \
     apk update && \
-    apk --no-cache add openjdk8 bash zip curl gcompat procps unzip gzip tar && \
+    apk --no-cache add openjdk17-jre-headless bash zip curl gcompat procps unzip gzip tar && \
     apk --no-cache add dos2unix openssl net-tools which busybox-extras && \
     apk --no-cache add bluez bluez-deprecated chrony eudev glib psmisc socat && \
     /kura-install/kura_*_docker-x86_64-nn_installer.sh && \

diff --git a/kura/distrib/src/main/resources/docker-alpine-x86_64-nn/bin/dp-extract-name b/kura/distrib/src/main/resources/docker-alpine-x86_64-nn/bin/dp-extract-name
@@ -1,3 +1,11 @@
-#!/usr/bin/env jjs
+#!/bin/bash
 
-print(new java.util.jar.JarFile(arguments[0]).manifest.mainAttributes.getValue("DeploymentPackage-SymbolicName"));
+jar_file="$1"
+property_name="DeploymentPackage-SymbolicName"
+
+jar xf "$jar_file" META-INF/MANIFEST.MF
+property_value=$(grep -oP "(?<=^$property_name: ).*" META-INF/MANIFEST.MF)
+
+rm META-INF/MANIFEST.MF
+
+echo "$property_value";
diff --git a/kura/distrib/src/main/resources/docker-ubi8-x86_64-nn/Dockerfile b/kura/distrib/src/main/resources/docker-ubi8-x86_64-nn/Dockerfile
@@ -22,7 +22,7 @@ RUN true && \
     rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
     microdnf -y update && \
     microdnf -y install \
-        java-1.8.0-openjdk-headless \
+        java-17-openjdk-headless \
         procps \
         zip \
         unzip \

diff --git a/kura/distrib/src/main/resources/docker-ubi8-x86_64-nn/bin/dp-extract-name b/kura/distrib/src/main/resources/docker-ubi8-x86_64-nn/bin/dp-extract-name
@@ -1,3 +1,11 @@
-#!/usr/bin/env jjs
+#!/bin/bash
 
-print(new java.util.jar.JarFile(arguments[0]).manifest.mainAttributes.getValue("DeploymentPackage-SymbolicName"));
+jar_file="$1"
+property_name="DeploymentPackage-SymbolicName"
+
+jar xf "$jar_file" META-INF/MANIFEST.MF
+property_value=$(grep -oP "(?<=^$property_name: ).*" META-INF/MANIFEST.MF)
+
+rm META-INF/MANIFEST.MF
+
+echo "$property_value";
diff --git a/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/control b/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/control
@@ -5,7 +5,7 @@ Priority: low
 Depends: dos2unix, unzip, 
  telnet, bluez-hcidump, 
  bluez, chrony, ntpdate, 
- openjdk-8-jre-headless | temurin-8-jdk | openjdk-17-jre-headless | temurin-17-jdk,
+ openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
  cron
 Architecture: all
 Maintainer: [email protected]

diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/control b/kura/distrib/src/main/resources/generic-aarch64/deb/control/control
@@ -14,7 +14,7 @@ Package: kura
 Version: [[project.version]]
 Section: misc
 Priority: low
-Depends: openjdk-8-jre-headless | temurin-8-jdk | openjdk-17-jre-headless | temurin-17-jdk,
+Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
  setserial, zip, gzip, unzip, procps, usbutils, socat, gawk, sed, inetutils-telnet,
  polkit | policykit-1, ssh | openssh, openssl, busybox, openvpn,
  bluez | bluez5, bluez-hcidump | bluez5-noinst-tools,

diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/control b/kura/distrib/src/main/resources/generic-arm32/deb/control/control
@@ -14,7 +14,7 @@ Package: kura
 Version: [[project.version]]
 Section: misc
 Priority: low
-Depends: openjdk-8-jre-headless | temurin-8-jdk | openjdk-17-jre-headless | temurin-17-jdk,
+Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
  setserial, zip, gzip, unzip, procps, usbutils, socat, gawk, sed, inetutils-telnet,
  polkit | policykit-1, ssh | openssh, openssl, busybox, openvpn,
  bluez | bluez5, bluez-hcidump | bluez5-noinst-tools,

diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/control b/kura/distrib/src/main/resources/generic-x86_64/deb/control/control
@@ -14,7 +14,7 @@ Package: kura
 Version: [[project.version]]
 Section: misc
 Priority: low
-Depends: openjdk-8-jre-headless | temurin-8-jdk | openjdk-17-jre-headless | temurin-17-jdk,
+Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
  setserial, zip, gzip, unzip, procps, usbutils, socat, gawk, sed, inetutils-telnet,
  polkit | policykit-1, ssh | openssh, openssl, busybox, openvpn,
  bluez | bluez5, bluez-hcidump | bluez5-noinst-tools,

diff --git a/kura/distrib/src/main/resources/intel-up2-ubuntu-20-nn/deb/control/control b/kura/distrib/src/main/resources/intel-up2-ubuntu-20-nn/deb/control/control
@@ -5,7 +5,7 @@ Priority: low
 Depends: dos2unix, unzip, 
  telnet, bluez-hcidump, 
  bluez, chrony, ntpdate, 
- openjdk-8-jre-headless | temurin-8-jdk | openjdk-17-jre-headless | temurin-17-jdk,
+ openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
  cron
 Architecture: all
 Maintainer: [email protected]

diff --git a/kura/distrib/src/main/resources/intel-up2-ubuntu-20/deb/control/control b/kura/distrib/src/main/resources/intel-up2-ubuntu-20/deb/control/control
@@ -8,7 +8,7 @@ Depends: hostapd, isc-dhcp-server, iw,
  bluez, wireless-tools, net-tools, 
  iptables, chrony, ntpdate, 
  ifupdown,
- openjdk-8-jre-headless | temurin-8-jdk | openjdk-17-jre-headless | temurin-17-jdk, 
+ openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk, 
  dmidecode, cron
 Architecture: all
 Maintainer: [email protected]

diff --git a/kura/distrib/src/main/resources/nvidia-jetson-nano-nn/deb/control/control b/kura/distrib/src/main/resources/nvidia-jetson-nano-nn/deb/control/control
@@ -4,7 +4,7 @@ Section: misc
 Priority: low
 Depends: dos2unix, unzip, telnet, 
  bluez-hcidump, chrony, ntpdate, 
- openjdk-8-jre-headless | temurin-8-jdk | openjdk-17-jre-headless | temurin-17-jdk,
+ openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
  cron
 Architecture: all
 Maintainer: [email protected]

diff --git a/kura/distrib/src/main/resources/nvidia-jetson-nano/deb/control/control b/kura/distrib/src/main/resources/nvidia-jetson-nano/deb/control/control
@@ -7,7 +7,7 @@ Depends: hostapd, isc-dhcp-server, iw,
  ethtool, telnet, ifupdown, 
  net-tools, iptables, chrony, 
  dmidecode, ntpdate,
- openjdk-8-jre-headless | temurin-8-jdk | openjdk-17-jre-headless | temurin-17-jdk, 
+ openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk, 
  cron
 Architecture: all
 Maintainer: [email protected]