diff --git a/Jenkinsfile b/Jenkinsfile
index e0365d1..9d30600 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -54,7 +54,7 @@
 
             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 'mvn clean install -Prpm -Pdeb -Duser.home=/var/maven -Duser.name=jenkins'
+                    sh 'MAVEN_OPTS="-Xmx8g -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC" ; mvn clean install -Prpm -Pdeb -Duser.home=/var/maven -Duser.name=jenkins'
                 }
             }
 
diff --git a/brooklyn-client b/brooklyn-client
index 554a149..9557583 160000
--- a/brooklyn-client
+++ b/brooklyn-client
@@ -1 +1 @@
-Subproject commit 554a14925a2bb1520252e8feba38614437db2fb5
+Subproject commit 9557583eb11b06c56dff54f9c415ad6997eb91c3
diff --git a/brooklyn-dist b/brooklyn-dist
index c17db49..3288e06 160000
--- a/brooklyn-dist
+++ b/brooklyn-dist
@@ -1 +1 @@
-Subproject commit c17db496dc95948dd69e077c22a9cbcdd8c55cbe
+Subproject commit 3288e06b5986fd4680ae3eab7ca8db5fed658ec3
diff --git a/brooklyn-docs b/brooklyn-docs
index 6b41012..a23b427 160000
--- a/brooklyn-docs
+++ b/brooklyn-docs
@@ -1 +1 @@
-Subproject commit 6b410121d3bb3e6de056b109df97cc4e03cac475
+Subproject commit a23b427554cd5f19f61a5f1fc5075bcc528a30ae
diff --git a/brooklyn-library b/brooklyn-library
index 3d49131..961d062 160000
--- a/brooklyn-library
+++ b/brooklyn-library
@@ -1 +1 @@
-Subproject commit 3d49131db586a517a9ccf6aab34e5bbfec73a5d7
+Subproject commit 961d0620f3942e9e9430f47bfd6dac3cae2635b0
diff --git a/brooklyn-server b/brooklyn-server
index e461d37..b9b92be 160000
--- a/brooklyn-server
+++ b/brooklyn-server
@@ -1 +1 @@
-Subproject commit e461d3766a17c46b524f5bdf4d95dda54490ab6a
+Subproject commit b9b92be6a0109e1d21c03fe913a0e02597b09679
diff --git a/brooklyn-ui b/brooklyn-ui
index 4685871..06562e9 160000
--- a/brooklyn-ui
+++ b/brooklyn-ui
@@ -1 +1 @@
-Subproject commit 4685871bcb80e66b79a2b82c016f91cb318e54a0
+Subproject commit 06562e931e6f208bbb897f17893baeae046154bf
diff --git a/pom.xml b/pom.xml
index c597389..6e1e284 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>