Reorganize Jenkinsfile

Jenkinsfile

@@ -12,6 +12,7 @@ pipeline {
     JDK_NAME = "Open JDK"
     ANT_NAME = "Ant"
     ANT_OUTPUT_DIR = "antBuild"
+    GRADLE_OUTPUT_DIR = "build"
   }
 
   options {
@@ -34,20 +35,31 @@ pipeline {
     stage("Build") {
       steps {
         echo "#INFO: Building project"
-        sh "gradle jar"
+        // withAnt(installation: "${env.ANT_NAME}", jdk: "${env.JDK_NAME}") {
+        //   sh "ant main"
+        // }
+        withGradle {
+          sh "gradle jar"
+        }
       }
     }
 
     stage("Unit tests") {
       steps {
         echo "#INFO: Running unit tests"
-        sh "gradle test"
+        // withAnt(installation: "${env.ANT_NAME}", jdk: "${env.JDK_NAME}") {
+        //   sh "ant test"
+        // }
+        withGradle {
+          sh "gradle test"
+        }
       }
 
       post {
         always {
           junit(
-            testResults: "build/test-results/test/TEST-*.xml",
+            // testResults: "${env.ANT_OUTPUT_DIR}/junit/result/TEST-*.xml",
+            testResults: "${env.GRADLE_OUTPUT_DIR}/test-results/test/TEST-*.xml",
             healthScaleFactor: 1.0,
             skipPublishingChecks: true
           )
@@ -64,7 +76,8 @@ pipeline {
       }
 
       steps {
-        archiveArtifacts(artifacts: "build/libs/*.jar", onlyIfSuccessful: true)
+        // archiveArtifacts(artifacts: "${env.ANT_OUTPUT_DIR}/dist/*.jar", onlyIfSuccessful: true)
+        archiveArtifacts(artifacts: "${env.GRADLE_OUTPUT_DIR}/libs/*.jar", onlyIfSuccessful: true)
       }
     }
 
@@ -77,14 +90,19 @@ pipeline {
       }
 
       steps {
-          echo "#INFO: Publish Javadoc"
+        echo "#INFO: Publish Javadoc"
+        // withAnt(installation: "${env.ANT_NAME}", jdk: "${env.JDK_NAME}") {
+        //   sh "ant docs"
+        // }
+        withGradle {
           sh "gradle javadoc"
         }
       }
 
       post {
         always {
-          javadoc(javadocDir: "build/docs/javadoc", keepAll: false)
+          // javadoc(javadocDir: "${env.ANT_OUTPUT_DIR}/docs", keepAll: false)
+          javadoc(javadocDir: "${env.GRADLE_OUTPUT_DIR}/docs/javadoc", keepAll: false)
         }
       }
     }