You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by iu...@apache.org on 2021/05/13 09:53:52 UTC
[brooklyn] branch revert-50-fix/brooklyn-client-build created (now
5f307a4)
This is an automated email from the ASF dual-hosted git repository.
iuliana pushed a change to branch revert-50-fix/brooklyn-client-build
in repository https://gitbox.apache.org/repos/asf/brooklyn.git.
at 5f307a4 Revert "Fix brooklyn-client build issue"
This branch includes the following new commits:
new 5f307a4 Revert "Fix brooklyn-client build issue"
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.
[brooklyn] 01/01: Revert "Fix brooklyn-client build issue"
Posted by iu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
iuliana pushed a commit to branch revert-50-fix/brooklyn-client-build
in repository https://gitbox.apache.org/repos/asf/brooklyn.git
commit 5f307a47904c18824a5c5178e86a9dd1f91b9303
Author: Iuliana Cosmina <iu...@gmail.com>
AuthorDate: Thu May 13 10:53:48 2021 +0100
Revert "Fix brooklyn-client build issue"
---
Jenkinsfile | 4 ++--
brooklyn-ui | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 782d815..4461e53 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -54,7 +54,7 @@ node(label: 'ubuntu') {
stage('Run tests') {
environmentDockerImage.inside('-i --name brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly -v ${WORKSPACE}:/usr/build -w /usr/build') {
- sh 'MAVEN_OPTS="-Xmx8g" ; mvn clean install -Prpm -Pdeb -Pclient -Duser.home=/var/maven -Duser.name=jenkins'
+ sh 'mvn clean install -Prpm -Pdeb -Duser.home=/var/maven -Duser.name=jenkins'
}
}
@@ -62,7 +62,7 @@ node(label: 'ubuntu') {
if (env.CHANGE_ID == null) {
stage('Deploy artifacts') {
environmentDockerImage.inside('-i --name brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly -v ${WORKSPACE}:/usr/build -w /usr/build') {
- sh 'MAVEN_OPTS="-Xmx8g" mvn deploy -Prpm -Pdeb -Pclient -DskipTests -Duser.home=/var/maven -Duser.name=jenkins'
+ sh 'mvn deploy -Prpm -Pdeb -DskipTests -Duser.home=/var/maven -Duser.name=jenkins'
}
}
}
diff --git a/brooklyn-ui b/brooklyn-ui
index 0b40be5..06562e9 160000
--- a/brooklyn-ui
+++ b/brooklyn-ui
@@ -1 +1 @@
-Subproject commit 0b40be5b8f345356c59bf0ccfa36575a612d4713
+Subproject commit 06562e931e6f208bbb897f17893baeae046154bf