@@ -40,36 +40,7 @@ pipeline {
40
40
script {
41
41
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
42
42
sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
43
- " ./mvnw -Pwith-bom-client verify -B -U"
44
- }
45
- }
46
- }
47
- }
48
-
49
- stage(" Verify other configurations" ) {
50
- when {
51
- beforeAgent(true )
52
- allOf {
53
- branch(pattern : " main|(\\ d+\\ .\\ d+\\ .x)" , comparator : " REGEXP" )
54
- not { triggeredBy ' UpstreamCause' }
55
- }
56
- }
57
- parallel {
58
- stage(" verify (next)" ) {
59
- agent {
60
- label ' data'
61
- }
62
- options { timeout(time : 30 , unit : ' MINUTES' ) }
63
- environment {
64
- ARTIFACTORY = credentials(" ${ p['artifactory.credentials']} " )
65
- }
66
- steps {
67
- script {
68
- docker. image(p[' docker.java.next.image' ]). inside(p[' docker.java.inside.basic' ]) {
69
- sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
70
- " ./mvnw -Pwith-bom-client verify -B -U"
71
- }
72
- }
43
+ " ./mvnw -s settings.xml -Pwith-bom-client verify -B -U"
73
44
}
74
45
}
75
46
}
@@ -96,13 +67,13 @@ pipeline {
96
67
script {
97
68
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
98
69
sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
99
- " ./mvnw -Pci,artifactory " +
70
+ " ./mvnw -s settings.xml - Pci,artifactory " +
100
71
" -Dartifactory.server=${ p['artifactory.url']} " +
101
72
" -Dartifactory.username=${ ARTIFACTORY_USR} " +
102
73
" -Dartifactory.password=${ ARTIFACTORY_PSW} " +
103
74
" -Dartifactory.staging-repository=${ p['artifactory.repository.snapshot']} " +
104
75
" -Dartifactory.build-name=spring-data-bom " +
105
- " -Dartifactory.build-number=${ BUILD_NUMBER} " +
76
+ " -Dartifactory.build-number=spring-data-bom- ${ BRANCH_NAME } -build- ${ BUILD_NUMBER} " +
106
77
" -Dmaven.test.skip=true clean deploy -U -B"
107
78
}
108
79
}
0 commit comments