chore: Remove Java 11 dependencies

indigo423 · indigo423 · commit afdb70e223de · 2025-04-28T21:54:05.000+02:00
Signed-off-by: Ronny Trommer &lt;ronny@no42.org&gt;
diff --git a/opennms-assemblies/minion/src/main/filtered/debian/control b/opennms-assemblies/minion/src/main/filtered/debian/control
@@ -3,12 +3,12 @@ Maintainer: Benjamin Reed <ranger@opennms.org>
 Section: contrib/net
 Priority: optional
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 9), dpkg-dev, oracle-java11-installer | adoptopenjdk-11-openj9xl | adoptopenjdk-11-openj9 | adoptopenjdk-11-hotspot | openjdk-11-jdk-headless | openjdk-11-jdk | java11-jdk | temurin-11-jdk | oracle-java17-installer | jdk-17 | adoptopenjdk-17-openj9xl | adoptopenjdk-17-openj9 | adoptopenjdk-17-hotspot | openjdk-17-jdk-headless | openjdk-17-jdk | java17-jdk | temurin-17-jdk, rsync
+Build-Depends: debhelper (>= 9), dpkg-dev, oracle-java17-installer | jdk-17 | adoptopenjdk-17-openj9xl | adoptopenjdk-17-openj9 | adoptopenjdk-17-hotspot | openjdk-17-jdk-headless | openjdk-17-jdk | java17-jdk | temurin-17-jdk, rsync
 
 Package: opennms-minion
 Architecture: all
 Depends: adduser, openssh-client, uuid-runtime, sudo
-Recommends: openjdk-11-jre-headless | openjdk-11-jre | adoptopenjdk-11-openj9xl-jre | adoptopenjdk-11-openj9-jre | adoptopenjdk-11-hotspot-jre | temurin-11-jdk | openjdk-17-jre-headless | openjdk-17-jre | adoptopenjdk-17-openj9xl-jre | adoptopenjdk-17-openj9-jre | adoptopenjdk-17-hotspot-jre | temurin-17-jdk | jdk-17, haveged, jicmp (>= 2.0.0), jicmp6 (>= 2.0.0)
+Recommends: openjdk-17-jre-headless | openjdk-17-jre | adoptopenjdk-17-openj9xl-jre | adoptopenjdk-17-openj9-jre | adoptopenjdk-17-hotspot-jre | temurin-17-jdk | jdk-17, jicmp (>= 2.0.0), jicmp6 (>= 2.0.0)
 Conflicts: opennms-minion-container (<< 25.0.0), opennms-minion-features-core (<<25.0.0), opennms-minion-features-default (<<25.0.0)
 Provides: opennms-plugin-api (= OPA_VERSION)
 Description: distributed OpenNMS monitoring client
diff --git a/opennms-assemblies/sentinel/src/main/filtered/debian/control b/opennms-assemblies/sentinel/src/main/filtered/debian/control
@@ -3,12 +3,12 @@ Maintainer: Benjamin Reed <ranger@opennms.org>
 Section: contrib/net
 Priority: optional
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 9), dpkg-dev, oracle-java11-installer | adoptopenjdk-11-openj9xl | adoptopenjdk-11-openj9 | adoptopenjdk-11-hotspot | openjdk-11-jdk-headless | openjdk-11-jdk | java11-jdk | temurin-11-jdk | oracle-java17-installer | jdk-17 | adoptopenjdk-17-openj9xl | adoptopenjdk-17-openj9 | adoptopenjdk-17-hotspot | openjdk-17-jdk-headless | openjdk-17-jdk | java17-jdk | temurin-17-jdk, rsync
+Build-Depends: debhelper (>= 9), dpkg-dev, oracle-java17-installer | jdk-17 | adoptopenjdk-17-openj9xl | adoptopenjdk-17-openj9 | adoptopenjdk-17-hotspot | openjdk-17-jdk-headless | openjdk-17-jdk | java17-jdk | temurin-17-jdk, rsync
 
 Package: opennms-sentinel
 Architecture: all
 Depends: adduser, openssh-client, uuid-runtime, sudo
