merging develop-4.0

Author: robertpatrick

THIRD_PARTY_LICENSES.txt

@@ -11,7 +11,7 @@
     <parent>
         <artifactId>weblogic-deploy</artifactId>
         <groupId>com.oracle.weblogic.lifecycle</groupId>
-        <version>3.5.5-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,6 +36,51 @@
             <groupId>info.picocli</groupId>
             <artifactId>picocli</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.hierynomus</groupId>
+            <artifactId>sshj</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.i2p.crypto</groupId>
+            <artifactId>eddsa</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.jcraft</groupId>
+            <artifactId>jzlib</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.hierynomus</groupId>
+            <artifactId>asn-one</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.fusesource.jansi</groupId>
+            <artifactId>jansi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jline</groupId>
+            <artifactId>jline-terminal-jansi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jline</groupId>
+            <artifactId>jline-terminal</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jline</groupId>
+            <artifactId>jline-reader</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
@@ -89,6 +134,7 @@
                 <includes>
                     <include>oracle/**/*.json</include>
                     <include>oracle/**/*.ldift</include>
+                    <include>oracle/**/*.mustache</include>
                     <include>oracle/**/*.properties</include>
                     <include>oracle/**/*.sh</include>
                     <include>oracle/**/*.yaml</include>
@@ -171,7 +217,7 @@
                     <archive>
                         <manifestEntries>
                             <Multi-Release>true</Multi-Release>
-                            <Class-Path>antlr4-runtime-${antlr.version}.jar snakeyaml-${snakeyaml.version}.jar picocli-${picocli.version}.jar</Class-Path>
+                            <Class-Path>antlr4-runtime-${antlr.version}.jar snakeyaml-${snakeyaml.version}.jar picocli-${picocli.version}.jar sshj-${sshj.version}.jar asn-one-${asn.one.version}.jar eddsa-${eddsa.version}.jar slf4j-jdk14-${slf4j.version}.jar slf4j-api-${slf4j.version}.jar jzlib-${jzlib.version}.jar jline-reader-${jline.version}.jar jline-terminal-${jline.version}.jar jline-terminal-jansi-${jline.version}.jar jansi-${jansi.version}.jar</Class-Path>
                         </manifestEntries>
                     </archive>
                 </configuration>
@@ -207,9 +253,15 @@
                             <wlstExtClasspath>
                                 <element>org.antlr:antlr4-runtime:jar</element>
                                 <element>org.yaml:snakeyaml:jar</element>
+                                <element>com.hierynomus:sshj:jar</element>
+                                <element>net.i2p.crypto:eddsa:jar</element>
+                                <element>org.slf4j:slf4j-jdk14:jar</element>
+                                <element>org.slf4j:slf4j-api:jar</element>
+                                <element>com.jcraft:jzlib:jar</element>
                             </wlstExtClasspath>
                             <systemProperties>
                                 <unit-test-wlst-dir>${unit-test-wlst-dir}</unit-test-wlst-dir>
+                                <java.util.logging.config.file>${project.basedir}/src/test/resources/log-unit-test.properties</java.util.logging.config.file>
                             </systemProperties>
                             <environmentVariables>
                                 <WDT_CUSTOM_CONFIG>${project.build.directory}/unit-tests/wdt-config</WDT_CUSTOM_CONFIG>