Tidy up build

Author: codesqueak

Jenkinsfile

@@ -1,43 +1,71 @@
 #!groovy
 
-def checkoutCode() {
-    stage 'checkout'
-    checkout scm: [$class: 'GitSCM', branches: [[name: '*/master']], userRemoteConfigs: [[url: 'https://github.com/codesqueak/jackson-json-crypto.git']]]
-}
-
-def build() {
-    stage 'build'
-    sh './gradlew clean build -x test'
-}
-
-def test() {
-    stage 'test'
-    sh './gradlew test'
-}
-
-def junitreport() {
-    stage 'JUnit report'
-    step([$class: 'JUnitResultArchiver', testResults: 'build/test-results/test/TEST-*.xml'])
-}
-
-def findbugsreport() {
-    stage 'Findbugs report'
-    step([$class: 'FindBugsPublisher', pattern: 'build/reports/findbugs/main.xml'])
-}
-
-def jacocoreport() {
-    stage 'Jacoco report'
-    step([$class: 'JacocoPublisher', execPattern: 'build/jacoco/jacocoTest.exec', pattern: 'build/jacoco/classpathdumps/net/codingrodent/**/*.class'])
-}
-
-
-stage 'execute Z80 build'
-
-node {
-    checkoutCode()
-    build()
-    test()
-    junitreport()
-    findbugsreport()
-    jacocoreport()
-}
+pipeline {
+    agent any
+    stages {
+        stage('Checkout') {
+            steps { //Checking out the repo
+                checkout scm: [$class: 'GitSCM', branches: [[name: '*/master']], userRemoteConfigs: [[url: 'https://github.com/codesqueak/jackson-json-crypto.git']]]
+                echo env.GIT_BRANCH
+                sh 'echo $GIT_BRANCH'
+            }
+        }
+
+
+
+        stage('Build') {
+            steps { //Build using jenkins
+                sh './gradlew clean build  test'
+            }
+        }
+
+        stage('Jar') {
+            steps { //Make a jar file
+                sh './gradlew jar'
+            }
+        }
+
+        stage('branch') {
+            steps { //branch check
+                echo env.GIT_BRANCH
+                sh 'echo $GIT_BRANCH'
+            }
+        }
+
+        stage ('develop') {
+            when {
+                expression { env.GIT_BRANCH == 'origin/develop' }
+            }
+            steps {
+                echo "Hello origin/develop"
+            }
+        }
+
+        stage ('release') {
+            when {
+                expression { env.GIT_BRANCH == 'origin/release' }
+            }
+            steps {
+                echo "Hello origin/release"
+            }
+        }
+
+        stage ('master') {
+            when {
+                expression { env.GIT_BRANCH == 'origin/master' }
+            }
+            steps {
+                echo "Hello origin/master"
+            }
+        }
+
+
+    }
+    post {
+        success {
+            junit testResults: '**/test-results/test/TEST-*.xml'
+            jacoco execPattern: '**/jacoco/jacocoTest.exec'
+            recordIssues enabledForFailure: true, tool: spotBugs(pattern: '**/reports/spotbugs/*.xml')
+        }
+    }
+}

build.gradle

@@ -133,22 +133,6 @@ jacocoTestReport {
     }
 }
 
-spotbugsMain {
-    reports {
-        html {
-            enabled = true
-        }
-    }
-}
-
-spotbugsTest {
-    reports {
-        html {
-            enabled = true
-        }
-    }
-}
-
 spotbugs {
     toolVersion = '4.1.4'
     ignoreFailures = false
@@ -188,10 +172,6 @@ artifactory {
     }
 }
 
-check.dependsOn jacocoTestReport
-test.dependsOn javadoc
-jar.dependsOn createPom
-jar.dependsOn setVersion
 
 dependencies {
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.11.3'