Skip to content
Permalink
Browse files
Merge branch 'master' into license-update-2020
  • Loading branch information
ahgittin committed Jun 2, 2020
2 parents 2e8af80 + 0f77fa1 commit d5e10b2423b4018f8dd35be8cd04883359e576ea
Showing 10 changed files with 23 additions and 19 deletions.
@@ -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 @@ RUN apt-get update && apt-get install -y \
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
@@ -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 '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'
}
}
}
@@ -25,9 +25,9 @@ get this project and its sub-modules:

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 @@ docker run -i --rm --name brooklyn -u $(id -u):$(id -g) \
--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 @@ docker run -i --rm --name brooklyn -u $(id -u):$(id -g) \
-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 @@ of the containing project, and the `scmBranch` is set to the git branch.
### 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 @@ Useful topics include:
* 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

Submodule brooklyn-client updated 301 files
Submodule brooklyn-dist updated 61 files
+7 −0 Dockerfile
+79 −0 Jenkinsfile
+2 −2 README.md
+25 −13 all/pom.xml
+1 −1 archetypes/quickstart/NOTES.txt
+1 −1 archetypes/quickstart/pom.xml
+1 −1 archetypes/quickstart/src/brooklyn-sample/pom.xml
+1 −1 deb-packaging/pom.xml
+0 −25 dist/licensing/README.md
+28 −9 dist/licensing/generate-all.sh
+26 −3 dist/licensing/generate-license-and-notice.sh
+5 −0 dist/licensing/license-metadata-manual-mvn-aggregation-and-overrides.yaml
+41 −0 dist/licensing/license-text/CC0
+9 −9 dist/pom.xml
+18 −16 dist/src/main/dist/conf/brooklyn/default.catalog.bom
+132 −1,238 dist/src/main/license/files/LICENSE
+806 −273 dist/src/main/license/files/NOTICE
+33 −0 docker-image/Dockerfile
+19 −0 docker-image/README.md
+94 −0 docker-image/pom.xml
+42 −7 docker-itest/Dockerfile
+70 −0 docker-itest/Jenkinsfile
+1 −1 docker-itest/entrypoint.sh
+1 −1 docker/Makefile
+1 −1 docker/brooklyn-docker-start
+5 −1 downstream-parent/pom.xml
+1 −1 karaf/apache-brooklyn/pom.xml
+132 −1,238 karaf/apache-brooklyn/src/main/resources/LICENSE
+806 −273 karaf/apache-brooklyn/src/main/resources/NOTICE
+67 −0 karaf/apache-brooklyn/src/main/resources/bin/setenv.bat
+1 −1 karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom
+3 −0 karaf/apache-brooklyn/src/main/resources/etc/system.properties
+1 −1 karaf/config/pom.xml
+3 −3 karaf/config/src/main/resources/catalog/catalog-core.bom
+17 −15 karaf/config/src/main/resources/catalog/catalog-templates.bom
+1 −1 karaf/config/src/main/resources/catalog/catalog.bom
+50 −6 karaf/features/pom.xml
+2 −1 karaf/itest/pom.xml
+2 −0 karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java
+10 −11 karaf/itest/src/test/java/org/apache/brooklyn/core/catalog/internal/DefaultBomLoadTest.java
+2 −4 karaf/itest/src/test/java/org/apache/brooklyn/core/dsl/external/ExternalConfigBrooklynPropertiesOsgiTest.java
+7 −2 karaf/itest/src/test/java/org/apache/brooklyn/launcher/osgi/OsgiLauncherTest.java
+12 −2 karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProvider.java
+23 −76 karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProviderTest.java
+20 −63 karaf/itest/src/test/java/org/apache/brooklyn/security/StockSecurityProviderTest.java
+0 −40 karaf/itest/src/test/resources/custom-security-bp.xml
+2 −2 karaf/pom.xml
+20 −8 pom.xml
+1 −1 release/change-version.sh
+6 −6 release/environment.sh
+14 −10 release/make-release-artifacts.sh
+4 −7 release/verify_brooklyn_rc.sh
+1 −1 rpm-packaging/pom.xml
+1 −1 shared-packaging/pom.xml
+4 −4 shared-packaging/src/test/yaml/package-apps.yaml
+1 −1 shared-packaging/src/test/yaml/package.bom
+1 −1 vagrant/pom.xml
+2 −2 vagrant/src/main/vagrant/README.md
+27 −2 vagrant/src/main/vagrant/files/install_brooklyn.sh
+5 −5 vagrant/src/main/vagrant/files/vagrant-catalog.bom
+1 −1 vagrant/src/main/vagrant/servers.yaml
Submodule brooklyn-docs updated 71 files
+1 −1 .gitignore
+1 −1 guide/SUMMARY.md
+4 −4 guide/blueprints/advanced-example.md
+1 −1 guide/blueprints/catalog/bundle.md
+ guide/blueprints/catalog/quick-launch-template-w700.png
+ guide/blueprints/catalog/quick-launch-template.png
+1 −0 guide/blueprints/catalog/schema.md
+72 −7 guide/blueprints/catalog/templates.md
+2 −2 guide/blueprints/clusters.md
+2 −2 guide/blueprints/configuring-vms.md
+1 −1 guide/blueprints/creating-yaml.md
+6 −6 guide/blueprints/custom-entities.md
+2 −2 guide/blueprints/effectors.md
+16 −10 guide/blueprints/entity-configuration.md
+4 −2 guide/blueprints/java/bundle-dependencies.md
+2 −2 guide/blueprints/java/defining-and-deploying.md
+2 −2 guide/blueprints/java/entities.md
+3 −3 guide/blueprints/java/feeds.md
+1 −1 guide/blueprints/java/java_app/ExampleWebApp.java
+1 −1 guide/blueprints/multiple-services.md
+1 −1 guide/blueprints/policies.md
+1 −1 guide/blueprints/test/index.md
+5 −0 guide/blueprints/test/test-entities.md
+2 −2 guide/blueprints/test/usage-examples.md
+25 −23 guide/blueprints/winrm/client.md
+21 −510 guide/blueprints/winrm/index.md
+115 −0 guide/blueprints/winrm/limitations.md
+238 −0 guide/blueprints/winrm/tips.md
+149 −0 guide/blueprints/winrm/troubleshoot.md
+3 −3 guide/blueprints/yaml-reference.md
+13 −4 guide/concepts/application-parent-membership.md
+4 −3 guide/concepts/configuration-sensor-effectors.md
+3 −0 guide/concepts/dependent-configuration.md
+0 −1 guide/concepts/execution.md
+0 −2 guide/concepts/lifecycle-managementcontext.md
+1 −1 guide/dev/code/structure.md
+114 −98 guide/dev/env/maven-build.md
+1 −1 guide/dev/tips/debugging-remote-brooklyn.md
+31 −102 guide/dev/tips/logging.md
+2 −2 guide/locations/_azure-ARM.md
+2 −2 guide/locations/_azure-classic.md
+1 −1 guide/locations/_byon.md
+1 −1 guide/locations/_clouds.md
+2 −2 guide/locations/_cloudstack.md
+6 −0 guide/locations/_localhost.md
+12 −1 guide/locations/_ssh-keys.md
+1 −1 guide/locations/index.md
+1 −1 guide/locations/provisioned-machine-requirements.md
+6 −6 guide/misc/download.md
+9 −3 guide/ops/cli/cli-ref-guide.md
+2 −2 guide/ops/cli/cli-usage-guide.md
+27 −2 guide/ops/configuration/brooklyn_cfg.md
+1 −1 guide/ops/configuration/index.md
+2 −2 guide/ops/externalized-configuration.md
+1 −1 guide/ops/high-availability/index.md
+15 −28 guide/ops/logging.md
+1 −1 guide/ops/persistence/index.md
+1 −1 guide/ops/production-installation.md
+4 −4 guide/ops/requirements.md
+2 −2 guide/ops/rest.md
+2 −2 guide/ops/security-guidelines.md
+2 −2 guide/ops/server-cli-reference.md
+1 −1 guide/ops/troubleshooting/connectivity.md
+1 −1 guide/ops/troubleshooting/deployment.md
+1 −1 guide/ops/troubleshooting/overview.md
+1 −1 guide/ops/troubleshooting/slow-unresponsive.md
+2 −2 guide/start/managing.md
+1 −1 guide/start/policies.md
+2 −2 javadoc/overview.html
+1,093 −1,062 package-lock.json
+2 −1 package.json
Submodule brooklyn-library updated 66 files
+5 −1 Dockerfile
+11 −14 Jenkinsfile
+22 −9 README.md
+1 −1 catalog-aliases/pom.xml
+1 −1 catalog-aliases/src/main/resources/catalog.bom
+1 −1 examples/pom.xml
+1 −1 examples/simple-web-cluster/pom.xml
+1 −1 examples/simple-web-cluster/src/main/resources/catalog.bom
+1 −1 examples/webapps/hello-world-sql/pom.xml
+1 −1 examples/webapps/hello-world-webapp/pom.xml
+1 −1 examples/webapps/pom.xml
+1 −1 karaf/catalog/pom.xml
+12 −12 karaf/catalog/src/main/resources/catalog.bom
+48 −18 karaf/features/pom.xml
+1 −1 karaf/pom.xml
+2 −2 pom.xml
+1 −1 qa/pom.xml
+3 −3 qa/src/test/projects/downstream-parent-test/pom.xml
+1 −1 qa/src/test/projects/downstream-parent-test/src/main/resources/catalog.bom
+1 −1 qa/src/test/resources/java-web-app-and-db-with-policy.bom
+1 −1 qa/start-monitor.sh
+1 −1 qa/start-webcluster.sh
+1 −1 sandbox/cassandra-multicloud-snitch/pom.xml
+1 −1 sandbox/database/pom.xml
+1 −1 sandbox/extra/pom.xml
+1 −1 sandbox/mobile-app/pom.xml
+1 −1 sandbox/monitoring/pom.xml
+1 −1 sandbox/monitoring/src/main/resources/catalog.bom
+1 −1 sandbox/nosql/pom.xml
+1 −1 software/cm/ansible/pom.xml
+1 −1 software/cm/ansible/src/main/java/org/apache/brooklyn/entity/cm/ansible/AnsiblePlaybookTasks.java
+1 −1 software/cm/ansible/src/main/resources/catalog.bom
+1 −1 software/cm/chef/pom.xml
+1 −1 software/cm/chef/src/main/resources/catalog.bom
+2 −2 software/cm/pom.xml
+1 −1 software/cm/salt/pom.xml
+1 −1 software/cm/salt/src/main/resources/catalog.bom
+1 −1 software/database/pom.xml
+2 −2 software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbNode.java
+1 −1 software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNode.java
+9 −8 software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java
+1 −1 software/database/src/main/resources/catalog.bom
+2 −2 software/messaging/pom.xml
+52 −1 software/messaging/src/main/resources/catalog.bom
+1 −1 software/monitoring/pom.xml
+1 −1 software/monitoring/src/main/resources/catalog.bom
+1 −1 software/network/pom.xml
+1 −1 software/network/src/main/resources/catalog.bom
+1 −1 software/nosql/pom.xml
+3 −10 software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenter.java
+3 −7 software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterImpl.java
+3 −4 software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabric.java
+3 −7 software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricImpl.java
+3 −1 software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNode.java
+5 −1 software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeDriver.java
+3 −1 software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java
+3 −1 software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeSshDriver.java
+5 −1 software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/TokenGenerator.java
+5 −1 software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/TokenGenerators.java
+1 −1 software/nosql/src/main/resources/catalog.bom
+1 −1 software/osgi/pom.xml
+1 −1 software/osgi/src/main/resources/catalog.bom
+3 −2 software/webapp/pom.xml
+1 −1 software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8Server.java
+1 −1 software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServer.java
+3 −3 software/webapp/src/main/resources/catalog.bom
Submodule brooklyn-server updated 261 files
Submodule brooklyn-ui updated 150 files
@@ -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>

0 comments on commit d5e10b2

Please sign in to comment.