Repository: camel
Updated Branches:
  refs/heads/master 5d73bf5ed -> 1a3a20773


Use only one property for okhttp client version in parent POM


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1a3a2077
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1a3a2077
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1a3a2077

Branch: refs/heads/master
Commit: 1a3a207739a56a49aa3b479cfd7c3cc12d383db8
Parents: 5d73bf5
Author: Andrea Cosentino <[email protected]>
Authored: Wed Oct 18 11:56:49 2017 +0200
Committer: Andrea Cosentino <[email protected]>
Committed: Wed Oct 18 11:57:27 2017 +0200

----------------------------------------------------------------------
 components/camel-salesforce/camel-salesforce-component/pom.xml | 2 +-
 parent/pom.xml                                                 | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/1a3a2077/components/camel-salesforce/camel-salesforce-component/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml 
b/components/camel-salesforce/camel-salesforce-component/pom.xml
index 3e376e3..ab36d7c 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -196,7 +196,7 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>mockwebserver</artifactId>
-      <version>${squareup-okhttp3-version}</version>
+      <version>${okclient-version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/camel/blob/1a3a2077/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e01f215..8ce2554 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -664,7 +664,6 @@
     <spymemcached-bundle-version>2.5_2</spymemcached-bundle-version> <!-- 
FIXME cmueller: not in sync! -->
     <spymemcached-version>2.12.0</spymemcached-version>
     <squareup-okhttp-version>2.7.5</squareup-okhttp-version>
-    <squareup-okhttp3-version>3.8.1</squareup-okhttp3-version>
     <squareup-okhttp-bundle-version>2.7.5_1</squareup-okhttp-bundle-version>
     <squareup-okio-version>1.13.0</squareup-okio-version>
     <squareup-okio-bundle-version>1.13.0_1</squareup-okio-bundle-version>

Reply via email to