From 18e807a11b77f59f853b664c86c5b3f0af2d0a57 Mon Sep 17 00:00:00 2001
From: Jonathan Knight <jonathan.knight@oracle.com>
Date: Mon, 11 Mar 2024 05:16:44 -0500
Subject: [PATCH] merge main -> ce/main 107374

[git-p4: depot-paths = "//dev/coherence-ce/main/": change = 107376]
---
 prj/coherence-docker/build-images.sh              | 12 ++++++++++--
 .../src/assembly/image-assembly.xml               | 15 +++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/prj/coherence-docker/build-images.sh b/prj/coherence-docker/build-images.sh
index 21a7803085e5a..926f4b560958f 100755
--- a/prj/coherence-docker/build-images.sh
+++ b/prj/coherence-docker/build-images.sh
@@ -175,6 +175,7 @@ common_image(){
 # clear the JAVA_HOME env var configuration as we only set it
 # for images where we download a JDK
   ENV_VARS_JAVA_HOME=""
+  ADD_JAVA21_DEPS="false"
 
   if [ "${5}" != "" ]
   then
@@ -211,6 +212,7 @@ common_image(){
     rm -rf "/tmp${IMAGE_JAVA_HOME}"
 #   Set the JAVA_HOME env var to the downloaded JDK
     ENV_VARS_JAVA_HOME="-e JAVA_HOME=${IMAGE_JAVA_HOME}"
+    ADD_JAVA21_DEPS="true"
 fi
 
   # Create the container from the base image, setting the architecture and O/S
@@ -273,8 +275,14 @@ fi
       "container-${1}"
 
   # Copy files into the container
-  buildah copy "container-${1}" "${BASEDIR}/target/docker" /
-  buildah copy "container-${1}" "${BASEDIR}/target/*.jar"  /app/libs
+  buildah copy "container-${1}" "${BASEDIR}/target/docker/app"  /app
+  buildah copy "container-${1}" "${BASEDIR}/target/docker/args" /args
+  buildah copy "container-${1}" "${BASEDIR}/target/*.jar"       /app/libs
+
+  if [ "${ADD_JAVA21_DEPS}" == "true" ]
+  then
+    buildah copy "container-${1}" "${BASEDIR}/target/docker/java21/app"  /app
+  fi
 
   # Commit the container to an image
   buildah commit "container-${1}" "coherence:${1}"
diff --git a/prj/coherence-docker/src/assembly/image-assembly.xml b/prj/coherence-docker/src/assembly/image-assembly.xml
index b7be77be89557..81f8c0bc272c1 100644
--- a/prj/coherence-docker/src/assembly/image-assembly.xml
+++ b/prj/coherence-docker/src/assembly/image-assembly.xml
@@ -38,6 +38,21 @@
       <fileMode>755</fileMode>
       <unpack>false</unpack>
       <useProjectArtifact>false</useProjectArtifact>
+      <excludes>
+        <exclude>${coherence.group.id}:coherence-ai</exclude>
+      </excludes>
+    </dependencySet>
+
+    <!-- Java 21+ dependencies -->
+    <dependencySet>
+      <outputDirectory>java21/app/libs</outputDirectory>
+      <directoryMode>755</directoryMode>
+      <fileMode>755</fileMode>
+      <unpack>false</unpack>
+      <useProjectArtifact>false</useProjectArtifact>
+      <includes>
+        <include>${coherence.group.id}:coherence-ai</include>
+      </includes>
     </dependencySet>
     <!--
     Helidon gRPC is marked as provided so that it is not