[archiva] branch master updated: Fixing repository path

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git


The following commit(s) were added to refs/heads/master by this push:
     new ba2b4ff  Fixing repository path
ba2b4ff is described below

commit ba2b4ffaf7fee71a8df9f44fdf9886b85adf84db
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sat Oct 12 22:44:38 2019 +0200

    Fixing repository path
---
 Jenkinsfile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e3a5335..d1f23f1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,7 +34,7 @@ buildJdk10 = 'JDK 10 (latest)'
 buildJdk11 = 'JDK 11 (latest)'
 buildMvn = 'Maven 3.5.4'
 //localRepository = ".repository"
-localRepository = "../.maven_repositories/${env.EXECUTOR_NUMBER}"
+//localRepository = "../.maven_repositories/${env.EXECUTOR_NUMBER}"
 mavenOpts = '-Xms1g -Xmx2g -Djava.awt.headless=true'
 publishers = [artifactsPublisher(disabled: false),
               junitPublisher(disabled: false, ignoreAttachments: false),
@@ -53,6 +53,9 @@ pipeline {
     parameters {
         booleanParam(name: 'PRECLEANUP', defaultValue: false, description: 'Clears the local maven repository before build.')
     }
+    environment {          
+        LOCAL_REPOSITORY = "../.maven_repositories/${env.EXECUTOR_NUMBER}"
+    }
 
 
     stages {
@@ -64,7 +67,7 @@ pipeline {
                 }
             }
             steps {
-                sh "rm -rf ${localRepository}"
+                sh "rm -rf ${env.LOCAL_REPOSITORY}"
             }
         }
 
@@ -76,7 +79,7 @@ pipeline {
             steps {
                 timeout(120) {
                     withMaven(maven: buildMvn, jdk: buildJdk,
-                            mavenLocalRepo: localRepository,
+                            mavenLocalRepo: env.LOCAL_REPOSITORY,
                             publisherStrategy: 'EXPLICIT',
                             mavenOpts: mavenOpts,
                             options: publishers )