You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2022/08/11 16:08:06 UTC
[sling-tooling-jenkins] branch bugfix/use-hidden-folder-for-repo-staging created (now 1c92fcc)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch bugfix/use-hidden-folder-for-repo-staging
in repository https://gitbox.apache.org/repos/asf/sling-tooling-jenkins.git
at 1c92fcc SLING-11530 use hidden folder for repository staging
This branch includes the following new commits:
new 1c92fcc SLING-11530 use hidden folder for repository staging
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[sling-tooling-jenkins] 01/01: SLING-11530 use hidden folder for repository staging
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch bugfix/use-hidden-folder-for-repo-staging
in repository https://gitbox.apache.org/repos/asf/sling-tooling-jenkins.git
commit 1c92fcc9d04331d5fa4152084da4e470120c5cc5
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Aug 11 18:08:01 2022 +0200
SLING-11530 use hidden folder for repository staging
---
vars/slingOsgiBundleBuild.groovy | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/vars/slingOsgiBundleBuild.groovy b/vars/slingOsgiBundleBuild.groovy
index bda30b3..e9173ea 100644
--- a/vars/slingOsgiBundleBuild.groovy
+++ b/vars/slingOsgiBundleBuild.groovy
@@ -145,7 +145,7 @@ def defineStage(def globalConfig, def jobConfig, def jdkVersion, boolean isRefer
if ( isReferenceStage ) {
if ( goal == "deploy" && shouldDeploy ) {
// this must be an absolute path to always refer to the same directory (for each Maven module in a reactor)
- String localRepoPath = "${pwd()}/local-snapshots-dir" // must also be outside target, as target is cleaned too late
+ String localRepoPath = "${pwd()}/.local-snapshots-dir" // must also be outside target, as target is cleaned too late
// Make sure the directory is wiped.
dir(localRepoPath) {
deleteDir()
@@ -173,7 +173,7 @@ def defineStage(def globalConfig, def jobConfig, def jdkVersion, boolean isRefer
}
if ( isReferenceStage && goal == 'deploy' && shouldDeploy ) {
// Stash the build results from the local deployment directory so we can deploy them on another node
- stash name: 'local-snapshots-dir', includes: 'local-snapshots-dir/**'
+ stash name: 'local-snapshots-dir', includes: '.local-snapshots-dir/**'
}
}
@@ -255,7 +255,7 @@ def deployToNexus(def globalConfig) {
unstash name: 'local-snapshots-dir'
// https://www.mojohaus.org/wagon-maven-plugin/merge-maven-repos-mojo.html
static final String WAGON_PLUGIN_GAV = "org.codehaus.mojo:wagon-maven-plugin:2.0.2"
- String mavenArguments = "${WAGON_PLUGIN_GAV}:merge-maven-repos -Dwagon.target=https://repository.apache.org/content/repositories/snapshots -Dwagon.targetId=apache.snapshots.https -Dwagon.source=file:${pwd()}/local-snapshots-dir"
+ String mavenArguments = "${WAGON_PLUGIN_GAV}:merge-maven-repos -Dwagon.target=https://repository.apache.org/content/repositories/snapshots -Dwagon.targetId=apache.snapshots.https -Dwagon.source=file:${pwd()}/.local-snapshots-dir"
withMaven(maven: globalConfig.mvnVersion,
jdk: jenkinsJdkLabel(11, globalConfig),
publisherStrategy: 'EXPLICIT') {