You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by du...@apache.org on 2024/01/30 15:49:00 UTC

(brooklyn-docs) branch master updated (5464d0f7 -> e468cde4)

This is an automated email from the ASF dual-hosted git repository.

duncangrant pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git


    from 5464d0f7 Merge pull request #382 from apache/draft-release-notes
     new 528999db Change version to 1.2.0-SNAPSHOT
     new b2a3bd22 Merge remote-tracking branch 'origin/master'
     new e468cde4 Change version to 1.2.0-SNAPSHOT with updated release notes and versions doc

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 _build/build.sh                                    |   4 +-
 _build/config-guide-version.yml                    |   4 +-
 _build/javadoc-overview.html                       |   4 +-
 _config.yml                                        |   2 +-
 _extra/simple_java_examples/examples.md            |   2 +-
 _plugins/brooklyn_metadata.rb                      |   2 +-
 guide/dev/tips/debugging-remote-brooklyn.md        |   2 +-
 guide/misc/release-notes.md                        | 145 +--------------------
 guide/ops/rest.md                                  |   4 +-
 index.md                                           |   2 +-
 website/developers/code/index.md                   |   2 +-
 .../release-process/environment-variables.md       |   2 +-
 website/meta/versions.md                           |   4 +
 13 files changed, 21 insertions(+), 158 deletions(-)


(brooklyn-docs) 03/03: Change version to 1.2.0-SNAPSHOT with updated release notes and versions doc

Posted by du...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

duncangrant pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git

commit e468cde407b615d187adefc74cc3f007d03e5a7e
Author: Duncan Grant <du...@cloudsoft.io>
AuthorDate: Tue Jan 30 15:48:29 2024 +0000

    Change version to 1.2.0-SNAPSHOT with updated release notes and versions doc
---
 guide/misc/release-notes.md | 145 +-------------------------------------------
 website/meta/versions.md    |   4 ++
 2 files changed, 6 insertions(+), 143 deletions(-)

diff --git a/guide/misc/release-notes.md b/guide/misc/release-notes.md
index faf86e91..08d02dbd 100644
--- a/guide/misc/release-notes.md
+++ b/guide/misc/release-notes.md
@@ -14,151 +14,10 @@ to Brooklyn's commercial users for funding much of this development.
 
 ### New Features
 
