This is an automated email from the ASF dual-hosted git repository. richard pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git.
from 0737bc3 fix bug where ByteSize from string would override units new 30f0da3 updated cxf, needed also in WinRM4J, check tests new dd703f1 Updated jetty to 9.4.35.v20201120 new e113b69 Updated xstream to 1.4.14 new a6c35bd Updated httpclient to 4.5.13 new f5ae1bc Updated snakeyaml to 1.26 new 29719a8 Updated commons-codec to 1.15 new dbf92fd Bump karaf to 4.3 and jackson to 2.11.3 new ddca820 Updated OSGI new 4d2956a Fix for error loading context new 1ca074d Updated xstream due to new vulnerability new 039ad9c Jakarta annotation api version and adding new HashMultimap serializer new 921a968 Fix error instantiating class when no version is defined Now it try to use the version only from the current classloader new 6db1848 Added comments for duplicated bundles new 0f93b0b Bumping CXF 3.3.9 and bouncyCastle 1.67 new 178fbf6 Bumped WinRM4j to 0.11.0 non-snapshot new 8aaa6ef refer to pax-jetty instead of jetty new ace4deb Fix exclusion and update comments new 469df6a Bumping Swagger to 1.6.2 new f0f0884 Fix to manage Apache Commons-codec symbolicName change new ec80528 Removed misleading comment new cecfd2f Removed old commented code new 9535bd1 Removed import com.sun.xml.bind.v2.TODO new 2965c8b removed commented wrap:mvn:javax.activation/activation new 6284b08 Update comment with swagger error new beaa572 Addresses PR comments new e076204 Merge pull request #1152 from nakomis/feature/bump-vulnerabilities-2102-rebased The 12816 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: api/pom.xml | 2 +- .../brooklyn/api/framework/FrameworkLookup.java | 8 +- .../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 53 ++++++++ .../CatalogOsgiVersionMoreEntityRebindTest.java | 6 +- camp/camp-server/pom.xml | 17 ++- core/pom.xml | 15 ++- .../brooklyn/util/core/ClassLoaderUtils.java | 81 +++++++++--- .../util/core/xstream/HashMultimapConverter.java | 120 ++++++++++++++++++ .../brooklyn/util/core/xstream/XmlSerializer.java | 2 + .../YamlRollingTimeWindowMeanEnricherTest.java | 20 +-- .../stock/YamlTimeWeightedDeltaEnricherTest.java | 18 +-- .../util/core/internal/TypeCoercionsTest.java | 96 +++++++------- .../core/xstream/HashMultimapConverterTest.java | 140 +++++++++++++++++++++ karaf/commands/pom.xml | 2 +- karaf/features/src/main/feature/feature.xml | 10 +- .../brooklyn/launcher/osgi/OsgiLauncherImpl.java | 1 - karaf/pom.xml | 2 +- launcher/pom.xml | 1 + .../jclouds/JcloudsLocationMetadataTest.java | 6 +- parent/pom.xml | 67 ++++++++++ .../policy/enricher/DeltaEnrichersTests.java | 22 ++-- .../policy/enricher/RollingMeanEnricherTest.java | 6 +- .../RollingTimeWindowMeanEnricherTest.java | 20 +-- .../enricher/TimeFractionDeltaEnricherTest.java | 6 +- .../loadbalancing/LoadBalancingModelTest.java | 2 +- .../loadbalancing/LoadBalancingPolicyTest.java | 4 +- pom.xml | 62 +++++---- rest/rest-resources/pom.xml | 5 + .../brooklyn/rest/resources/ApidocResource.java | 32 ++--- .../brooklyn/rest/util/ScannerInjectHelper.java | 10 +- .../brooklyn/rest/resources/ActivityRestTest.java | 1 + .../rest/resources/EffectorResourceTest.java | 1 + rest/rest-server/pom.xml | 14 +++ software/base/pom.xml | 5 + software/winrm/pom.xml | 5 + utils/common/pom.xml | 7 +- .../java/org/apache/brooklyn/test/Asserts.java | 13 ++ .../util/javalang/coerce/TypeCoercionsTest.java | 20 +-- utils/rest-swagger/pom.xml | 18 +++ utils/rt-felix/pom.xml | 1 + .../rt/felix/EmbeddedFelixFrameworkTest.java | 15 ++- .../brooklyn/test/support/VerboseReporter.java | 11 +- 42 files changed, 752 insertions(+), 195 deletions(-) create mode 100644 core/src/main/java/org/apache/brooklyn/util/core/xstream/HashMultimapConverter.java create mode 100644 core/src/test/java/org/apache/brooklyn/util/core/xstream/HashMultimapConverterTest.java