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
Resolve shellcheck SC219[67] ?grep non-standard
[releng/global-jjb.git]
/
jjb
/
lf-maven-jobs.yaml
diff --git
a/jjb/lf-maven-jobs.yaml
b/jjb/lf-maven-jobs.yaml
index
a01af95
..
77f34de
100644
(file)
--- a/
jjb/lf-maven-jobs.yaml
+++ b/
jjb/lf-maven-jobs.yaml
@@
-311,6
+311,7
@@
git-url: "$GIT_URL/$PROJECT"
github-url: "https://github.com"
java-version: openjdk8
git-url: "$GIT_URL/$PROJECT"
github-url: "https://github.com"
java-version: openjdk8
+ mvn-dir: "."
mvn-global-settings: global-settings
mvn-opts: ""
mvn-params: ""
mvn-global-settings: global-settings
mvn-opts: ""
mvn-params: ""
@@
-343,7
+344,9
@@
- lf-infra-create-netrc:
server-id: "{mvn-site-id}"
- inject:
- lf-infra-create-netrc:
server-id: "{mvn-site-id}"
- inject:
- properties-content: "DEPLOY_PATH={javadoc-path}"
+ properties-content: |
+ DEPLOY_PATH={javadoc-path}
+ MAVEN_DIR={mvn-dir}
- shell: !include-raw-escape:
- ../shell/common-variables.sh
- ../shell/maven-javadoc-generate.sh
- shell: !include-raw-escape:
- ../shell/common-variables.sh
- ../shell/maven-javadoc-generate.sh
@@
-440,6
+443,7
@@
git-url: "$GIT_URL/$PROJECT"
github-url: "https://github.com"
java-version: openjdk8
git-url: "$GIT_URL/$PROJECT"
github-url: "https://github.com"
java-version: openjdk8
+ mvn-dir: "."
mvn-global-settings: global-settings
mvn-opts: ""
mvn-params: ""
mvn-global-settings: global-settings
mvn-opts: ""
mvn-params: ""
@@
-474,6
+478,9
@@
- 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}"
+ - inject:
+ properties-content: |
+ MAVEN_DIR={mvn-dir}
- shell: !include-raw-escape:
- ../shell/common-variables.sh
- ../shell/maven-javadoc-generate.sh
- shell: !include-raw-escape:
- ../shell/common-variables.sh
- ../shell/maven-javadoc-generate.sh