Merge branch 'main' into develop-v2

Author: ddsharpe

SECURITY.md

@@ -21,9 +21,7 @@ security features are welcome on GitHub Issues.
 
 Security updates will be released on a regular cadence. Many of our projects
 will typically release security fixes in conjunction with the
-[Oracle Critical Patch Update][3] program. Security updates are released on the
-Tuesday closest to the 17th day of January, April, July and October. A pre-release
-announcement will be published on the Thursday preceding each release. Additional
+[Oracle Critical Patch Update][3] program. Additional
 information, including past advisories, is available on our [security alerts][4]
 page.
 

documentation/1.11/content/_index.md

@@ -57,7 +57,6 @@ Use WebLogic Image Tool to create, update, and rebase the following FMW product
 * Fusion Middleware Infrastructure (FMW)
 * Oracle BPM Suite for business process (SOA)
 * Oracle Service Bus (OSB)
-* Oracle Analytics Server (OAS)
 * Oracle Data Integrator (ODI)
 * Oracle Access Management (OAM)
 * Oracle Identity Governance (OIG)

documentation/1.11/themes/hugo-theme-learn/layouts/partials/menu-footer.html

@@ -1,4 +1,4 @@
 <p>Created with <i class="fas fa-heart"></i> from <a href="https://www.oracle.com">Oracle</a></p>
 <p>&nbsp</p>
 <p><a href="https://github.com/oracle/weblogic-image-tool"><i class="fab fa-github"></i> GitHub repo</a></p>
-<p><a href="https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1lnz4kpci-WdY2gWfeJc5jS_a_1Z06MA"><i class="fab fa-slack"></i> Public Slack #weblogic</a></p>
+<p><a href="https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1ni1gtjv6-PGC6CQ4uIte3KBdm_67~aQ"><i class="fab fa-slack"></i> Public Slack #weblogic</a></p>

imagetool/src/main/java/com/oracle/weblogic/imagetool/builder/BuildCommand.java