-#### Workflows
-
-Apache Brooklyn now has a powerful workflow engine and syntax for defining entities, effectors, sensors, and policies.
-It supports longhand and shorthand syntax, conditions, loops, error-handling, variables, a large set of built-in step types, and 
-the ability to define custom step types.md).
-
-```yaml
-- type: some-entity
-  brooklyn.initializers:
-  - type: workflow-sensor
-    brooklyn.config:
-      sensor: count-how-often-other_sensor-is-published
-      triggers:
-        - other_sensor
-      steps:
-        - let integer x = ${entity.sensor.x} + 1 ?? 0
-        - return ${x}
-```
-
-#### Workflow Enitity (workflow-entity)
-
-Brooklyn now supports a `workflow-entity` where `start` / `stop` are defined by workflow.
-
-#### Kubectl Task factory, Docker effector and Docker Sensor
-
-This is a practical and highly customizable way to externalize effectors and sensors to containers run on a Kubernetes cluster or Docker container.
-
-```yaml
-name: container-effector
-services:
-  - type: 'org.apache.brooklyn.entity.stock.BasicStartable:1.1.0-SNAPSHOT'
-    brooklyn.initializers:
-      - type: org.apache.brooklyn.tasks.kubectl.ContainerEffector
-        brooklyn.config:
-          name: container-effector
-          description: Very simple container effector
-          shell.env:
-            hello: world-amp
-          image: perl
-          imagePullPolicy: IfNotPresent
-          args:
-            - echo
-            - hello
-```
-
-#### Logbook Viewer
-
-Logbook exposes through a new rest API endpoint the server logs. It’s packaged with two different logstore implementation:
-- Static logfiles (default)
-- A ElasticSearch instance
-
-Logs can be seen in the about page but also as part of each task execution, as each task has it’s own ID. As task can create new sub-task, is possible to see the logs of all the child-task when filtering by the creator.
-
-
-#### Updated to Apache Karaf 4.3.6
-
-Karaf updates:
-
-This release is an important release on the Karaf 4.3.x series containing:
-- upgrade to Pax Logging 2.0.14 with log4j 2.17.1 (fixing CVE-2021-44832)
-- prepare JDK 18 support
-- fix deployment issue by upgrading to Apache Felix FileInstall 3.7.4
-- and much more!
-
-The Release Notes are available here: https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12351123
-
-#### Groups Change Policy
-
-New policy for adding policies, enrichers, and initializers to entities as the join dynamic groups.
-
-#### Connection tag
-
-Inspired by the Hashicorp Terraform `connection` element and added a `connection` tag that encapsulates connection details. When declared on an entity, any SSH steps will use the details to establish a connection and execute
-
-#### Add support setup default initializers for all deployment
-
-This looks up a new configuration options called brooklyn.deployment.initializers (comma separated list). If specified on a Brooklyn instance, all deployments will load and execute these initializers.
-
-`brooklyn.deployment.initializers=org.apache.brooklyn.core.effector.AddDeploySensorsInitializer`
-
-#### Persistence import/export API
-
-Introducing an API for persistence import/export feature.
-This is intended for file based persistence stores and as a parameter, it takes the location of root of the persistence store to be imported.
-
-Invoking the operation will merge the new data to the currently existing store. The process is as follows:
-- new temporary management context is created with the persistence store to be imported
-- memento of that persistence store is captured
-- bundles from the persistence store are installed in the active management context - this deals with bundles/types in the catalog and locations
-- contents of relevant directories (policies, enrichers, etc). are written to the active management context. These are used for the deployed applications
-- rebind method adds the deployed applications to the active management context without having to reset the full management context/restart the server
-
-#### New ChildrenBatchEffector
-
-Adding a new effector to call a inner effector in all the children entities where the effector is inserted in batches of a parametrized size.
-
-#### Add a Secret object which can be used to capture a secret
-
-This can be used wherever we need extra assurance that credentials are not accidentally logged or shown in ui
-
-### Security Fixes
-
-#### Mitigate CVE-2023-1370
-
-see: https://security.snyk.io/vuln/SNYK-JAVA-NETMINIDEV-3369748
-
-#### Prevent zip slip
-
-Avoid extracting zip files trying to extract files outside the provided path.
-https://security.snyk.io/research/zip-slip-vulnerability
-
-#### Update xstream to 1.4.19 remediating CVE-2021-43859
-
-#### Updated to json-smart 1.4.7
-
-Mitigates [CVE-2021-27568 ](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-27568) cataloged by [Snyk](https://security.snyk.io/vuln/SNYK-JAVA-NETMINIDEV-1078499) as **Critical**
-
-### Bump xstream to 1.4.18 due to high level vulnerabilities
-
-Snyk detected the next vulnerabilities on prev version:
-```
-  ✗ Arbitrary Code Execution [High Severity][https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569176] in com.thoughtworks.xstream:xstream@1.4.17
-  ✗ Arbitrary Code Execution [High Severity][https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569177] in com.thoughtworks.xstream:xstream@1.4.17
-  ✗ Arbitrary Code Execution [High Severity][https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569178] in com.thoughtworks.xstream:xstream@1.4.17
-  ✗ Arbitrary Code Execution [High Severity][https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569179] in com.thoughtworks.xstream:xstream@1.4.17
-  ✗ Arbitrary Code Execution [High Severity][https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569180] in com.thoughtworks.xstream:xstream@1.4.17
-  ✗ Arbitrary Code Execution [High Severity][https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569181] in com.thoughtworks.xstream:xstream@1.4.17
-  ✗ Arbitrary Code Execution [High Severity][https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569182] in com.thoughtworks.xstream:xstream@1.4.17
-  ✗ Remote Code Execution (RCE) [High Severity][https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569183] in com.thoughtworks.xstream:xstream@1.4.17
-  ✗ Arbitrary Code Execution [High Severity][https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569185] in com.thoughtworks.xstream:xstream@1.4.17
-  ✗ Arbitrary Code Execution [High Severity][https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569186] in com.thoughtworks.xstream:xstream@1.4.17
-  ✗ Arbitrary Code Execution [High Severity][https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569187] in com.thoughtworks.xstream:xstream@1.4.17
-  ✗ Server-Side Request Forgery (SSRF) [High Severity][https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569190] in com.thoughtworks.xstream:xstream@1.4.17
-  ✗ Server-Side Request Forgery (SSRF) [High Severity][https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-1569191] in com.thoughtworks.xstream:xstream@1.4.17
-```
-
-#### Bumping org.freemaker due a high severity vulnerability
-
-Detected with snyk:
-https://snyk.io/vuln/SNYK-JAVA-ORGFREEMARKER-1076795
-
 ### Backwards Compatibility
 
-No changes since 1.0.0 should affect compatibility with 1.1.0
+Changes since 1.1.0:
 
 
 For changes in prior versions, please refer to the release notes for 
-[1.0.0]({{ site.path.v | relative_url }}/1.0.0/misc/release-notes.html).
+[1.1.0]({{ site.path.v | relative_url }}/1.1.0/misc/release-notes.html).
diff --git a/website/meta/versions.md b/website/meta/versions.md
index 6b619824..5f4c618a 100644
--- a/website/meta/versions.md
+++ b/website/meta/versions.md
@@ -19,6 +19,10 @@ This documentation was generated {{ site.time | date_to_string }}.
 
 Apache Brooklyn has made the following releases:
 
+* **[1.1.0](/v/1.1.0)**: Workflows and Container commands
+
+* **[1.0.0](/v/1.0.0/)**: Major Release
+
 * **[0.12.0](/v/0.12.0/)**: OSGI container runtime, improved catalog and bundle integration (September 2017)
 
 * **[0.11.0](/v/0.11.0/)**: Improved cloud support, additional blueprinting features (May 2017)


(brooklyn-docs) 01/03: Change version to 1.2.0-SNAPSHOT

Posted by du...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

duncangrant pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git

commit 528999db51bde50f71a20a38fa7acc098b401062
Author: Duncan Grant <du...@cloudsoft.io>
AuthorDate: Tue Jan 30 15:38:22 2024 +0000

    Change version to 1.2.0-SNAPSHOT
---
 _build/build.sh                                                       | 4 ++--
 _build/config-guide-version.yml                                       | 4 ++--
 _build/javadoc-overview.html                                          | 4 ++--
 _config.yml                                                           | 2 +-
 _extra/simple_java_examples/examples.md                               | 2 +-
 _plugins/brooklyn_metadata.rb                                         | 2 +-
 guide/dev/tips/debugging-remote-brooklyn.md                           | 2 +-
 guide/ops/rest.md                                                     | 4 ++--
 index.md                                                              | 2 +-
 website/developers/code/index.md                                      | 2 +-
 .../developers/committers/release-process/environment-variables.md    | 2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/_build/build.sh b/_build/build.sh
index a51d9849..b04debfe 100755
--- a/_build/build.sh
+++ b/_build/build.sh
@@ -22,7 +22,7 @@ function help() {
   echo "* website-root  : to build the website only, in the root"
   echo "* guide-latest  : to build the guide only, in /v/latest/"
   # BROOKLYN_VERSION_BELOW
-  echo "* guide-version : to build the guide only, in the versioned namespace /v/1.1.0-SNAPSHOT/"
+  echo "* guide-version : to build the guide only, in the versioned namespace /v/1.2.0-SNAPSHOT/"
   echo "* test-guide-root : to build the guide only, in the root (for testing)"
   echo "* test-both-sub : to build the website to /sub/ and guide to /sub/v/latest/ (for testing)"
   echo "* original : to build the files in their original location (website it /website and guide in /guide/, for testing)"
@@ -74,7 +74,7 @@ function parse_mode() {
     # Mac bash defaults to v3 not v4, so can't use assoc arrays :(
     DIRS_TO_MOVE[0]=guide
     # BROOKLYN_VERSION_BELOW
-    DIRS_TO_MOVE_TARGET[0]=v/1.1.0-SNAPSHOT
+    DIRS_TO_MOVE_TARGET[0]=v/1.2.0-SNAPSHOT
     DIRS_TO_MOVE[1]=style
     STYLE_SUBDIR=${DIRS_TO_MOVE_TARGET[0]}/style
     DIRS_TO_MOVE_TARGET[1]=$STYLE_SUBDIR
diff --git a/_build/config-guide-version.yml b/_build/config-guide-version.yml
index e4be68d8..331f458a 100644
--- a/_build/config-guide-version.yml
+++ b/_build/config-guide-version.yml
@@ -1,6 +1,6 @@
 path:
   # BROOKLYN_VERSION_BELOW
-  guide: /v/1.1.0-SNAPSHOT
+  guide: /v/1.2.0-SNAPSHOT
   # BROOKLYN_VERSION_BELOW
-  style: /v/1.1.0-SNAPSHOT/style
+  style: /v/1.2.0-SNAPSHOT/style
   website: ""
diff --git a/_build/javadoc-overview.html b/_build/javadoc-overview.html
index 4add25bc..eaf7e396 100644
--- a/_build/javadoc-overview.html
+++ b/_build/javadoc-overview.html
@@ -1,7 +1,7 @@
 <html><body>
 
 <!-- BROOKLYN_VERSION_BELOW -->
-Javadoc for <a href="http://brooklyn.io"> Apache Brooklyn</a> 1.1.0-SNAPSHOT
+Javadoc for <a href="http://brooklyn.io"> Apache Brooklyn</a> 1.2.0-SNAPSHOT
 
 <p>
                 Apache Brooklyn is distributed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License v2.0</a>.
@@ -9,7 +9,7 @@ Javadoc for <a href="http://brooklyn.io"> Apache Brooklyn</a> 1.1.0-SNAPSHOT
 
 <p>
 <!-- BROOKLYN_VERSION_BELOW -->
-This is the Javadoc for v 1.1.0-SNAPSHOT (git SHA1 hash ${SHA1STAMP}) auto-generated on ${DATESTAMP}.
+This is the Javadoc for v 1.2.0-SNAPSHOT (git SHA1 hash ${SHA1STAMP}) auto-generated on ${DATESTAMP}.
 </p> 
 
 </body><html>
diff --git a/_config.yml b/_config.yml
index 930f7a2b..4f93f65e 100644
--- a/_config.yml
+++ b/_config.yml
@@ -65,7 +65,7 @@ pdf-rewrite-prefixes:
     '/guide' : '/v/0.12.0'
     '/website' : ''
     
-brooklyn-version: 1.1.0-SNAPSHOT # BROOKLYN_VERSION brooklyn-docs-version
+brooklyn-version: 1.2.0-SNAPSHOT # BROOKLYN_VERSION brooklyn-docs-version
 brooklyn-snapshot-git-branch: master   # if line above is SNAPSHOT this should point to corresponding git branch (e.g. master, 0.4)
 
 # This is auto-detected, but you can override it if needed.
diff --git a/_extra/simple_java_examples/examples.md b/_extra/simple_java_examples/examples.md
index 353e1b4b..e20284f6 100644
--- a/_extra/simple_java_examples/examples.md
+++ b/_extra/simple_java_examples/examples.md
@@ -22,7 +22,7 @@ If you have a Maven-based project, integrate this XML fragment with your pom.xml
 	<dependency>
 		<groupId>io.brooklyn</groupId>
 		<artifactId>brooklyn-all</artifactId>
-		<version>1.1.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
+		<version>1.2.0-SNAPSHOT</version>  <!-- BROOKLYN_VERSION -->
 	</dependency>
 </dependencies>
  
diff --git a/_plugins/brooklyn_metadata.rb b/_plugins/brooklyn_metadata.rb
index 77ea79fa..9b40b5a3 100644
--- a/_plugins/brooklyn_metadata.rb
+++ b/_plugins/brooklyn_metadata.rb
@@ -7,7 +7,7 @@
 #
 module BrooklynMetadata
 
-  BROOKLYN_VERSION = "1.1.0-SNAPSHOT" unless defined? BROOKLYN_VERSION
+  BROOKLYN_VERSION = "1.2.0-SNAPSHOT" unless defined? BROOKLYN_VERSION
 
   class Generator < Jekyll::Generator
     def generate(site)
diff --git a/guide/dev/tips/debugging-remote-brooklyn.md b/guide/dev/tips/debugging-remote-brooklyn.md
index 84c305e7..f688c18f 100644
--- a/guide/dev/tips/debugging-remote-brooklyn.md
+++ b/guide/dev/tips/debugging-remote-brooklyn.md
@@ -25,7 +25,7 @@ This should return details of the build as a JSON string similar to the followin
 
 {% highlight json %}
 {
-    "version": "1.1.0-SNAPSHOT",  {% comment %}BROOKLYN_VERSION{% endcomment %}
+    "version": "1.2.0-SNAPSHOT",  {% comment %}BROOKLYN_VERSION{% endcomment %}
     "buildSha1": "c0fdc15291702281acdebf1b11d431a6385f5224",
     "buildBranch": "UNKNOWN"
 }
diff --git a/guide/ops/rest.md b/guide/ops/rest.md
index c0bc5039..cf96c104 100644
--- a/guide/ops/rest.md
+++ b/guide/ops/rest.md
@@ -11,12 +11,12 @@ scheme, but with the `#` at the start of the path removed; for instance the cata
 item `cluster` in the web console is displayed at:
 
 <!-- BROOKLYN_VERSION_BELOW -->
-    http://localhost:8081/#v1/catalog/entities/cluster:1.1.0-SNAPSHOT
+    http://localhost:8081/#v1/catalog/entities/cluster:1.2.0-SNAPSHOT
 
 And in the REST API it is accessed at:
 
 <!-- BROOKLYN_VERSION_BELOW -->
-    http://localhost:8081/v1/catalog/entities/cluster:1.1.0-SNAPSHOT
+    http://localhost:8081/v1/catalog/entities/cluster:1.2.0-SNAPSHOT
 
 A full reference for the REST API is automatically generated by the server at runtime.
 It can be found in the Brooklyn web console, under the Script tab.
diff --git a/index.md b/index.md
index c2fe7057..8b6589bb 100644
--- a/index.md
+++ b/index.md
@@ -8,7 +8,7 @@ title: Brooklyn Website and Docs (dev build)
 Consider looking at:
 
 * [the brooklyn website](/website/)
-* [the brooklyn user guide (version 1.1.0-SNAPSHOT)](guide/) <span> <!-- BROOKLYN_VERSION --> </span>
+* [the brooklyn user guide (version 1.2.0-SNAPSHOT)](guide/) <span> <!-- BROOKLYN_VERSION --> </span>
 
 Also see the file <code>README.md</code> in this directory.
 
diff --git a/website/developers/code/index.md b/website/developers/code/index.md
index 35fde789..ee8499a6 100644
--- a/website/developers/code/index.md
+++ b/website/developers/code/index.md
@@ -21,7 +21,7 @@ git submodule foreach 'git checkout master'
 mvn clean install
 {% endhighlight %}
 
-This will produce an artifact in `brooklyn-dist/dist/brooklyn-dist-1.1.0-SNAPSHOT-dist.tar.gz` <!-- BROOKLYN_VERSION -->
+This will produce an artifact in `brooklyn-dist/dist/brooklyn-dist-1.2.0-SNAPSHOT-dist.tar.gz` <!-- BROOKLYN_VERSION -->
 which you can use [in the usual way](/guide/start/running.html).
 Some options which may be useful:
 
diff --git a/website/developers/committers/release-process/environment-variables.md b/website/developers/committers/release-process/environment-variables.md
index 1916fb4c..93758b67 100644
--- a/website/developers/committers/release-process/environment-variables.md
+++ b/website/developers/committers/release-process/environment-variables.md
@@ -9,7 +9,7 @@ releases. To allow these example commands to run unmodified, set these environme
 
 {% highlight bash %}
 # The version currently set on the master branch (BROOKLYN_VERSION_BELOW)
-OLD_MASTER_VERSION=1.1.0-SNAPSHOT
+OLD_MASTER_VERSION=1.2.0-SNAPSHOT
 # The next version to be set on the master branch
 NEW_MASTER_VERSION=9.9.9-SNAPSHOT
 


(brooklyn-docs) 02/03: Merge remote-tracking branch 'origin/master'

Posted by du...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

duncangrant pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git

commit b2a3bd2229a766431dbe5d7afa81f254d5b1421c
Merge: 528999db 5464d0f7
Author: Duncan Grant <du...@cloudsoft.io>
AuthorDate: Tue Jan 30 15:40:34 2024 +0000

    Merge remote-tracking branch 'origin/master'

 guide/misc/release-notes.md | 171 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 143 insertions(+), 28 deletions(-)