[brooklyn] branch master updated: Disable client build

[duncangrant]

This is an automated email from the ASF dual-hosted git repository.

duncangrant pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn.git


The following commit(s) were added to refs/heads/master by this push:
     new 5858d3c  Disable client build
5858d3c is described below

commit 5858d3c161808bfb134efd45aeb66d76a1a9a06d
Author: Duncan Grant <duncan.gr...@cloudsoft.io>
AuthorDate: Tue Apr 13 17:11:29 2021 +0100

    Disable client build
---
 Jenkinsfile     | 4 ++--
 brooklyn-server | 2 +-
 pom.xml         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9d30600..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 -XX:+CMSClassUnloadingEnabled 
-XX:+UseConcMarkSweepGC" ; mvn clean install -Prpm -Pdeb -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 -XX:+CMSClassUnloadingEnabled 
-XX:+UseConcMarkSweepGC" ; 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-server b/brooklyn-server
index b9b92be..49b4d3b 160000
--- a/brooklyn-server
+++ b/brooklyn-server
@@ -1 +1 @@
-Subproject commit b9b92be6a0109e1d21c03fe913a0e02597b09679
+Subproject commit 49b4d3b6127ceea638e6f5044c3b33306d28e22b
diff --git a/pom.xml b/pom.xml
index 6e1e284..c597389 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
 
     <modules>
         <module>brooklyn-server</module>
-<!--        <module>brooklyn-ui</module>-->
+        <module>brooklyn-ui</module>
         <module>brooklyn-library</module>
     </modules>