Merge remote-tracking branch 'apache-git/master'

apache · Sep 15, 2021 · 7fdccd260164293e0ebfe51a4d428aca1c717e2d · 7fdccd2
2 parents 09a51f4 + 8d71f00
commit 7fdccd260164293e0ebfe51a4d428aca1c717e2d
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -26,7 +26,6 @@ FROM maven:3.5.4-jdk-8
 RUN apt-get update && apt-get install -y \
     git-core \
     procps \
-    golang-go \
     rpm \
     dpkg \
     libpng-dev \
@@ -45,6 +44,16 @@ RUN apt-get update && apt-get install -y \
     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
@@ -63,7 +63,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 '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
diff --git a/brooklyn-dist b/brooklyn-dist
diff --git a/brooklyn-docs b/brooklyn-docs
diff --git a/brooklyn-library b/brooklyn-library
diff --git a/brooklyn-server b/brooklyn-server
diff --git a/brooklyn-ui b/brooklyn-ui
diff --git 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.-->