From 43cf0b93967b2286242d3aa0fef09182e277662e Mon Sep 17 00:00:00 2001
From: Derek Sharpe <derek.sharpe@oracle.com>
Date: Thu, 9 Jan 2025 10:41:41 -0600
Subject: [PATCH] Allow spaces in the WLS installer zip name

---
 .../main/resources/docker-files/install-middleware.mustache | 6 +++---
 pom.xml                                                     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/imagetool/src/main/resources/docker-files/install-middleware.mustache b/imagetool/src/main/resources/docker-files/install-middleware.mustache
index 1beccc6a..a20961fc 100644
--- a/imagetool/src/main/resources/docker-files/install-middleware.mustache
+++ b/imagetool/src/main/resources/docker-files/install-middleware.mustache
@@ -21,10 +21,10 @@ RUN mkdir -p {{{oracle_home}}} \
 && chown {{userid}}:{{groupid}} {{orainv_dir}} \
 && chown {{userid}}:{{groupid}} {{{oracle_home}}}
 
-{{#installJava}}COPY --from=jdk_build --chown={{userid}}:{{groupid}} {{{java_home}}} {{{java_home}}}/
+{{#installJava}}COPY --from=jdk_build --chown={{userid}}:{{groupid}} ["{{{java_home}}}", "{{{java_home}}}/"]
 {{/installJava}}
 
-{{#installPackages}}COPY --chown={{userid}}:{{groupid}} {{installerFilename}} {{responseFile.name}} {{{tempDir}}}/{{{type}}}/
+{{#installPackages}}COPY --chown={{userid}}:{{groupid}} ["{{installerFilename}}", "{{responseFile.name}}", "{{{tempDir}}}/{{{type}}}/"]
 {{/installPackages}}
 COPY --chown={{userid}}:{{groupid}} oraInst.loc {{inv_loc}}/
 
@@ -38,7 +38,7 @@ RUN echo "INSTALLING MIDDLEWARE" \
 {{#installPackages}}
   && echo "INSTALLING {{type}}" \
   # If installer is packaged in a ZIP, extract it before running it
-  {{#isZip}}&& unzip -q {{{tempDir}}}/{{{type}}}/{{installerFilename}} -d {{{tempDir}}}/{{{type}}} {{/isZip}} \
+  {{#isZip}}&& unzip -q "{{{tempDir}}}/{{{type}}}/{{installerFilename}}" -d {{{tempDir}}}/{{{type}}} {{/isZip}} \
   {{#preinstallCommands}}&& {{{tempDir}}}/{{{type}}}/{{{.}}} {{/preinstallCommands}} \
   # IF the installer is a JAR file (not a .bin), run the silent install using Java
   {{^isBin}}  && {{{java_home}}}/bin/java -Xmx1024m -jar {{{tempDir}}}/{{{type}}}/{{jarName}} \
diff --git a/pom.xml b/pom.xml
index 3338ede0..71dba6aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -281,7 +281,7 @@
                 <plugin>
                     <groupId>org.sonarsource.scanner.maven</groupId>
                     <artifactId>sonar-maven-plugin</artifactId>
-                    <version>4.0.0.4121</version>
+                    <version>5.0.0.4389</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>