Merge branch 'main' into develop-v2

ddsharpe · ddsharpe · commit 7c1b426e1b1b · 2024-10-10T09:38:00.000-05:00
diff --git a/documentation/site/content/_index.md b/documentation/site/content/_index.md
@@ -55,16 +55,17 @@ Use WebLogic Image Tool to create, update, and rebase the following FMW product
 
 * Oracle WebLogic Server (WLS)
 * Fusion Middleware Infrastructure (FMW)
-* Oracle BPM Suite for business process (SOA)
-* Oracle Service Bus (OSB)
-* Oracle Data Integrator (ODI)
+* Oracle Identity Manager (IDM)
+* Oracle Managed File Transfer (MFT)
 * Oracle Access Management (OAM)
+* Oracle Data Integrator (ODI)
+* Oracle HTTP Server (OHS)
+* Oracle Internet Directory (OID)
 * Oracle Identity Governance (OIG)
+* Oracle Service Bus (OSB)
 * Oracle Unified Directory (OUD)
+* Oracle SOA Suite (SOA)
 * Universal Content Management (UCM)
-* Oracle Managed File Transfer (MFT)
-* Oracle Internet Directory (OID)
-* Oracle WebCenter Sites (WCS)
-* Oracle Identity Manager (IDM)
 * Oracle WebCenter Content (WCC)
 * Oracle WebCenter Portal (WCP)
