Merge branch 'owsm-in-wls' into 'main'

Add OWSM component to base WLS install

See merge request weblogic-cloud/weblogic-image-tool!510

Author: ddsharpe

imagetool/src/main/java/com/oracle/weblogic/imagetool/aru/AruUtil.java

@@ -110,6 +110,10 @@ public List<AruPatch> getLatestPsu(FmwInstallerType type, String version, Archit
         throws AruException {
         List<AruPatch> result = new ArrayList<>();
         for (AruProduct product : type.products()) {
+            if (product == AruProduct.OWSM && ("14.1.1.0.0".equals(version) || "15.1.1.0.0".equals(version))) {
+                // OWSM is included with WLS installs, but OWSM did not have a release in 14.1.1 and 15.1.1
+                continue;
+            }
             List<AruPatch> psuList = getLatestPsu(product, version, architecture, userId, password);
             if (!psuList.isEmpty()) {
                 for (AruPatch psu: psuList) {
@@ -178,6 +182,10 @@ public List<AruPatch> getRecommendedPatches(FmwInstallerType type, String versio
                                                 String userId, String password) throws AruException {
         List<AruPatch> result = new ArrayList<>();
         for (AruProduct product : type.products()) {
+            if (product == AruProduct.OWSM && ("14.1.1.0.0".equals(version) || "15.1.1.0.0".equals(version))) {
+                // OWSM is included with WLS installs, but OWSM did not have a release in 14.1.1 and 15.1.1
+                continue;
+            }
             List<AruPatch> patches = getRecommendedPatches(type, product, version, architecture, userId, password);
 
             if (!patches.isEmpty()) {

imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/FmwInstallerType.java

@@ -26,15 +26,17 @@ public enum FmwInstallerType {
 
     // Oracle WebLogic Server
     WLS(Utils.toSet(AruProduct.WLS, AruProduct.COH, AruProduct.FMWPLAT, AruProduct.FIT, AruProduct.JDBC,
-        AruProduct.FMW_GLCM,
-        AruProduct.OSS), InstallerType.WLS), // Added OSS for a special patching issue for 12.2.1.4 JDBC fix
+        AruProduct.FMW_GLCM, AruProduct.OSS, AruProduct.OWSM),
+        InstallerType.WLS),
+    // WLS: Added OSS for a special patching issue for 12.2.1.4 JDBC fix
+    // WLS: Added OWSM because osdt jars are included in the WLS install
     WLSSLIM(Utils.toSet(WLS.products),
         InstallerType.WLSSLIM),
     WLSDEV(Utils.toSet(WLS.products),
         InstallerType.WLSDEV),
 
     // Oracle WebLogic Server Infrastructure (JRF)
-    FMW(Utils.toSet(WLS.products, AruProduct.JRF, AruProduct.JDEV, AruProduct.OPSS, AruProduct.OWSM),
+    FMW(Utils.toSet(WLS.products, AruProduct.JRF, AruProduct.JDEV, AruProduct.OPSS),
         InstallerType.FMW),
     // Oracle Service Bus
     OSB(Utils.toSet(FMW.products, AruProduct.OSB),

imagetool/src/test/java/com/oracle/weblogic/imagetool/installer/InstallerTest.java

@@ -38,8 +38,8 @@ void fmwInstallerTypeListTest() {
 
     @Test
     void fmwInstallerProductIds() {
-        AruProduct[] list1 = {AruProduct.WLS, AruProduct.FMW_GLCM, AruProduct.COH, AruProduct.FMWPLAT, AruProduct.JDBC,
-            AruProduct.FIT, AruProduct.OSS};
+        AruProduct[] list1 = {AruProduct.WLS, AruProduct.FIT, AruProduct.JDBC, AruProduct.OSS, AruProduct.OWSM,
+            AruProduct.COH, AruProduct.FMWPLAT, AruProduct.FMW_GLCM};
         assertEquals(Utils.toSet(list1), FmwInstallerType.WLS.products(),
             "WLS product list is incorrect or out of order");