(brooklyn-ui) branch master updated (abea951b -> 7302b1a3)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git from abea951b tidyup of log levels add 1a7f42b0 Updated licenses new 7302b1a3 Merge pull request #383 from apache/licences-update The 1 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: DEPENDENCIES | 482 +-- 1 file changed, 300 insertions(+), 182 deletions(-)
(brooklyn-client) 01/01: Merge pull request #103 from apache/licences-update
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-client.git commit d1f79544dda54d6c12ae616607a4db5b52a419a8 Merge: b8145cb 60e1266 Author: Juan Cabrerizo AuthorDate: Fri Jan 26 10:35:08 2024 +0100 Merge pull request #103 from apache/licences-update Updated licenses DEPENDENCIES | 289 --- 1 file changed, 196 insertions(+), 93 deletions(-)
(brooklyn-client) branch master updated (b8145cb -> d1f7954)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-client.git from b8145cb Merge pull request #101 from jcabrerizo/add-arm64 add 60e1266 Updated licenses new d1f7954 Merge pull request #103 from apache/licences-update The 1 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: DEPENDENCIES | 289 --- 1 file changed, 196 insertions(+), 93 deletions(-)
(brooklyn-dist) 01/01: Merge pull request #184 from apache/licences-update
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git commit 8642aac00a35875af6470ec35d4099d9af198a61 Merge: c49681f e46323a Author: Juan Cabrerizo AuthorDate: Fri Jan 26 10:33:55 2024 +0100 Merge pull request #184 from apache/licences-update Updated licenses DEPENDENCIES | 511 ++--- dist/licensing/license-text/CC0 1.0 Universal | 41 ++ dist/src/main/license/files/LICENSE| 45 +- dist/src/main/license/files/NOTICE | 466 +--- .../features/src/main/resources/resources/LICENSE | 197 +-- karaf/features/src/main/resources/resources/NOTICE | 619 - 6 files changed, 1176 insertions(+), 703 deletions(-)
(brooklyn-dist) branch master updated (c49681f -> 8642aac)
This is an automated email from the ASF dual-hosted git repository.
jcabrerizo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
from c49681f exclude jclouds-byon as that uses older snakeyaml
add e46323a Updated licenses
new 8642aac Merge pull request #184 from apache/licences-update
The 1 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:
DEPENDENCIES | 511 ++---
.../license-text/{CC0 => CC0 1.0 Universal}| 0
dist/src/main/license/files/LICENSE| 45 +-
dist/src/main/license/files/NOTICE | 466 +---
.../features/src/main/resources/resources/LICENSE | 197 +--
karaf/features/src/main/resources/resources/NOTICE | 619 -
6 files changed, 1135 insertions(+), 703 deletions(-)
copy dist/licensing/license-text/{CC0 => CC0 1.0 Universal} (100%)
(brooklyn-ui) 01/01: Merge pull request #383 from apache/licences-update
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git commit 7302b1a3f6fe71b4b482aeabba8c25a984869a18 Merge: abea951b 1a7f42b0 Author: Juan Cabrerizo AuthorDate: Fri Jan 26 10:34:30 2024 +0100 Merge pull request #383 from apache/licences-update Updated licenses DEPENDENCIES | 482 +-- 1 file changed, 300 insertions(+), 182 deletions(-)
(brooklyn-server) branch licences-update updated (e16939be19 -> 1dc6d105e2)
This is an automated email from the ASF dual-hosted git repository. duncangrant pushed a change to branch licences-update in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git discard e16939be19 Updated licenses add 1dc6d105e2 Updated licenses This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e16939be19) \ N -- N -- N refs/heads/licences-update (1dc6d105e2) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
(brooklyn) 01/01: Merge pull request #58 from apache/licences-update
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn.git commit 09f3cb8908737f70b0b5a4a73f53b417d082d526 Merge: 4963975 ff40a09 Author: Juan Cabrerizo AuthorDate: Fri Jan 26 18:02:52 2024 +0100 Merge pull request #58 from apache/licences-update Updated licenses DEPENDENCIES | 511 ++- brooklyn-client | 2 +- brooklyn-dist| 2 +- brooklyn-docs| 2 +- brooklyn-library | 2 +- brooklyn-server | 2 +- brooklyn-ui | 2 +- 7 files changed, 322 insertions(+), 201 deletions(-)
(brooklyn) branch master updated (4963975 -> 09f3cb8)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn.git from 4963975 add bzip2 to dockerfile used to build brooklyn add ff40a09 Updated licenses new 09f3cb8 Merge pull request #58 from apache/licences-update The 1 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: DEPENDENCIES | 511 ++- brooklyn-client | 2 +- brooklyn-dist| 2 +- brooklyn-docs| 2 +- brooklyn-library | 2 +- brooklyn-server | 2 +- brooklyn-ui | 2 +- 7 files changed, 322 insertions(+), 201 deletions(-)
(brooklyn) 01/01: Updated licenses
This is an automated email from the ASF dual-hosted git repository. duncangrant pushed a commit to branch licences-update in repository https://gitbox.apache.org/repos/asf/brooklyn.git commit 2dc57d71574d3db297a7c87caa65d268c5728a35 Author: Duncan Grant AuthorDate: Fri Jan 26 15:39:32 2024 + Updated licenses --- DEPENDENCIES | 511 ++- brooklyn-client | 2 +- brooklyn-dist| 2 +- brooklyn-docs| 2 +- brooklyn-library | 2 +- brooklyn-server | 2 +- brooklyn-ui | 2 +- 7 files changed, 322 insertions(+), 201 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index aec03e0..d2d11e6 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -219,9 +219,15 @@ Runtime dependencies: License name: MIT License Notice: Copyright (c) 2011-2016 Twitter, Inc. - ch.qos.logback:1.2.3: + ch.qos.logback:0.1.5: Project: Logback Logging Framework -Version: 1.2.3 +Version: 0.1.5 +Available at: https://github.com/qos-ch/logback-contrib/wiki +License name: Eclipse Public License, version 1.0 + + ch.qos.logback:1.2.9: +Project: Logback Logging Framework +Version: 1.2.9 Available at: http://logback.qos.ch Developed by: QOS.ch (http://www.qos.ch) License name: Eclipse Public License, version 1.0 @@ -241,23 +247,20 @@ Runtime dependencies: License name: MIT License Notice: Copyright (C) 2017 by Marijn Haverbeke and others - com.fasterxml.jackson:2.11.3: + com.fasterxml.jackson:2.16.1: Project: Jackson FasterXML -Version: 2.11.3 -Available at: - - http://github.com/FasterXML/jackson - - https://github.com/FasterXML/jackson-core - - https://github.com/FasterXML/jackson-dataformat-xml - - https://github.com/FasterXML/jackson-dataformats-text - - https://github.com/FasterXML/jackson-datatype-joda - - https://github.com/FasterXML/jackson-modules-base - - https://github.com/FasterXML/jackson-modules-java8 +Version: 2.16.1 +Available at: https://github.com/FasterXML/jackson Developed by: FasterXML (http://fasterxml.com/) -License name: Apache License, version 2.0 +Licenses: + - +License name: Apache License, version 2.0 + - +License name: Apache License, version 2.0 - com.fasterxml.woodstox.woodstox-core:5.0.3: + com.fasterxml.woodstox.woodstox-core:6.4.0: Project: Woodstox -Version: 5.0.3 +Version: 6.4.0 Available at: https://github.com/FasterXML/woodstox Developed by: FasterXML (http://fasterxml.com) License name: Apache License, version 2.0 @@ -268,22 +271,15 @@ Runtime dependencies: Available at: https://github.com/mifmif/Generex/tree/master License name: Apache License, version 2.0 - com.google.code.findbugs.jsr305:2.0.1: -Project: FindBugs-jsr305 -Version: 2.0.1 -Available at: http://findbugs.sourceforge.net/ -License name: Apache License, version 2.0 - - com.google.code.gson:2.5: + com.google.code.gson:2.8.9: Project: Gson -Version: 2.5 +Version: 2.8.9 Available at: https://github.com/google/gson -Developed by: Google, Inc. (http://www.google.com) License name: Apache License, version 2.0 - com.google.errorprone.error_prone_annotations:2.1.0: + com.google.errorprone.error_prone_annotations:2.2.0: Project: error-prone annotations -Version: 2.1.0 +Version: 2.2.0 Available at: http://nexus.sonatype.org/oss-repository-hosting.html License name: Apache License, version 2.0 @@ -293,36 +289,48 @@ Runtime dependencies: Available at: https://github.com/google/guava License name: Apache License, version 2.0 - com.google.guava:18.0: + com.google.guava.listenablefuture:.0-empty-to-avoid-conflict-with-guava: +Project: Guava ListenableFuture only +Version: .0-empty-to-avoid-conflict-with-guava +Available at: https://github.com/google/guava +License name: Apache License, version 2.0 + + com.google.guava:27.1-jre: Project: "Guava: Google Core Libraries for Java" -Version: 18.0 -Available at: http://code.google.com/p/guava-libraries +Version: 27.1-jre +Available at: https://github.com/google/guava License name: Apache License, version 2.0 - com.google.inject.guice:3.0: + com.google.inject.guice:4.2.3: Project: Google Guice -Version: 3.0 -Available at: http://code.google.com/p/google-guice/ +Version: 4.2.3 +Available at: https://github.com/google/guice Developed by: Google, Inc. (http://www.google.com) License name: Apache License, version 2.0 - com.google.inject:3.0: + com.google.inject:4.2.3: Project: Google Guice -Version: 3.0 -Available at:
(brooklyn) branch licences-update updated (2dc57d7 -> ff40a09)
This is an automated email from the ASF dual-hosted git repository. duncangrant pushed a change to branch licences-update in repository https://gitbox.apache.org/repos/asf/brooklyn.git omit 2dc57d7 Updated licenses add ff40a09 Updated licenses This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2dc57d7) \ N -- N -- N refs/heads/licences-update (ff40a09) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
(brooklyn-server) 01/01: Merge pull request #1414 from apache/licences-update
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git commit f1cd632ed777d5076aedca843e5a4da9ff8e47dc Merge: 65cac11c3f 1dc6d105e2 Author: Juan Cabrerizo AuthorDate: Fri Jan 26 16:32:47 2024 +0100 Merge pull request #1414 from apache/licences-update Updated licenses DEPENDENCIES| 422 server-cli/DEPENDENCIES | 354 ++-- 2 files changed, 513 insertions(+), 263 deletions(-)
(brooklyn-server) branch master updated (65cac11c3f -> f1cd632ed7)
This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git from 65cac11c3f use bean with type to load beans in tests add 1dc6d105e2 Updated licenses new f1cd632ed7 Merge pull request #1414 from apache/licences-update The 1 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: DEPENDENCIES| 422 server-cli/DEPENDENCIES | 354 ++-- 2 files changed, 513 insertions(+), 263 deletions(-)
(brooklyn) branch licences-update created (now 2dc57d7)
This is an automated email from the ASF dual-hosted git repository. duncangrant pushed a change to branch licences-update in repository https://gitbox.apache.org/repos/asf/brooklyn.git at 2dc57d7 Updated licenses This branch includes the following new commits: new 2dc57d7 Updated licenses The 1 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.
(brooklyn-server) branch master updated: use bean with type to load beans in tests
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new 65cac11c3f use bean with type to load beans in tests
65cac11c3f is described below
commit 65cac11c3f838d07bac2901a4e2c863ec86a0139
Author: Alex Heneveld
AuthorDate: Fri Jan 26 13:18:12 2024 +
use bean with type to load beans in tests
better access to private constructors
---
.../java/org/apache/brooklyn/core/workflow/WorkflowBasicTest.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowBasicTest.java
b/core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowBasicTest.java
index 9287cfb8b2..364a7090e9 100644
---
a/core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowBasicTest.java
+++
b/core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowBasicTest.java
@@ -37,6 +37,7 @@ import org.apache.brooklyn.core.entity.Dumper;
import org.apache.brooklyn.core.entity.Entities;
import org.apache.brooklyn.core.entity.EntityAsserts;
import org.apache.brooklyn.core.entity.EntityInternal;
+import org.apache.brooklyn.core.resolve.jackson.BeanWithTypePlanTransformer;
import org.apache.brooklyn.core.resolve.jackson.BeanWithTypeUtils;
import org.apache.brooklyn.core.sensor.Sensors;
import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport;
@@ -78,7 +79,11 @@ public class WorkflowBasicTest extends
BrooklynMgmtUnitTestSupport {
@SuppressWarnings("deprecation")
public static RegisteredType addRegisteredTypeBean(ManagementContext mgmt,
String symName, Class clazz) {
return BrooklynAppUnitTestSupport.addRegisteredTypeBean(mgmt, symName,
VERSION,
-new
BasicTypeImplementationPlan(JavaClassNameTypePlanTransformer.FORMAT,
clazz.getName()));
+new BasicTypeImplementationPlan(
+BeanWithTypePlanTransformer.FORMAT, "type: "+
+// above is better than below because it can access
private constructors
+//JavaClassNameTypePlanTransformer.FORMAT,
+clazz.getName()));
}
public static RegisteredType addRegisteredTypeSpec(ManagementContext mgmt,
String symName, Class clazz, Class superClazz) {
