Merge branch 'WDT-Support-for-1411' of github.com:oracle/weblogic-deploy-tooling into WDT-Support-for-1411

Author: CarolynRountree

Jenkinsfile

@@ -22,19 +22,32 @@ pipeline {
         stage ('Build') {
             steps {
                 sh '''
-                    mvn -B -DskipTests -Dunit-test-wlst-dir=${WLST_DIR} clean package
+                    mvn -B -DskipTests clean package
                 '''
             }
         }
-        stage ('Verify') {
+        stage ('Test') {
             steps {
-                sh 'mvn -Dunit-test-wlst-dir=${WLST_DIR} -Dmw_home=${ORACLE_HOME} verify'
+                sh 'mvn -Dunit-test-wlst-dir=${WLST_DIR} test'
             }
             post {
                 always {
                     junit 'core/target/surefire-reports/*.xml'
                 }
             }
         }
+        stage ('Verify') {
+            when {
+                changeRequest()
+            }
+            steps {
+                sh 'mvn -P system-test -Dmw_home=${ORACLE_HOME} test-compile failsafe:integration-test'
+            }
+            post {
+                always {
+                    junit 'system-test/target/failsafe-reports/*.xml'
+                }
+            }
+        }
     }
 }

core/pom.xml

@@ -31,8 +31,7 @@
         <!-- Need to resolve Jython classes at compile time.  At runtime, WLST will provide the classes. -->
         <dependency>
             <groupId>org.python</groupId>
-            <artifactId>${jython.package}</artifactId>
-            <version>${jython.version}</version>
+            <artifactId>jython</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

pom.xml

@@ -49,8 +49,6 @@
         <sonar.exclusions>.flattened-pom.xml,target/**</sonar.exclusions>
         <sonar.test.exclusions>src/test/**</sonar.test.exclusions>
         <unit-test-wlst-dir>${env.WLST_DIR}</unit-test-wlst-dir>
-        <jython.package>jython</jython.package>
-        <jython.version>2.2.1</jython.version>
     </properties>
 
     <dependencyManagement>
@@ -62,8 +60,8 @@
             </dependency>
             <dependency>
                 <groupId>org.python</groupId>
-                <artifactId>${jython.package}</artifactId>
-                <version>${jython.version}</version>
+                <artifactId>jython</artifactId>
+                <version>2.2.1</version>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>