@@ -4,7 +4,6 @@
 package com.oracle.weblogic.imagetool.builder;
 
 import java.io.BufferedReader;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -130,7 +129,7 @@ public BuildCommand pull(boolean value) {
      * @throws IOException          if an error occurs reading from the process inputstream.
      * @throws InterruptedException when the process wait is interrupted.
      */
-    public BuildCommand run(Path dockerLog)
+    public void run(Path dockerLog)
         throws IOException, InterruptedException {
         // process builder
         logger.entering(getCommand(false), dockerLog);
@@ -142,7 +141,7 @@ public BuildCommand run(Path dockerLog)
 
         if (dockerLogPath != null) {
             logger.info("dockerLog: " + dockerLog);
-            outputStreams.add(new FileOutputStream(dockerLogPath.toFile()));
+            outputStreams.add(Files.newOutputStream(dockerLogPath));
         }
 
         ProcessBuilder processBuilder = new ProcessBuilder(getCommand(true));
@@ -154,7 +153,6 @@ public BuildCommand run(Path dockerLog)
         if (process.waitFor() != 0) {
             Utils.processError(process);
         }
-        return this;
     }
 
     /**

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/CommonOptions.java

@@ -237,16 +237,24 @@ public void copyOptionsFromImage() throws IOException, InterruptedException {
     /**
      * Delete build context directory and remove all intermediate build images.
      *
-     * @throws IOException if an error occurs trying to delete the context directory files.
      * @throws InterruptedException when interrupted.
      */
-    public void cleanup() throws IOException, InterruptedException {
+    public void cleanup() throws InterruptedException {
         if (skipcleanup) {
             return;
         }
-        Utils.deleteFilesRecursively(buildDir());
+        try {
+            Utils.deleteFilesRecursively(buildDirectory);
+        } catch (IOException e) {
+            logger.severe("IMG-0080", buildDirectory);
+        }
+
         if (!dryRun) {
-            Utils.removeIntermediateDockerImages(buildEngine, buildId());
+            try {
+                Utils.removeIntermediateDockerImages(buildEngine, buildId());
+            } catch (IOException e) {
+                logger.severe("IMG-0118", buildId());
+            }
         }
     }
 

imagetool/src/main/java/com/oracle/weblogic/imagetool/util/Utils.java

@@ -282,19 +282,24 @@ public static void processError(Process process) throws IOException {
      * @throws IOException in case of error
      */
     public static void deleteFilesRecursively(String pathDir) throws IOException {
-        if (pathDir != null) {
-            Path tmpDir = Paths.get(pathDir);
-            try (Stream<Path> walk = Files.walk(tmpDir)) {
-                walk.sorted(Comparator.reverseOrder())
-                    .map(Path::toFile)
-                    //.peek(System.out::println)
-                    .forEach(File::delete);
-            }
+        logger.entering(pathDir);
+        if (pathDir == null) {
+            logger.exiting();
+            return;
+        }
 
-            if (Files.exists(tmpDir)) {
-                logger.warning("IMG-0038", tmpDir);
-            }
+        Path tmpDir = Paths.get(pathDir);
+        try (Stream<Path> walk = Files.walk(tmpDir)) {
+            walk.sorted(Comparator.reverseOrder())
+                .map(Path::toFile)
+                //.peek(System.out::println)
+                .forEach(File::delete);
         }
+
+        if (Files.exists(tmpDir)) {
+            logger.warning("IMG-0038", tmpDir);
+        }
+        logger.exiting();
     }
 
     /**

imagetool/src/main/resources/ImageTool.properties

@@ -78,7 +78,7 @@ IMG-0076=Invalid argument, the value provided for {0} is invalid or empty.
 IMG-0077=Skipping duplicate patch {0}. Patch file already exists in the build context folder. Did you accidentally list the patch twice?
 IMG-0078=Starting build: {0}
 IMG-0079=OS Package Manager override, changed from {0} to {1}
-IMG-0080=NOT USED
+IMG-0080=Failed to clean up build context folder {0}
 IMG-0081=Unable to retrieve list of Oracle releases from Oracle Updates (ARU). Try again later.
 IMG-0082=Version {0} did not contain {1}, skipping
 IMG-0083=Version {0} for patch ID {1} was not found in the available versions: {2}
@@ -116,3 +116,4 @@ IMG-0114=Unable to parse section {0} of additionalBuildCommands: {1}
 IMG-0115=Unable to reach Oracle patch server to check for patch conflicts, skipping online conflict check. OPatch will check patches locally during the build.
 IMG-0116=A patch conflict was detected. The patches listed within the brackets conflict with each other. These fixes cannot be applied without a merge patch from Oracle:
 IMG-0117=The value for --sourceImage must not be empty.
+IMG-0118=Failed to clean up intermediate container images for build ID {0}

pom.xml

@@ -63,18 +63,18 @@
             <dependency>
                 <groupId>info.picocli</groupId>
                 <artifactId>picocli</artifactId>
-                <version>4.7.0</version>
+                <version>4.7.1</version>
             </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-engine</artifactId>
-                <version>5.9.1</version>
+                <version>5.9.2</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>uk.org.webcompere</groupId>
                 <artifactId>system-stubs-jupiter</artifactId>
-                <version>2.0.1</version>
+                <version>2.0.2</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -85,7 +85,7 @@
             <dependency>
                 <groupId>org.jetbrains</groupId>
                 <artifactId>annotations</artifactId>
-                <version>23.1.0</version>
+                <version>24.0.0</version>
             </dependency>
             <dependency>
                 <groupId>org.yaml</groupId>
@@ -214,7 +214,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.2.1</version>
                     <executions>
                         <execution>
                             <id>checkstyle</id>
@@ -241,7 +241,7 @@
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>10.6.0</version>
+                            <version>10.8.0</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -285,7 +285,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.2.1</version>
                 </plugin>
             </plugins>
         </pluginManagement>