Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove maven-versions-plugin-set-version var
[releng/global-jjb.git]
/
jjb
/
lf-maven-jobs.yaml
diff --git
a/jjb/lf-maven-jobs.yaml
b/jjb/lf-maven-jobs.yaml
index
eec378a
..
b58eaff
100644
(file)
--- a/
jjb/lf-maven-jobs.yaml
+++ b/
jjb/lf-maven-jobs.yaml
@@
-35,7
+35,7
@@
pom: '{mvn-pom}'
goals: 'versions:set versions:update-child-modules versions:commit -B'
properties:
pom: '{mvn-pom}'
goals: 'versions:set versions:update-child-modules versions:commit -B'
properties:
- - 'newVersion=${{
maven-versions-plugin-set-
version}}'
+ - 'newVersion=${{
release_
version}}'
settings: '{mvn-settings}'
settings-type: cfp
global-settings: 'global-settings'
settings: '{mvn-settings}'
settings-type: cfp
global-settings: 'global-settings'
@@
-692,7
+692,6
@@
github-url: 'https://github.com'
java-version: openjdk8
maven-versions-plugin: false
github-url: 'https://github.com'
java-version: openjdk8
maven-versions-plugin: false
- maven-versions-plugin-set-version: ''
mvn-central: false
mvn-global-settings: global-settings
mvn-goals: clean deploy
mvn-central: false
mvn-global-settings: global-settings
mvn-goals: clean deploy
@@
-727,6
+726,10
@@
mvn-params: '{mvn-params}'
mvn-version: '{mvn-version}'
staging-profile-id: '{staging-profile-id}'
mvn-params: '{mvn-params}'
mvn-version: '{mvn-version}'
staging-profile-id: '{staging-profile-id}'
+ - bool:
+ name: MAVEN_VERSIONS_PLUGIN
+ default: '{maven-versions-plugin}'
+ description: Use maven-versions-plugin to update pom versions.
- string:
name: ARCHIVE_ARTIFACTS
default: '{archive-artifacts}'
- string:
name: ARCHIVE_ARTIFACTS
default: '{archive-artifacts}'
@@
-746,13
+749,12
@@
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
- - shell: !include-raw-escape: ../shell/maven-patch-release.sh
- lf-maven-versions-plugin:
maven-versions-plugin: '{maven-versions-plugin}'
mvn-version: '{mvn-version}'
mvn-pom: '{mvn-pom}'
- lf-maven-versions-plugin:
maven-versions-plugin: '{maven-versions-plugin}'
mvn-version: '{mvn-version}'
mvn-pom: '{mvn-pom}'
- maven-versions-plugin-set-version: '{maven-versions-plugin-set-version}'
mvn-settings: '{mvn-settings}'
mvn-settings: '{mvn-settings}'
+ - shell: !include-raw-escape: ../shell/maven-patch-release.sh
- lf-maven-build:
mvn-goals: '{mvn-goals}'
- lf-sigul-sign-dir:
- lf-maven-build:
mvn-goals: '{mvn-goals}'
- lf-sigul-sign-dir:
@@
-1064,7
+1066,7
@@
mvn-global-settings: global-settings
mvn-goals: clean deploy
mvn-opts: ''
mvn-global-settings: global-settings
mvn-goals: clean deploy
mvn-opts: ''
- mvn-params: '-Dstream=$STREAM'
+ mvn-params: '-Dstream=$STREAM
-Dmaven.source.skip=true
'
mvn-version: mvn35
stream: master
submodule-recursive: true
mvn-version: mvn35
stream: master
submodule-recursive: true