+* Oracle WebCenter Sites (WCS)
diff --git a/documentation/site/content/userguide/tools/create-image.md b/documentation/site/content/userguide/tools/create-image.md
@@ -47,7 +47,7 @@ Usage: imagetool create [OPTIONS]
 | `--skipcleanup` | Do not delete the build context folder, intermediate images, and failed build containers. For debugging purposes.  |   |
 | `--strictPatchOrdering` |  Instruct OPatch to apply patches one at a time (uses `apply` instead of `napply`). |   |
 | `--target` | Select the target environment in which the created image will be used. Supported values: `Default` (Docker/Kubernetes), `OpenShift`. See [Additional information](#--target). | `Default`  |
-| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `OSB`, `OUD_WLS`, `SOA_OSB`, `SOA_OSB_B2B`, `MFT`, `WCP`, `OAM`, `OIG`, `OUD`, `OID`, `ODI`, `SOA`, `WCC`, `WCS`, `WCP`  | `WLS`  |
+| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `MFT`, `OAM`, `ODI`, `OHS`, `OIG`, `OUD`, `OUD_WLS`, `OID`, `OSB`, `SOA`, `SOA_OSB`, `SOA_OSB_B2B`, `WCC`, `WCP`, `WCS`  | `WLS`  |
 | `--user` | Oracle support email ID. When supplying `user`, you must supply the password either as an environment variable using `--passwordEnv`, or as a file using `--passwordFile`, or interactively, on the command line with `--password`.  |   |
 | `--version` | Installer version. | `12.2.1.3.0`  |
 | `--wdtArchive` | A WDT archive ZIP file or comma-separated list of files.  |   |
diff --git a/documentation/site/content/userguide/tools/rebase-image.md b/documentation/site/content/userguide/tools/rebase-image.md
@@ -46,7 +46,7 @@ Usage: imagetool rebase [OPTIONS]
 | `--strictPatchOrdering` |  Instruct OPatch to apply patches one at a time (uses `apply` instead of `napply`). |   |
 | `--target` | Select the target environment in which the created image will be used. Supported values: `Default` (Docker/Kubernetes), `OpenShift`. See [Additional information](#--target). | `Default`  |
 | `--targetImage` | Container image to extend for the domain's new image. |   |
-| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `OSB`, `OUD_WLS`, `SOA_OSB`, `SOA_OSB_B2B`, `MFT`, `WCP`, `OAM`, `OIG`, `OUD`, `OID`, `ODI`, `SOA`, `WCC`, `WCS`, `WCP`  | `WLS`  |
+| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `MFT`, `OAM`, `ODI`, `OHS`, `OIG`, `OUD`, `OUD_WLS`, `OID`, `OSB`, `SOA`, `SOA_OSB`, `SOA_OSB_B2B`, `WCC`, `WCP`, `WCS`  | `WLS`  |
 | `--user` | Your Oracle support email ID. When supplying `user`, you must supply the password either as an environment variable using `--passwordEnv`, or as a file using `--passwordFile`, or interactively, on the command line with `--password`. |   |
 | `--version` | Installer version. | `12.2.1.3.0`  |
 
diff --git a/documentation/site/content/userguide/tools/update-image.md b/documentation/site/content/userguide/tools/update-image.md
@@ -48,7 +48,7 @@ Update WebLogic Docker image with selected patches
 | `--skipcleanup` | Do not delete the build context folder, intermediate images, and failed build containers. For debugging purposes. |  |
 | `--strictPatchOrdering` | Instruct OPatch to apply patches one at a time (uses `apply` instead of `napply`). |  |
 | `--target` | Select the target environment in which the created image will be used. Supported values: `Default` (Docker/Kubernetes), `OpenShift`. See [Additional information](#--target). | `Default` |
-| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `OSB`, `OUD_WLS`, `SOA_OSB`, `SOA_OSB_B2B`, `MFT`, `WCP`, `OAM`, `OIG`, `OUD`, `OID`, `ODI`, `SOA`, `WCC`, `WCS`, `WCP`  | `WLS`  |
+| `--type` | Installer type. Supported values: `WLS`, `WLSDEV`, `WLSSLIM`, `FMW`, `IDM`, `MFT`, `OAM`, `ODI`, `OHS`, `OIG`, `OUD`, `OUD_WLS`, `OID`, `OSB`, `SOA`, `SOA_OSB`, `SOA_OSB_B2B`, `WCC`, `WCP`, `WCS`  | `WLS`  |
 | `--user` | Oracle support email ID. When supplying `user`, you must supply the password either as an environment variable using `--passwordEnv`, or as a file using `--passwordFile`, or interactively, on the command line with `--password`. |  |
 | `--wdtArchive` | A WDT archive ZIP file or comma-separated list of files. |  |
 | `--wdtDomainHome` | Path to the `-domain_home` for WDT. | `/u01/domains/base_domain`    |
diff --git a/imagetool/pom.xml b/imagetool/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <artifactId>imagetool-parent</artifactId>
         <groupId>com.oracle.weblogic.lifecycle.imagetool</groupId>
-        <version>1.14.0-SNAPSHOT</version>
+        <version>1.14.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/aru/AruUtil.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/aru/AruUtil.java
@@ -215,7 +215,7 @@ List<AruPatch> getRecommendedPatches(FmwInstallerType type, AruProduct product,
                 // Get a list of patches applicable to the given product and release number
                 patches = getReleaseRecommendations(product, releaseNumber, architecture, userId, password);
                 logger.fine("Search for {0} recommended patches returned {1}", product, patches.size());
-                if (type == FmwInstallerType.OHS_DB19 || type == FmwInstallerType.OHS) {
+                if (type == FmwInstallerType.OHS) {
                     // Workaround for the Apache Plugin patch currently uploaded as an OHS patch.
                     patches = patches.stream().filter(p ->
                         !p.description().contains("APACHE PLUGIN")).collect(Collectors.toList());
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/AddPatchEntry.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/AddPatchEntry.java
@@ -25,7 +25,7 @@ public String getKey() {
     public CommandResponse call() throws Exception {
         try {
             if (patchId != null && !patchId.isEmpty()) {
-                Utils.validatePatchIds(Collections.singletonList(patchId), true);
+                Utils.validatePatchIds(Collections.singletonList(patchId), false);
                 return addToCache();
             } else {
                 return CommandResponse.error("IMG-0076", "--patchId");
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/CommonPatchingOptions.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/CommonPatchingOptions.java
@@ -63,7 +63,7 @@ void initializeOptions() throws IOException, InvalidCredentialException, Invalid
                 throw new InvalidCredentialException();
             }
 
-            Utils.validatePatchIds(patches, false);
+            Utils.validatePatchIds(patches, true);
         }
     }
 
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/UpdateImage.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/UpdateImage.java
@@ -121,9 +121,7 @@ public CommandResponse call() throws Exception {
                 if (userId == null) {
                     logger.info("IMG-0009");
                 } else {
-                    if (!Utils.validatePatchIds(patches, false)) {
-                        return CommandResponse.error("Patch ID validation failed");
-                    }
+                    Utils.validatePatchIds(patches, true);
 
                     String oraclePatches = baseImageProperties.getProperty("oraclePatches", null);
                     if (oraclePatches != null) {
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/inspect/InspectOutput.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/inspect/InspectOutput.java
@@ -72,7 +72,8 @@ public String toString() {
             result.append(pad(1)).append('\"').append("os").append('\"').append(" : {\n");
             result.append(jsonKeyValuePair(2, "id", os.id())).append(",\n");
             result.append(jsonKeyValuePair(2, "name", os.name())).append(",\n");
-            result.append(jsonKeyValuePair(2, "version", os.version()));
+            result.append(jsonKeyValuePair(2, "version", os.version())).append(",\n");
+            result.append(jsonKeyValuePair(2, "architecture", os.architecture()));
             if (os.releasePackage() != null) {
                 result.append(",\n");
                 result.append(jsonKeyValuePair(2, "releasePackage", os.releasePackage())).append("\n");
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/inspect/OperatingSystemProperties.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/inspect/OperatingSystemProperties.java
@@ -12,6 +12,7 @@ public class OperatingSystemProperties {
     private String version;
     private String name;
     private String releasePackage;
+    private String architecture;
 
     public String id() {
         return id;
@@ -29,6 +30,10 @@ public String releasePackage() {
         return releasePackage;
     }
 
+    public String architecture() {
+        return architecture;
+    }
+
     /**
      * Using the properties obtained from the image, extract the OS properties prefixed with __OS__.
      * @param imageProperties properties returned from the image inspection
@@ -43,6 +48,7 @@ public static OperatingSystemProperties getOperatingSystemProperties(Properties
         }
         result.name = removeQuotes(imageProperties.getProperty("__OS__NAME"));
         result.releasePackage = removeQuotes(imageProperties.getProperty("__OS__RELEASE_PACKAGE"));
+        result.architecture = imageProperties.getProperty("__OS__arch");
         return result;
     }
 
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/FmwInstallerType.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/FmwInstallerType.java
@@ -82,9 +82,6 @@ public enum FmwInstallerType {
     OHS(Utils.toSet(AruProduct.OHS, AruProduct.OAM_WG, AruProduct.WLS, AruProduct.JDBC, AruProduct.FMWPLAT,
         AruProduct.OSS, AruProduct.FIT),
         InstallerType.OHS, InstallerType.DB19),
-    OHS_DB19(Utils.toSet(AruProduct.OHS, AruProduct.OAM_WG, AruProduct.WLS, AruProduct.JDBC, AruProduct.FMWPLAT,
-        AruProduct.OSS, AruProduct.FIT),
-        InstallerType.OHS, InstallerType.DB19), // Deprecated, need to just use OHS
     ODI(Collections.singleton(AruProduct.ODI),
         InstallerType.ODI)
     ;
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/util/Constants.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/util/Constants.java
@@ -23,8 +23,6 @@ public final class Constants {
     public static final String DELETE_ALL_FOR_SURE = "deleteAll4Sure";
     public static final String HTTP = "http";
     public static final String HTTPS = "https";
-    public static final String PATCH_ID_REGEX =  "^(\\d{8})(?:[_][0-9][0-9](?:\\.[0-9]){3,8}\\.(\\d+))?";
-    public static final String RIGID_PATCH_ID_REGEX =  "^(\\d{8})[_][0-9][0-9](?:\\.[0-9]){3,8}\\.(\\d+)";
     public static final String BUSYBOX = "busybox";
     public static final List<String> BUSYBOX_OS_IDS = Collections.unmodifiableList(Arrays.asList("bb", "alpine"));
     public static final String ORACLE_LINUX = "ghcr.io/oracle/oraclelinux:8-slim";
diff --git a/imagetool/src/main/java/com/oracle/weblogic/imagetool/util/Utils.java b/imagetool/src/main/java/com/oracle/weblogic/imagetool/util/Utils.java
@@ -43,6 +43,7 @@
 import com.oracle.weblogic.imagetool.logging.LoggingFacade;
 import com.oracle.weblogic.imagetool.logging.LoggingFactory;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
 public class Utils {
@@ -582,38 +583,36 @@ public static String getBuildWorkingDir() throws IOException {
         return workingDir;
     }
 
+    private static void validatePatchIds(List<String> patches, Pattern pattern,
+                                            String example) throws InvalidPatchIdFormatException {
+        for (String patchId: patches) {
+            Matcher matcher = pattern.matcher(patchId);
+            if (!matcher.matches()) {
+                throw new InvalidPatchIdFormatException(patchId, example);
+            }
+        }
+    }
+
     /**
-     * validatePatchIds validate the format of the patch ids.
+     * Validate the format of the patch ID.
+     * Simple ID: 12345678
+     * Full ID: {bug number}_{version}_{architecture}
      *
-     * @param patches list of patch ids
-     * @return true if all patch IDs are valid , false otherwise.
+     * @param patches   List of patch IDs to validate against the required format.
+     * @param allowSimpleId Allow simple bug number without version or architecture
+     * @throws InvalidPatchIdFormatException if any of the provide patch IDs are of invalid format
      */
-
-    public static boolean validatePatchIds(List<String> patches, boolean rigid) throws InvalidPatchIdFormatException {
-        Pattern patchIdPattern;
-        if (rigid) {
-            patchIdPattern = Pattern.compile(Constants.RIGID_PATCH_ID_REGEX);
+    public static void validatePatchIds(@NotNull List<String> patches,
+                                        boolean allowSimpleId) throws InvalidPatchIdFormatException {
+        if (allowSimpleId) {
+            validatePatchIds(patches,
+                Pattern.compile("^(\\d{8,9})(?:_\\d\\d(?:\\.\\d){3,8}\\.(\\d+)(_.*)?)?"),
+                "12345678[_12.2.1.3.0[_arm64]]");
         } else {
-            patchIdPattern = Pattern.compile(Constants.PATCH_ID_REGEX);
-        }
-        if (patches != null && !patches.isEmpty()) {
-            for (String patchId : patches) {
-                logger.finer("pattern matching patchId: {0}", patchId);
-                Matcher matcher = patchIdPattern.matcher(patchId);
-                if (!matcher.matches()) {
-                    String errorFormat;
-                    if (rigid) {
-                        errorFormat = "12345678_12.2.1.3.0";
-                    } else {
-                        errorFormat = "12345678[_12.2.1.3.0]";
-                    }
-
-                    throw new InvalidPatchIdFormatException(patchId, errorFormat);
-                }
-            }
+            validatePatchIds(patches,
+                Pattern.compile("^(\\d{8,9})_\\d\\d(?:\\.\\d){3,8}\\.(\\d+)(_.*)?"),
+                "12345678_12.2.1.3.0[_arm64]");
         }
-
-        return true;
     }
 
     /**
diff --git a/imagetool/src/main/resources/probe-env/inspect-image-long.sh b/imagetool/src/main/resources/probe-env/inspect-image-long.sh
@@ -84,6 +84,7 @@ if [ -n "$ORACLE_HOME" ]; then
   echo oracleInstalledProducts="$(awk -F\" '{ORS=","} /product-family/ { print $2 }' "$ORACLE_HOME"/inventory/registry.xml | sed 's/,$//')"
 fi
 
+echo __OS__arch="$(uname -m)"
 if [ -f "/etc/os-release" ]; then
   grep '=' /etc/os-release | sed 's/^/__OS__/'
     releasePackage="$(type rpm >/dev/null 2>&1  && rpm -qf /etc/os-release || echo '')"
diff --git a/imagetool/src/main/resources/probe-env/inspect-image.sh b/imagetool/src/main/resources/probe-env/inspect-image.sh
@@ -64,6 +64,7 @@ if [ -n "$ORACLE_HOME" ]; then
   echo oracleInstalledProducts="$(awk -F\" '{ORS=","} /product-family/ { print $2 }' "$ORACLE_HOME"/inventory/registry.xml | sed 's/,$//')"
 fi
 
+echo __OS__arch="$(uname -m)"
 if [ -f "/etc/os-release" ]; then
   grep '=' /etc/os-release | sed 's/^/__OS__/'
   releasePackage="$(type rpm >/dev/null 2>&1  && rpm -qf /etc/os-release || echo '')"
diff --git a/imagetool/src/test/java/com/oracle/weblogic/imagetool/cli/cache/AddPatchEntryTest.java b/imagetool/src/test/java/com/oracle/weblogic/imagetool/cli/cache/AddPatchEntryTest.java
@@ -5,15 +5,19 @@
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.util.Arrays;
 
 import com.oracle.weblogic.imagetool.api.model.CommandResponse;
+import com.oracle.weblogic.imagetool.util.InvalidPatchIdFormatException;
+import com.oracle.weblogic.imagetool.util.Utils;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import picocli.CommandLine;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 @Tag("unit")
 class AddPatchEntryTest {
@@ -33,15 +37,15 @@ void testMissingParameters() {
         // missing valid parameters should generate USAGE output
         int exitCode = cmd.execute("-x", "-y=123");
         CommandResponse result = cmd.getExecutionResult();
-        assertNull(result, "Should not have a response, picoli should intercept usage error");
+        assertNull(result, "Should not have a response, picocli should intercept usage error");
         assertEquals(CommandLine.ExitCode.USAGE, exitCode);
     }
 
     @Test
     void testInvalidFileParameter() {
         CommandLine cmd = getCommand();
         // invalid file (file does not exist), should generate an error response
-        int exitCode = cmd.execute("--patchId=12345678_12.2.1.3.0", "--path=/here/there");
+        cmd.execute("--patchId=12345678_12.2.1.3.0", "--path=/here/there");
         CommandResponse result = cmd.getExecutionResult();
         assertNotNull(result, "Response missing from call to addPatch");
         assertEquals(1, result.getStatus());
@@ -56,4 +60,24 @@ void testInvalidPatchId() {
         assertNotNull(result, "Response missing from call to addPatch");
         assertEquals(1, result.getStatus());
     }
+
+    @Test
+    void validPatchIds() throws InvalidPatchIdFormatException {
+        String[] patchIds = {"12345678_12.2.1.4.0", "12345678_12.2.1.4.241001", "12345678_12.2.1.4.0_arm64"};
+        Utils.validatePatchIds(Arrays.asList(patchIds), false);
+    }
+
+    @Test
+    void invalidPatchIds1() {
+        String[] patchIds = {"12345678_12.2.1.4.0", "12345678", "12345678_12.2.1.4.0_arm64"};
+        assertThrows(InvalidPatchIdFormatException.class,
+            () -> Utils.validatePatchIds(Arrays.asList(patchIds), false));
+    }
+
+    @Test
+    void invalidPatchIds2() {
+        String[] patchIds = {"12345678_12.2.1.4.0", "12345678_arm64", "12345678_12.2.1.4.0_arm64"};
+        assertThrows(InvalidPatchIdFormatException.class,
+            () -> Utils.validatePatchIds(Arrays.asList(patchIds), false));
+    }
 }
diff --git a/imagetool/src/test/resources/inspect/image1.json b/imagetool/src/test/resources/inspect/image1.json
@@ -24,7 +24,8 @@
   "os" : {
     "id" : "ol",
     "name" : "Oracle Linux Server",
-    "version" : "7.9"
+    "version" : "7.9",
+    "architecture" : "x86_64"
   },
   "javaHome" : "/u01/jdk",
   "javaVersion" : "1.8.0_202",
diff --git a/imagetool/src/test/resources/inspect/image1.properties b/imagetool/src/test/resources/inspect/image1.properties
@@ -12,4 +12,5 @@ wlsVersion=12.2.1.3.0
 javaHome=/u01/jdk
 __OS__NAME="Oracle Linux Server"
 __OS__VERSION="7.9"
-__OS__ID="ol"
+__OS__ID="ol"
+__OS__arch=x86_64
diff --git a/imagetool/src/test/resources/inspect/image2.json b/imagetool/src/test/resources/inspect/image2.json
@@ -4,7 +4,8 @@
   "os" : {
     "id" : "ol",
     "name" : "Oracle Linux Server",
-    "version" : "7.9"
+    "version" : "7.9",
+    "architecture" : "x86_64"
   },
   "domainHome" : "/u01/domains/base_domain",
   "javaHome" : "/u01/jdk",
diff --git a/imagetool/src/test/resources/inspect/image2.properties b/imagetool/src/test/resources/inspect/image2.properties
@@ -13,4 +13,5 @@ wlsVersion=12.2.1.4.0
 javaHome=/u01/jdk
 __OS__NAME="Oracle Linux Server"
 __OS__VERSION="7.9"
-__OS__ID="ol"
+__OS__ID="ol"
+__OS__arch=x86_64
diff --git a/imagetool/src/test/resources/inspect/image3.json b/imagetool/src/test/resources/inspect/image3.json
@@ -5,6 +5,7 @@
     "id" : "ol",
     "name" : "Oracle Linux Server",
     "version" : "7.9",
+    "architecture" : "x86_64",
     "releasePackage" : "oraclelinux-release-7.9-1.0.7.el8.x86_64"
   },
   "domainHome" : "/u01/domains/base_domain",
diff --git a/imagetool/src/test/resources/inspect/image3.properties b/imagetool/src/test/resources/inspect/image3.properties
@@ -15,3 +15,4 @@ __OS__NAME="Oracle Linux Server"
 __OS__VERSION="7.9"
 __OS__ID="ol"
 __OS__RELEASE_PACKAGE="oraclelinux-release-7.9-1.0.7.el8.x86_64"
+__OS__arch=x86_64
diff --git a/installer/pom.xml b/installer/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <artifactId>imagetool-parent</artifactId>
         <groupId>com.oracle.weblogic.lifecycle.imagetool</groupId>
-        <version>1.14.0-SNAPSHOT</version>
+        <version>1.14.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.oracle.weblogic.lifecycle.imagetool</groupId>
     <artifactId>imagetool-parent</artifactId>
-    <version>1.14.0-SNAPSHOT</version>
+    <version>1.14.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>WebLogic Image Tool</name>
diff --git a/tests/pom.xml b/tests/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <artifactId>imagetool-parent</artifactId>
         <groupId>com.oracle.weblogic.lifecycle.imagetool</groupId>
-        <version>1.14.0-SNAPSHOT</version>
+        <version>1.14.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ void initializeOptions() throws IOException, InvalidCredentialException, Invalid`
`63`	`63`	`throw new InvalidCredentialException();`
`64`	`64`	`}`
`65`	`65`
`66`		`- Utils.validatePatchIds(patches, false);`
	`66`	`+ Utils.validatePatchIds(patches, true);`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`