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 7106a0d0916854c3f8a68e4aef606a7e97d51d8b Author: Alex Heneveld <[email protected]> AuthorDate: Wed Nov 10 13:48:30 2021 +0000 use jakarta in maven defs to get right annotation-api package version remove misleading findbugs (and also guava) in man places, delegate to utils-common dependencies --- api/pom.xml | 8 -------- camp/camp-base/pom.xml | 10 +--------- camp/camp-brooklyn/pom.xml | 8 -------- core/pom.xml | 8 -------- launcher/pom.xml | 8 -------- locations/jclouds/pom.xml | 8 -------- parent/pom.xml | 5 ----- rest/rest-api/pom.xml | 8 -------- rest/rest-resources/pom.xml | 8 -------- rest/rest-server/pom.xml | 8 -------- software/base/pom.xml | 8 -------- utils/common/pom.xml | 5 +++-- 12 files changed, 4 insertions(+), 88 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index c3a67e4..b0c7952 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -48,14 +48,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> diff --git a/camp/camp-base/pom.xml b/camp/camp-base/pom.xml index ef56e52..5620159 100644 --- a/camp/camp-base/pom.xml +++ b/camp/camp-base/pom.xml @@ -64,15 +64,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </dependency> - + <!-- just for logging, not exported --> <!-- <dependency> diff --git a/camp/camp-brooklyn/pom.xml b/camp/camp-brooklyn/pom.xml index 9b176cb..673e552 100644 --- a/camp/camp-brooklyn/pom.xml +++ b/camp/camp-brooklyn/pom.xml @@ -68,14 +68,6 @@ </exclusions> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> diff --git a/core/pom.xml b/core/pom.xml index 49dd7e1..e55e636 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -123,14 +123,6 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </dependency> - <dependency> <groupId>com.maxmind.geoip2</groupId> <artifactId>geoip2</artifactId> <exclusions> diff --git a/launcher/pom.xml b/launcher/pom.xml index dc15827..d68c9bc 100644 --- a/launcher/pom.xml +++ b/launcher/pom.xml @@ -100,14 +100,6 @@ <artifactId>httpclient</artifactId> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml index a90a480..9602838 100644 --- a/locations/jclouds/pom.xml +++ b/locations/jclouds/pom.xml @@ -61,14 +61,6 @@ </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </dependency> - <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/parent/pom.xml b/parent/pom.xml index 7605850..26cee0b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1486,11 +1486,6 @@ org.apache.brooklyn.* </Export-Package> <!-- By default import automatically, but constrain some versions which confuse karaf at runtime --> - <Import-Package> - <!-- force this version to exclude servicemix --> - javax.annotation;version="[1.2,2)", - * - </Import-Package> <Implementation-SHA-1>${buildNumber}</Implementation-SHA-1> <Implementation-Branch>${scmBranch}</Implementation-Branch> diff --git a/rest/rest-api/pom.xml b/rest/rest-api/pom.xml index d8a0b82..6a978d4 100644 --- a/rest/rest-api/pom.xml +++ b/rest/rest-api/pom.xml @@ -54,14 +54,6 @@ <artifactId>validation-api</artifactId> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </dependency> - <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </dependency> diff --git a/rest/rest-resources/pom.xml b/rest/rest-resources/pom.xml index cae5a6d..a503b7f 100644 --- a/rest/rest-resources/pom.xml +++ b/rest/rest-resources/pom.xml @@ -89,14 +89,6 @@ <artifactId>reflections</artifactId> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> diff --git a/rest/rest-server/pom.xml b/rest/rest-server/pom.xml index 974be73..3bba650 100644 --- a/rest/rest-server/pom.xml +++ b/rest/rest-server/pom.xml @@ -85,14 +85,6 @@ <artifactId>reflections</artifactId> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> diff --git a/software/base/pom.xml b/software/base/pom.xml index 8449e6f..3566a8f 100644 --- a/software/base/pom.xml +++ b/software/base/pom.xml @@ -85,14 +85,6 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </dependency> - <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> </dependency> diff --git a/utils/common/pom.xml b/utils/common/pom.xml index 9266f99..b92f123 100644 --- a/utils/common/pom.xml +++ b/utils/common/pom.xml @@ -117,8 +117,9 @@ </dependency> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> <!-- for javax.annotation.Nullable etc --> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> <!-- for javax.annotation.Nullable etc --> + <version>${jakarta.annotation-api.version}</version> </dependency> <dependency> <groupId>org.osgi</groupId>
