jenmkinsfile

Jenkinsfile

@@ -1,79 +1,48 @@
 pipeline {
     agent any
-
     tools {
         maven 'maven-3'
     }
-
     environment {
+        JFROG_URL = "https://trialt0zppb.jfrog.io/artifactory"
+        JFROG_REPO_RELEASES = "petclinic-maven-dev-local"
+        JFROG_REPO_SNAPSHOTS = "petclinic-maven-dev-virtual"
+        JFROG_CREDENTIALS_ID = 'jfrog-saas'
         JFROG_CLI_BUILD_NAME = "spring-petclinic"
         JFROG_CLI_BUILD_NUMBER = "${BUILD_ID}"
-    ARTIFACTORY_URL = "https://trialt0zppb.jfrog.io/"
-    JF = "${WORKSPACE}/jf"
     }
-
     stages {
-
-    stage('Download JFrog CLI') {
-      steps {
-        sh '''
-          curl -fL https://releases.jfrog.io/artifactory/jfrog-cli/v2-jf/2.74.1/jfrog-cli-linux-arm64/jf -o "$JF"
-          chmod +x "$JF"
-        '''
-      }
-    }
-
-    stage('Configure JFrog CLI') {
-      steps {
-        withCredentials([usernamePassword(credentialsId: 'jfrog-saas', usernameVariable: 'ARTIFACTORY_USER', passwordVariable: 'ARTIFACTORY_PASSWORD')]) {
-          sh '''
-            "$JF" c add petclinic \
-              --url="${ARTIFACTORY_URL}" \
-              --user="$ARTIFACTORY_USER" \
-              --password="$ARTIFACTORY_PASSWORD" \
-              --interactive=false \
-              --enc-password=false
-          '''
-        }
-      }
-    }
-
-    stage('Validate Connection') {
-      steps {
-        sh '"$JF" c use petclinic'
-        sh '"$JF" rt ping'
-        sh '"$JF" c show petclinic'
-      }
-    }
-
         stage('Build Maven') {
             steps {
-        sh 'chmod +x mvnw'
+                script {
-        sh '''
+                    // Using JFrog plugin to capture build info
-          "$JF" mvnc --global \
+                    artifactory.upload spec: """{
-            --repo-resolve-releases=petclinic-maven-dev-virtual \
+                        "files": [
-            --repo-resolve-snapshots=petclinic-maven-dev-virtual \
+                            {
-            --repo-deploy-releases=petclinic-maven-dev-local \
+                                "pattern": "target/*.jar",
-            --repo-deploy-snapshots=petclinic-maven-dev-local
+                                "target": "${JFROG_REPO_RELEASES}/"
-        '''
-        sh '''
-          "$JF" mvn clean deploy \
-            -DskipTests -Dcheckstyle.skip=true \
-            --build-name="$JFROG_CLI_BUILD_NAME" \
-            --build-number="$JFROG_CLI_BUILD_NUMBER"
-        '''
-      }
                             }
+                        ]
+                    }"""
                     
+                    // Run Maven Build
+                    sh 'mvn clean deploy -DskipTests -Dcheckstyle.skip=true'
+                }
+            }
+        }
         stage('Publish Build Info') {
             steps {
-        sh '"$JF" rt build-collect-env'
+                script {
-        sh '"$JF" rt build-add-git'
+                    // Publish build information to JFrog Artifactory
-        sh '"$JF" rt build-publish'
+                    def buildInfo = Artifactory.newBuildInfo()
-      }
+                    buildInfo.name = "${JFROG_CLI_BUILD_NAME}"
-    }
+                    buildInfo.number = "${JFROG_CLI_BUILD_NUMBER}"
-  }
                     
+                    Artifactory.publishBuildInfo(buildInfo)
+                }
+            }
+        }
+    }
     post {
         always {
             echo "Build complete: ${env.JFROG_CLI_BUILD_NAME} #${env.BUILD_NUMBER}"