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
commit e461d3766a17c46b524f5bdf4d95dda54490ab6a Merge: 45a774d ef58002 Author: Alex Heneveld <[email protected]> AuthorDate: Wed Jul 22 13:11:15 2020 +0100 This closes #1101 server-cli/LICENSE => DEPENDENCIES | 956 ++++++++++++++++++++++++++++------- LICENSE | 735 +-------------------------- NOTICE | 479 +----------------- core/pom.xml | 10 - karaf/features/pom.xml | 22 + launcher/pom.xml | 12 +- locations/container/pom.xml | 10 + parent/pom.xml | 40 +- server-cli/{LICENSE => DEPENDENCIES} | 911 ++++++++++++++++++++++++++------- server-cli/LICENSE | 794 +---------------------------- server-cli/NOTICE | 546 +------------------- server-cli/pom.xml | 7 - 12 files changed, 1595 insertions(+), 2927 deletions(-) diff --cc locations/container/pom.xml index 15fb6f4,e7f9211..2734bf7 --- a/locations/container/pom.xml +++ b/locations/container/pom.xml @@@ -47,9 -51,18 +47,19 @@@ <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> </exclusion> + <!-- okio was here, but now we use the right version --> + <exclusion> + <groupId>com.fasterxml.jackson.datatype</groupId> + <artifactId>jackson-datatype-jsr310</artifactId> + </exclusion> </exclusions> </dependency> + <dependency> + <!-- needed for above, but wanted at the same version of jackson we use elsewhere in brooklyn --> + <groupId>com.fasterxml.jackson.datatype</groupId> + <artifactId>jackson-datatype-jsr310</artifactId> + <version>${fasterxml.jackson.version}</version> + </dependency> <!-- Expect Brooklyn to exclude this, and to choose its own jclouds-docker version.