-Recommends: openjdk-11-jre-headless | openjdk-11-jre | adoptopenjdk-11-openj9xl-jre | adoptopenjdk-11-openj9-jre | adoptopenjdk-11-hotspot-jre | temurin-11-jdk | openjdk-17-jre-headless | openjdk-17-jre | adoptopenjdk-17-openj9xl-jre | adoptopenjdk-17-openj9-jre | adoptopenjdk-17-hotspot-jre | temurin-17-jdk | jdk-17, haveged, jicmp (>= 2.0.0), jicmp6 (>= 2.0.0)
+Recommends: openjdk-17-jre-headless | openjdk-17-jre | adoptopenjdk-17-openj9xl-jre | adoptopenjdk-17-openj9-jre | adoptopenjdk-17-hotspot-jre | temurin-17-jdk | jdk-17, jicmp (>= 2.0.0), jicmp6 (>= 2.0.0)
 Provides: opennms-plugin-api (= OPA_VERSION)
 Description: horizontal scaling for OpenNMS
  OpenNMS Sentinel is a container for running a subset of OpenNMS
diff --git a/opennms-base-assembly/src/main/filtered/bin/runjava b/opennms-base-assembly/src/main/filtered/bin/runjava
@@ -175,7 +175,7 @@ printVersion() {
 printInstallJava() {
     warn ""
     warn "You can install a JVM by downloading one from Oracle, or by running something like"
-    warn "'apt-get install openjdk-11-jdk' or 'yum install java-11-openjdk-devel'."
+    warn "'apt-get install openjdk-17-jdk' or 'yum install java-17-openjdk-devel'."
 }
 
 #
diff --git a/tools/packages/minion/minion.spec b/tools/packages/minion/minion.spec
@@ -71,7 +71,6 @@ Requires(pre):  jicmp >= 3.0.0
 Requires:       jicmp6 >= 3.0.0
 Requires(pre):  jicmp6 >= 3.0.0
 Provides:	opennms-plugin-api = %{opa_version}
-Recommends:	haveged
 
 Conflicts:      %{name}-container        < %{version}-%{release}
 Conflicts:      %{name}-features-core    < %{version}-%{release}
diff --git a/tools/packages/opennms/jdk.spec b/tools/packages/opennms/jdk.spec
@@ -7,7 +7,7 @@
 %{!?package_epoch:%define package_epoch 1}
 %{!?my_epoch:%define my_epoch %{package_epoch}}
 %{!?my_release:%define my_release %{package_release}}
-%{!?dep_package:%define dep_package java-11-openjdk-devel}
+%{!?dep_package:%define dep_package java-17-openjdk-devel}
 
 Name:			jdk
 Summary:		OpenJDK compatible placeholder
diff --git a/tools/packages/opennms/opennms.spec b/tools/packages/opennms/opennms.spec
@@ -114,7 +114,6 @@ Provides:	%{name}-plugin-ticketing-otrs = %{version}-%{release}
 Obsoletes:	%{name}-plugin-ticketing-otrs < %{version}
 Provides:	%{name}-plugin-ticketing-remedy = %{version}-%{release}
 Obsoletes:	%{name}-plugin-ticketing-remedy < %{version}
-Recommends:	haveged
 
 %description core
 The core backend.  This package contains the main daemon responsible
diff --git a/tools/packages/sentinel/sentinel.spec b/tools/packages/sentinel/sentinel.spec
@@ -67,7 +67,6 @@ Requires:       /sbin/nologin
 Requires:       /usr/bin/id
 Requires:       /usr/bin/sudo
 Provides:	opennms-plugin-api = %{opa_version}
-Recommends:	haveged
 
 Prefix:        %{sentinelinstprefix}
 

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ printVersion() {`
`175`	`175`	`printInstallJava() {`
`176`	`176`	`warn ""`
`177`	`177`	`warn "You can install a JVM by downloading one from Oracle, or by running something like"`
`178`		`- warn "'apt-get install openjdk-11-jdk' or 'yum install java-11-openjdk-devel'."`
	`178`	`+ warn "'apt-get install openjdk-17-jdk' or 'yum install java-17-openjdk-devel'."`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`#`