Merge branch 'master' into license-update-2020
diff --git a/Dockerfile b/Dockerfile
index 5f71a42..226314a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,12 +17,12 @@
# For all Brooklyn, we use a debian distribution instead of alpine as there are some libgcc incompatibilities with GO
# and PhantomJS
-FROM maven:3.6.3-jdk-8
-
-# Install the non-headless JRE as some tests requires them
-RUN apt-get update && apt-get install -y openjdk-8-jre
+FROM maven:3.5.4-jdk-8
# Install necessary binaries to build brooklyn
+# Strictly speaking, rsync, gpg, tar, and zip are only necessary
+# if you are creating release artifacts, but they are fairly
+# low footprint
RUN apt-get update && apt-get install -y \
git-core \
procps \
@@ -39,7 +39,11 @@
dpkg \
pkg-config \
nasm \
- gcc
+ gcc \
+ rsync \
+ gpg \
+ tar \
+ zip
# Make sure the /.config && /.npm (for UI module builds) is writable for all users
RUN mkdir -p /.config && chmod -R 777 /.config
diff --git a/Jenkinsfile b/Jenkinsfile
index 4461e53..dda0fb4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -62,7 +62,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 -DskipTests -Duser.home=/var/maven -Duser.name=jenkins'
+ sh 'mvn deploy -Prpm -Pdeb -Pclient -DskipTests -Duser.home=/var/maven -Duser.name=jenkins'
}
}
}
diff --git a/README.md b/README.md
index e345bf6..dfd840a 100644
--- a/README.md
+++ b/README.md
@@ -25,9 +25,9 @@
And then, with jdk 1.8+ and maven 3.1+ installed:
- mvn clean install -Dno-go-client -Dno-rpm -Dno-deb -DskipDocker
+ mvn clean install
-However, you won't be able to build the RPM/DEB packages, as well as the CLI. That's why we would recommand to use the
+However, this will not build the RPM/DEB packages, as well as the CLI. That's why we would recommand to use the
alternative: a docker container to build this project:
```bash
@@ -36,7 +36,7 @@
--mount type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly \
-v /var/run/docker.sock:/var/run/docker.sock \
-v ${PWD}:/usr/build -w /usr/build \
- brooklyn mvn clean install -Duser.home=/var/maven -Duser.name=$(id -un)
+ brooklyn mvn clean install -Duser.home=/var/maven -Duser.name=$(id -un) -Drpm -Ddeb -Dclient -Ddocker
```
You can speed this up by using your local .m2 cache:
@@ -45,7 +45,7 @@
-v /var/run/docker.sock:/var/run/docker.sock \
-v ${HOME}/.m2:/var/maven/.m2 \
-v ${PWD}:/usr/build -w /usr/build \
- brooklyn mvn clean install -Duser.home=/var/maven -Duser.name=$(id -un)
+ brooklyn mvn clean install -Duser.home=/var/maven -Duser.name=$(id -un) -Drpm -Ddeb -Dclient -Ddocker
```
The results are in `brooklyn-dist/dist/target/`, including a tar and a zip.
@@ -72,7 +72,7 @@
### Resources
<!--- BROOKLYN_VERSION_BELOW -->
-The **[Developers](https://brooklyn.apache.org/developers/)** section of the main website contains more detail on working with the codebase. There is also a more **Developer Guide** specific to each version, including [this branch (1.0.0-SNAPSHOT)](https://brooklyn.apache.org/v/1.0.0-SNAPSHOT/dev/), [latest stable](https://brooklyn.apache.org/v/latest/dev/), and [older releases](https://brooklyn.apache.org/meta/versions.html).
+The **[Developers](https://brooklyn.apache.org/developers/)** section of the main website contains more detail on working with the codebase. There is also a more **Developer Guide** specific to each version, including [this branch (1.1.0-SNAPSHOT)](https://brooklyn.apache.org/v/1.1.0-SNAPSHOT/dev/), [latest stable](https://brooklyn.apache.org/v/latest/dev/), and [older releases](https://brooklyn.apache.org/meta/versions.html).
Useful topics include:
@@ -83,7 +83,7 @@
* the **[maven build](https://brooklyn.apache.org/v/latest/dev/env/maven-build.html)** and what to do on build errors
<!--- BROOKLYN_VERSION_BELOW -->
-* **[project structure](https://brooklyn.apache.org/v/1.0.0-SNAPSHOT/dev/code/structure.html)** of the codebase and submodules
+* **[project structure](https://brooklyn.apache.org/v/1.1.0-SNAPSHOT/dev/code/structure.html)** of the codebase and submodules
* the **[people](https://brooklyn.apache.org/community/)** behind Apache Brooklyn
diff --git a/brooklyn-client b/brooklyn-client
index 05031a7..fae19ce 160000
--- a/brooklyn-client
+++ b/brooklyn-client
@@ -1 +1 @@
-Subproject commit 05031a79d4724b867db76b7c4afe55190666c7af
+Subproject commit fae19ce1e3f19e6499681e0ac40787c3e3ba2769
diff --git a/brooklyn-dist b/brooklyn-dist
index 3a30944..be19e98 160000
--- a/brooklyn-dist
+++ b/brooklyn-dist
@@ -1 +1 @@
-Subproject commit 3a30944e22052bb7b9c406e285a73f0e9236d0f7
+Subproject commit be19e98376d62d89187095ccf1178fa958816dfb
diff --git a/brooklyn-docs b/brooklyn-docs
index 2b06e96..6b41012 160000
--- a/brooklyn-docs
+++ b/brooklyn-docs
@@ -1 +1 @@
-Subproject commit 2b06e9605e1ee23f27f0d81d249074a60350cff6
+Subproject commit 6b410121d3bb3e6de056b109df97cc4e03cac475
diff --git a/brooklyn-library b/brooklyn-library
index a94f7d8..7fa2f20 160000
--- a/brooklyn-library
+++ b/brooklyn-library
@@ -1 +1 @@
-Subproject commit a94f7d84ebcd984ec7c44d62add2f00d5e663717
+Subproject commit 7fa2f20e65a1a84c69b65d20e952cf679193aae8
diff --git a/brooklyn-server b/brooklyn-server
index e601350..63e4c52 160000
--- a/brooklyn-server
+++ b/brooklyn-server
@@ -1 +1 @@
-Subproject commit e601350d75eb61f0056f4900eca898426348ced9
+Subproject commit 63e4c527b1b0cc204212293201224c7773b62bc3
diff --git a/brooklyn-ui b/brooklyn-ui
index 503d74e..6ce67da 160000
--- a/brooklyn-ui
+++ b/brooklyn-ui
@@ -1 +1 @@
-Subproject commit 503d74eb20bc5206daaa0cfcf1f55b2e0cd0d5c9
+Subproject commit 6ce67da1e7de120a8edd81f7fb7a74f2496da5fe
diff --git a/pom.xml b/pom.xml
index 3c05478..c597389 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<packaging>pom</packaging>
<name>Brooklyn Root</name>
