Merge branch 'main' into Issue-851-password-digest-password

Author: CarolynRountree

Jenkinsfile

@@ -67,7 +67,7 @@ pipeline {
                 }
             }
             steps {
-                sh 'mvn -P system-test -Dmw_home=${ORACLE_HOME} test-compile failsafe:integration-test'
+                sh 'mvn -DskipITs=false -Dmw_home=${ORACLE_HOME} -Ddb.use.container.network=true verify'
             }
             post {
                 always {

alias-test/pom.xml

@@ -7,11 +7,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>weblogic-deploy-alias-test</artifactId>
+    <packaging>pom</packaging>
 
     <parent>
         <artifactId>weblogic-deploy</artifactId>
         <groupId>com.oracle.weblogic.lifecycle</groupId>
-        <version>1.9.7-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -22,6 +23,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -32,7 +34,6 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.7</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -50,6 +51,7 @@
                             <goal>testCompile</goal>
                         </goals>
                         <configuration>
+                            <skip>${alias-test-skipITs}</skip>
                         </configuration>
                     </execution>
                 </executions>
@@ -64,18 +66,21 @@
                         <goals>
                             <goal>testResources</goal>
                         </goals>
+                        <configuration>
+                            <skip>${alias-test-skipITs}</skip>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.0.0-M3</version>
                 <configuration>
+                    <skip>${alias-test-skipITs}</skip>
                     <encoding>UTF-8</encoding>
                     <failIfNoTests>false</failIfNoTests>
                     <argLine>
-                        -Xmx1024m -XX:MaxPermSize=256m
+                        -Xmx1024m
                     </argLine>
                     <systemProperties>
                         <property>

core/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.
+    Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.
     The Universal Permissive License (UPL), Version 1.0
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -11,7 +11,7 @@
     <parent>
         <artifactId>weblogic-deploy</artifactId>
         <groupId>com.oracle.weblogic.lifecycle</groupId>
-        <version>1.9.19-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -28,6 +28,10 @@
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
@@ -37,30 +41,16 @@
         <dependency>
             <groupId>org.python</groupId>
             <artifactId>jython</artifactId>
-            <version>2.2.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
-            <version>3.6</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-easymock</artifactId>
-            <version>2.0.9</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>2.0.9</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -104,7 +94,7 @@
                 <configuration>
                     <archive>
                         <manifestEntries>
-                            <Class-Path>antlr4-runtime-${antlr.version}.jar</Class-Path>
+                            <Class-Path>antlr4-runtime-${antlr.version}.jar snakeyaml-${snakeyaml.version}.jar</Class-Path>
                         </manifestEntries>
                     </archive>
                 </configuration>
@@ -139,6 +129,7 @@
                             <wlstScriptDirectory>${unit-test-wlst-dir}</wlstScriptDirectory>
                             <wlstExtClasspath>
                                 <element>org.antlr:antlr4-runtime:jar</element>
+                                <element>org.yaml:snakeyaml:jar</element>
                             </wlstExtClasspath>
                             <systemProperties>
                                 <unit-test-wlst-dir>${unit-test-wlst-dir}</unit-test-wlst-dir>