added shade plugin to build uber jar

Former-commit-id: 6635186bdad6a7df38b08e9546411d8d57421122

Author: gosurya-oracle

pom.xml

@@ -30,4 +30,34 @@
             <version>3.8.0</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <!--<artifactSet>-->
+                                <!--<excludes>-->
+                                    <!--<exclude>classworlds:classworlds</exclude>-->
+                                    <!--<exclude>junit:junit</exclude>-->
+                                    <!--<exclude>jmock:*</exclude>-->
+                                    <!--<exclude>*:xml-apis</exclude>-->
+                                    <!--<exclude>org.apache.maven:lib:tests</exclude>-->
+                                    <!--<exclude>log4j:log4j:jar:</exclude>-->
+                                <!--</excludes>-->
+                            <!--</artifactSet>-->
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

src/main/java/com/oracle/weblogicx/imagebuilder/builder/cli/BuilderCLIDriver.java

@@ -56,7 +56,6 @@ public CommandResponse call() throws Exception {
         System.out.println("patches = \"" + patches + "\"");
         System.out.println("fromImage = \"" + fromImage + "\"");
         System.out.println("userId = \"" + userId + "\"");
-        System.out.println("password = \"" + password + "\"");
         System.out.println("publish = \"" + isPublish + "\"");
 
         FileHandler fileHandler = null;
@@ -121,7 +120,7 @@ public CommandResponse call() throws Exception {
 
                 if (!targetFile.exists() || !META_RESOLVER.hasMatchingKeyValue(propKey, targetFilePath)) {
                     if (useCache != always) {
-                        //System.out.println("1. Downloading from " + propVal + " to " + targetFilePath);
+                        System.out.println("1. Downloading from " + propVal + " to " + targetFilePath);
                         logger.info("1. Downloading from " + propVal + " to " + targetFilePath);
                         HttpUtil.downloadFile(propVal, targetFilePath, userId, password);
                         META_RESOLVER.addToCache(propKey, targetFilePath);
@@ -145,7 +144,7 @@ public CommandResponse call() throws Exception {
             if ("12.2.1.3.0".equals(installerVersion) ) {
                 if (!opatchFile.exists() || !META_RESOLVER.hasMatchingKeyValue(opatchKey, opatch_1394_path)) {
                     if (useCache != always) {
-                        //System.out.println("3. Downloading from " + OPATCH_1394_URL + " to " + opatch_1394_path);
+                        System.out.println("3. Downloading from " + OPATCH_1394_URL + " to " + opatch_1394_path);
                         logger.info("3. Downloading from " + OPATCH_1394_URL + " to " + opatch_1394_path);
                         HttpUtil.downloadFile(OPATCH_1394_URL, opatch_1394_path, userId, password);
                         META_RESOLVER.addToCache(opatchKey, opatch_1394_path);
@@ -262,8 +261,6 @@ public CommandResponse call() throws Exception {
     }
 
     private List<String> getInitialBuildCmd() {
-//        List<String> cmdBuilder = new ArrayList<>(Arrays.asList("docker", "build",
-//                "--squash", "--force-rm", "--no-cache", "--network=host"));
         List<String> cmdBuilder = Stream.of("docker", "build",
                 "--squash", "--force-rm", "--no-cache", "--network=host").collect(Collectors.toList());
 
@@ -390,6 +387,7 @@ private void setSystemProxy(String proxyUrl, String protocolToSet) {
             names = { "--password" },
             paramLabel = "<password associated with support user id>",
             required = true,
+            interactive = true,
             description = "Password for support userId"
     )
     private String password;
@@ -413,9 +411,9 @@ private void setSystemProxy(String proxyUrl, String protocolToSet) {
     private boolean isPublish = false;
 
     @Option(
-        hidden = true,
-        names = { "--httpProxyUrl" },
-        description = "proxy for http protocol. Ex: http://myproxy:80 or http://user:passwd@myproxy:8080"
+            hidden = true,
+            names = { "--httpProxyUrl" },
+            description = "proxy for http protocol. Ex: http://myproxy:80 or http://user:passwd@myproxy:8080"
     )
     private String httpProxyUrl;
 
@@ -445,94 +443,6 @@ private void setSystemProxy(String proxyUrl, String protocolToSet) {
     )
     private boolean isCLIMode;
 
-    public InstallerType getInstallerType() {
-        return installerType;
-    }
-
-    public void setInstallerType(InstallerType installerType) {
-        this.installerType = installerType;
-    }
-
-    public String getInstallerVersion() {
-        return installerVersion;
-    }
-
-    public void setInstallerVersion(String installerVersion) {
-        this.installerVersion = installerVersion;
-    }
-
-    public String getJdkVersion() {
-        return jdkVersion;
-    }
-
-    public void setJdkVersion(String jdkVersion) {
-        this.jdkVersion = jdkVersion;
-    }
-
-    public boolean isLatestPSU() {
-        return latestPSU;
-    }
-
-    public void setLatestPSU(boolean latestPSU) {
-        this.latestPSU = latestPSU;
-    }
-
-    public List<String> getPatches() {
-        return patches;
-    }
-
-    public void setPatches(List<String> patches) {
-        this.patches = patches;
-    }
-
-    public String getFromImage() {
-        return fromImage;
-    }
-
-    public void setFromImage(String fromImage) {
-        this.fromImage = fromImage;
-    }
-
-    public String getImageTag() {
-        return imageTag;
-    }
-
-    public void setImageTag(String imageTag) {
-        this.imageTag = imageTag;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public CachePolicy getUseCache() {
-        return useCache;
-    }
-
-    public void setUseCache(CachePolicy useCache) {
-        this.useCache = useCache;
-    }
-
-    public boolean isPublish() {
-        return isPublish;
-    }
-
-    public void setPublish(boolean publish) {
-        isPublish = publish;
-    }
-
     static class WLSVersionValues extends ArrayList<String> {
         WLSVersionValues() {
             super(Arrays.asList("12.2.1.3.0", "12.2.1.2.0"));

src/main/java/com/oracle/weblogicx/imagebuilder/builder/cli/CacheCLI.java

@@ -35,6 +35,13 @@ public class CacheCLI implements Runnable {
     )
     private Path cacheDirPath = null;
 
+    @Option(
+            names = { "--cli" },
+            description = "CLI Mode",
+            hidden = true
+    )
+    private boolean isCLIMode;
+
     @Override
     public void run() {
         if (listCachePath) {

src/main/java/com/oracle/weblogicx/imagebuilder/builder/util/ARUConstants.java

@@ -4,6 +4,7 @@
 
 public class ARUConstants {
 
+    public static final String OPATCH_KEY = "opatch_1394";
     public static final String OPATCH_1394_URL="https://updates.oracle.com/Orion/Services/download/" +
             "p28186730_139400_Generic.zip?aru=22310944&patch_file=p28186730_139400_Generic.zip";
     static final String REL_URL = "https://updates.oracle.com/Orion/Services/metadata?table=aru_releases";