You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2021/11/13 11:14:04 UTC
[brooklyn-server] 08/28: more version compability/exclusions, now more shared in parent/pom.xml
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 b171235e42cc1fe92c1ecbe399dc0a1e9e23d560
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Tue Nov 9 14:00:15 2021 +0000
more version compability/exclusions, now more shared in parent/pom.xml
---
locations/container/pom.xml | 4 ++++
locations/jclouds/pom.xml | 13 -------------
parent/pom.xml | 29 +++++++++++++++++++++++++++++
utils/rt-felix/pom.xml | 8 --------
4 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/locations/container/pom.xml b/locations/container/pom.xml
index 2734bf7..bc7cf4f 100644
--- a/locations/container/pom.xml
+++ b/locations/container/pom.xml
@@ -48,6 +48,10 @@
<artifactId>jsr305</artifactId>
</exclusion>
<!-- okio was here, but now we use the right version -->
+ <exclusion> <!--jclouds pulls in 3.14.9 now -->
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml
index dbfbd84..a90a480 100644
--- a/locations/jclouds/pom.xml
+++ b/locations/jclouds/pom.xml
@@ -100,19 +100,6 @@
<dependency>
<groupId>${jclouds.groupId}</groupId>
<artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
- <exclusions>
- <exclusion>
- <!-- Conflicts with javax.ws.rs-api -->
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- </exclusion>
- <exclusion>
- <!-- jclouds uses 1.2; we use 1.3.2 or 1.3.5 -->
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>${jclouds.groupId}.driver</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 171a4b8..937e0d2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -677,6 +677,35 @@
<artifactId>assertj-core</artifactId>
<version>${assertj.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>${felix.framework.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- different version pulled in by guava, and explicitly in places -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-annotations</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${jclouds.groupId}</groupId>
+ <artifactId>jclouds-core</artifactId>
+ <version>${jclouds.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- Conflicts with javax.ws.rs-api -->
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- jclouds uses 1.2; we use 1.3.2 or 1.3.5 -->
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/utils/rt-felix/pom.xml b/utils/rt-felix/pom.xml
index a791d6d..7c32db3 100644
--- a/utils/rt-felix/pom.xml
+++ b/utils/rt-felix/pom.xml
@@ -35,14 +35,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>${felix.framework.version}</version>
- <exclusions>
- <exclusion>
- <!-- different version pulled in by guava, and below -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-annotations</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.mojo</groupId>