Merge remote-tracking branch 'apache-git/master'
diff --git a/Dockerfile b/Dockerfile
index 226314a..ee36bc7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,6 @@
RUN apt-get update && apt-get install -y \
git-core \
procps \
- golang-go \
rpm \
dpkg \
libpng-dev \
@@ -45,6 +44,16 @@
tar \
zip
+RUN cd /tmp \
+&& curl -O https://dl.google.com/go/go1.15.8.linux-amd64.tar.gz \
+&& CKSUM=$(sha256sum go1.15.8.linux-amd64.tar.gz | awk '{print $1}') \
+&& [ ${CKSUM} = "d3379c32a90fdf9382166f8f48034c459a8cc433730bc9476d39d9082c94583b" ] \
+&& tar xf go1.15.8.linux-amd64.tar.gz \
+&& rm go1.15.8.linux-amd64.tar.gz \
+&& chown -R root:root ./go \
+&& mv go /usr/local
+
+ENV PATH="${PATH}:/usr/local/go/bin"
# Make sure the /.config && /.npm (for UI module builds) is writable for all users
RUN mkdir -p /.config && chmod -R 777 /.config
RUN mkdir -p /.npm && chmod -R 777 /.npm
diff --git a/Jenkinsfile b/Jenkinsfile
index b3754ed..9774591 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -63,7 +63,7 @@
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 '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-client b/brooklyn-client
index 554a149..77c4f20 160000
--- a/brooklyn-client
+++ b/brooklyn-client
@@ -1 +1 @@
-Subproject commit 554a14925a2bb1520252e8feba38614437db2fb5
+Subproject commit 77c4f20a344b0f37aa31318215b47a5536289425
diff --git a/brooklyn-dist b/brooklyn-dist
index c17db49..87f842f 160000
--- a/brooklyn-dist
+++ b/brooklyn-dist
@@ -1 +1 @@
-Subproject commit c17db496dc95948dd69e077c22a9cbcdd8c55cbe
+Subproject commit 87f842f06f68cca04dd07c138312d05900db4be5
diff --git a/brooklyn-docs b/brooklyn-docs
index 6b41012..ad6de9c 160000
--- a/brooklyn-docs
+++ b/brooklyn-docs
@@ -1 +1 @@
-Subproject commit 6b410121d3bb3e6de056b109df97cc4e03cac475
+Subproject commit ad6de9c823e3d968d6b242d9885b220bef698b5e
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..04a58ce 160000
--- a/brooklyn-server
+++ b/brooklyn-server
@@ -1 +1 @@
-Subproject commit e461d3766a17c46b524f5bdf4d95dda54490ab6a
+Subproject commit 04a58ce5a17a0366e8858672b89713c118f58035
diff --git a/brooklyn-ui b/brooklyn-ui
index 4685871..c2f50b7 160000
--- a/brooklyn-ui
+++ b/brooklyn-ui
@@ -1 +1 @@
-Subproject commit 4685871bcb80e66b79a2b82c016f91cb318e54a0
+Subproject commit c2f50b75eb3b2ebad858632b708ac9d983e5352f
diff --git a/pom.xml b/pom.xml
index c597389..bc27bf7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,7 @@
</profiles>
<build>
+ <defaultGoal>clean install</defaultGoal>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
