Fix profiles

baharclerode · baharclerode · commit b1378b584b70 · 2021-01-09T11:29:01.000-06:00
diff --git a/vars/mavenCiPipeline.groovy b/vars/mavenCiPipeline.groovy
@@ -33,7 +33,7 @@ def call(Closure closure) {
         }
 
         buildEnv.inside {
-            withMaven(globalMavenSettingsConfig: globalMavenSettingsConfig, mavenLocalRepo: '.m2') {
+            configFileProvider([configFile(fileId: globalMavenSettingsConfig, variable: "MAVEN_SETTINGS")]) {
                 /*
                  * Clone the repository and make sure that the pom.xml file is structurally valid and has a GAV
                  */
@@ -83,7 +83,7 @@ def call(Closure closure) {
                         withCredentials([string(credentialsId: 'gpg-signing-key-id', variable: 'GPG_KEYID'), file(credentialsId: 'gpg-signing-key', variable: 'GPG_SIGNING_KEY')]) {
                             sh 'gpg --allow-secret-key-import --import $GPG_SIGNING_KEY && echo "$GPG_KEYID:6:" | gpg --import-ownertrust'
 
-                            sh "mvn ${mavenArgs} ${isDeployableBranch ? mavenDeployGoals : mavenNonDeployGoals} ${isDeployableBranch ? mavenDeployArgs : mavenNonDeployArgs} \"-Dgpg.keyname=$GPG_KEYID\""
+                            sh "mvn -s \\\"$MAVEN_SETTINGS\\\" \\\"-Dmaven.repo.local=$WORKSPACE/.m2\\\" ${mavenArgs} ${isDeployableBranch ? mavenDeployGoals : mavenNonDeployGoals} ${isDeployableBranch ? mavenDeployArgs : mavenNonDeployArgs} \"-Dgpg.keyname=$GPG_KEYID\""
                         }
                         archiveArtifacts 'target/checkout/**/pom.xml'
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ def call(Closure closure) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`buildEnv.inside {`
`36`		`- withMaven(globalMavenSettingsConfig: globalMavenSettingsConfig, mavenLocalRepo: '.m2') {`
	`36`	`+ configFileProvider([configFile(fileId: globalMavenSettingsConfig, variable: "MAVEN_SETTINGS")]) {`
`37`	`37`	`/*`
`38`	`38`	`* Clone the repository and make sure that the pom.xml file is structurally valid and has a GAV`
`39`	`39`	`*/`
`@@ -83,7 +83,7 @@ def call(Closure closure) {`
`83`	`83`	`withCredentials([string(credentialsId: 'gpg-signing-key-id', variable: 'GPG_KEYID'), file(credentialsId: 'gpg-signing-key', variable: 'GPG_SIGNING_KEY')]) {`
`84`	`84`	`sh 'gpg --allow-secret-key-import --import $GPG_SIGNING_KEY && echo "$GPG_KEYID:6:" \| gpg --import-ownertrust'`
`85`	`85`
`86`		`- sh "mvn ${mavenArgs} ${isDeployableBranch ? mavenDeployGoals : mavenNonDeployGoals} ${isDeployableBranch ? mavenDeployArgs : mavenNonDeployArgs} \"-Dgpg.keyname=$GPG_KEYID\""`
	`86`	`+ sh "mvn -s \\\"$MAVEN_SETTINGS\\\" \\\"-Dmaven.repo.local=$WORKSPACE/.m2\\\" ${mavenArgs} ${isDeployableBranch ? mavenDeployGoals : mavenNonDeployGoals} ${isDeployableBranch ? mavenDeployArgs : mavenNonDeployArgs} \"-Dgpg.keyname=$GPG_KEYID\""`
`87`	`87`	`}`
`88`	`88`	`archiveArtifacts 'target/checkout/**/pom.xml'`
`89`	`89`