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 2020/07/08 13:18:11 UTC
[brooklyn-server] 01/20: specify okio 1.15 in maven (it's what
we've always used in karaf)
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 5a5eafe1c6b86bcb52be77d955c8ee65256697de
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri May 29 12:59:38 2020 +0100
specify okio 1.15 in maven (it's what we've always used in karaf)
needed to make sure all pojo runs use that version
---
karaf/pom.xml | 3 ---
locations/container/pom.xml | 9 +++++----
locations/jclouds/pom.xml | 10 ++++++++++
pom.xml | 1 +
4 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 6de93d3..ec9ae38 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -54,9 +54,6 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
-
- <okhttp.bundle.version>2.2.0_2</okhttp.bundle.version>
- <okio.bundle.version>1.2.0_1</okio.bundle.version>
</properties>
<modules>
diff --git a/locations/container/pom.xml b/locations/container/pom.xml
index 2a4021b..15fb6f4 100644
--- a/locations/container/pom.xml
+++ b/locations/container/pom.xml
@@ -40,10 +40,6 @@
<exclusions>
<!-- we use different versions -->
<exclusion>
- <groupId>com.squareup.okio</groupId>
- <artifactId>okio</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
@@ -51,6 +47,7 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
+ <!-- okio was here, but now we use the right version -->
</exclusions>
</dependency>
@@ -68,6 +65,10 @@
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.squareup.okio</groupId>
+ <artifactId>okio</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml
index 985f40c..365d903 100644
--- a/locations/jclouds/pom.xml
+++ b/locations/jclouds/pom.xml
@@ -123,6 +123,11 @@
<groupId>${jclouds.groupId}.driver</groupId>
<artifactId>jclouds-sshj</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.squareup.okio</groupId>
+ <artifactId>okio</artifactId>
+ <version>${okio.version}</version>
+ </dependency>
<dependency>
<groupId>${jclouds.groupId}</groupId>
@@ -140,6 +145,11 @@
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
+ <exclusion>
+ <!-- we use 1.15 instead of 1.2, have for a long time and seems to work fine -->
+ <groupId>com.squareup.okio</groupId>
+ <artifactId>okio</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/pom.xml b/pom.xml
index 761a032..0e96278 100644
--- a/pom.xml
+++ b/pom.xml
@@ -191,6 +191,7 @@
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<javax.mail.version>1.4.7</javax.mail.version> <!-- version should align with 'jetty' feature -->
<cxf.javax.annotation-api.version>1.3.2</cxf.javax.annotation-api.version> <!-- cxf-specs feature v3.3.5 declares v1.3.2; jetty 9.4.22 declares v1.3 -->
+ <okio.version>1.15.0</okio.version>
<!-- Test dependencies -->
<testng.version>6.10</testng.version>