Remove jlink-specific changes to common modules

the s2i and jdk modules are used by the non-jlink images; remove
the changes to those made in the jlink-dev work. Move those
changes to the jlink module.

Note: prior commit added an explicit dependency on the jlink
module to the jlink-dev image descriptor.

Signed-off-by: Jonathan Dowland <[email protected]>

Author: jmtd

modules/jdk/21/module.yaml

@@ -25,7 +25,6 @@ envs:
 packages:
   install:
   - java-21-openjdk-devel
-  - java-21-openjdk-jmods
 
 modules:
   install:

modules/jlink/module.yaml

@@ -16,6 +16,10 @@ envs:
   value: /tmp/jre
 - name: S2I_JLINK_TEMP_PATH
   value: /tmp/jlink
+- name: S2I_ENABLE_JLINK
+  description: ^
+    Enables the Jdeps/JLink workflow to minimize JRE size
+  example: "false"
 
 modules:
   install: 
@@ -25,3 +29,4 @@ modules:
 packages:
   install:
   - binutils # for objcopy
+  - java-21-openjdk-jmods

modules/s2i/bash/module.yaml

@@ -13,7 +13,6 @@ modules:
   - name: jboss.container.maven.s2i
   - name: jboss.container.java.run
   - name: jboss.container.util.logging
-  - name: jboss.container.java.jlink
   - name: jboss.container.util.pathfinder
 
 packages:

modules/s2i/core/module.yaml

@@ -112,11 +112,6 @@ envs:
     Delete source files at the end of build.  Defaults to true.
   example: "false"
 
-- name: S2I_ENABLE_JLINK
-  description: ^
-    Enables the Jdeps/JLink workflow to minimize JRE size
-  example: "false"
-
 run:
   cmd:
   - "/usr/local/s2i/run"