Merge branch 'main' into dependabot/maven/org.apache.httpcomponents-httpmime-4.5.13

Author: rjeberhard

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

@@ -32,6 +32,7 @@ public enum AruProduct {
 
     private final String productId;
     private final String description;
+
     AruProduct(String productId, String description) {
         this.productId = productId;
         this.description = description;

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/CacheCLI.java

@@ -10,18 +10,18 @@
 import picocli.CommandLine.Unmatched;
 
 @Command(
-        name = "cache",
-        description = "List and set cache options",
-        versionProvider = HelpVersionProvider.class,
-        commandListHeading = "%nCommands:%n%n",
-        subcommands = {
-                ListCacheItems.class,
-                AddInstallerEntry.class,
-                AddPatchEntry.class,
-                AddEntry.class,
-                DeleteEntry.class
-        },
-        sortOptions = false
+    name = "cache",
+    description = "List and set cache options",
+    versionProvider = HelpVersionProvider.class,
+    commandListHeading = "%nCommands:%n%n",
+    subcommands = {
+        ListCacheItems.class,
+        AddInstallerEntry.class,
+        AddPatchEntry.class,
+        AddEntry.class,
+        DeleteEntry.class
+    },
+    sortOptions = false
 )
 public class CacheCLI {
 

imagetool/src/main/java/com/oracle/weblogic/imagetool/inspect/InspectOutput.java

@@ -73,6 +73,9 @@ public String toString() {
             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())).append("\n");
+            if (os.releasePackage() != null) {
+                result.append(jsonKeyValuePair(2, "releasePackage", os.releasePackage())).append("\n");
+            }
             result.append(pad(1)).append("},");
             result.append('\n');
         }

imagetool/src/main/java/com/oracle/weblogic/imagetool/inspect/OperatingSystemProperties.java

@@ -11,6 +11,7 @@ public class OperatingSystemProperties {
     private String id;
     private String version;
     private String name;
+    private String releasePackage;
 
     public String id() {
         return id;
@@ -24,6 +25,10 @@ public String name() {
         return name;
     }
 
+    public String releasePackage() {
+        return releasePackage;
+    }
+
     /**
      * Using the properties obtained from the image, extract the OS properties prefixed with __OS__.
      * @param imageProperties properties returned from the image inspection
@@ -37,6 +42,7 @@ public static OperatingSystemProperties getOperatingSystemProperties(Properties
             result.version = removeQuotes(imageProperties.getProperty("__OS__VERSION_ID"));
         }
         result.name = removeQuotes(imageProperties.getProperty("__OS__NAME"));
+        result.releasePackage = imageProperties.getProperty("__OS__RELEASE_PACKAGE");
         return result;
     }
 

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

@@ -83,6 +83,7 @@ public enum FmwInstallerType {
 
     private final InstallerType[] installers;
     private final Set<AruProduct> products;
+
     FmwInstallerType(Set<AruProduct> products, InstallerType... installers) {
         this.installers = installers;
         this.products = products;

imagetool/src/main/resources/probe-env/inspect-image-long.sh

@@ -86,6 +86,10 @@ fi
 
 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 '')"
+    if [ -n "$releasePackage" ]; then
+      echo __OS__RELEASE_PACKAGE=$releasePackage
+    fi
 elif type busybox > /dev/null 2>&1; then
   echo __OS__ID="bb"
   echo __OS__NAME="$(busybox | head -1 | awk '{ print $1 }')"

imagetool/src/main/resources/probe-env/inspect-image.sh

@@ -66,6 +66,10 @@ fi
 
 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 '')"
+  if [ -n "$releasePackage" ]; then
+    echo __OS__RELEASE_PACKAGE=$releasePackage
+  fi
 elif type busybox > /dev/null 2>&1; then
   echo __OS__ID="bb"
   echo __OS__NAME="$(busybox | head -1 | awk '{ print $1 }')"

imagetool/src/test/java/com/oracle/weblogic/imagetool/cli/menu/CommonOptionsTest.java

@@ -44,6 +44,7 @@ private static void setPrivateField(String fieldname, Object target, Object valu
     /**
      * handleChown() should set the Dockerfile userid and groupid.
      * use case: user provides derek:data.  Result should be "derek" for user and "data" for group.
+     *
      * @throws Exception if reflection fails (developer error)
      */
     @Test
@@ -66,6 +67,7 @@ void handleChown() throws Exception {
     /**
      * handleChown() should set the Dockerfile userid and groupid.
      * use case: default, no input.  Result should be "oracle" for both.
+     *
      * @throws Exception if reflection fails (developer error)
      */
     @Test
@@ -87,6 +89,7 @@ void handleChownDefault() throws Exception {
 
     /**
      * Test CommonOptions handleChown method.
+     *
      * @throws Exception if reflection fails (developer error)
      */
     @Test
@@ -172,7 +175,7 @@ void testResolveOptions() throws Exception {
         resourceTemplatesField.setAccessible(true);
         List<Path> resolveFiles =
             Arrays.asList(new File("target/test-classes/templates/resolver.yml").toPath(),
-            new File("target/test-classes/templates/verrazzano.yml").toPath());
+                new File("target/test-classes/templates/verrazzano.yml").toPath());
         resourceTemplatesField.set(wdtOptions, resolveFiles);
 
         Field imageTagField = WdtFullOptions.class.getDeclaredField("wdtDomainHome");

pom.xml

@@ -163,7 +163,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>exec-maven-plugin</artifactId>
-                    <version>1.6.0</version>
+                    <version>3.1.0</version>
                     <executions>
                         <execution>
                             <id>generate-autocompletion-script</id>
@@ -214,7 +214,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.1.2</version>
                     <executions>
                         <execution>
                             <id>checkstyle</id>
@@ -261,7 +261,7 @@
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.8.7</version>
+                    <version>0.8.8</version>
                     <executions>
                         <execution>
                             <id>prepare-agent</id>
@@ -286,7 +286,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.0.0-M2</version>
+                    <version>3.1.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>