Repository: hadoop Updated Branches: refs/heads/branch-2.9.1 33f8e80a9 -> 0e170c795
HADOOP-14651. Update okhttp version to 2.7.5. Contributed by Ray Chiang and John Zhuge. (cherry picked from commit e5351608ca040f0a081394bc821f8f4fda7d0c8d) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0e170c79 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0e170c79 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0e170c79 Branch: refs/heads/branch-2.9.1 Commit: 0e170c795294c7323e7ab50b81017190a6d216d9 Parents: 33f8e80 Author: Steve Loughran <ste...@apache.org> Authored: Wed Apr 4 15:17:28 2018 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Fri Apr 6 18:08:51 2018 +0100 ---------------------------------------------------------------------- hadoop-project/pom.xml | 3 ++- hadoop-tools/hadoop-azure-datalake/pom.xml | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0e170c79/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 4a7e979..7a7de00 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -97,6 +97,7 @@ <ehcache.version>3.3.1</ehcache.version> <hikari.version>2.4.12</hikari.version> <mssql.version>6.2.1.jre7</mssql.version> + <okhttp.version>2.7.5</okhttp.version> <!-- define the Java language version used by the compiler --> <javac.version>1.7</javac.version> @@ -143,7 +144,7 @@ <dependency> <groupId>com.squareup.okhttp</groupId> <artifactId>okhttp</artifactId> - <version>2.4.0</version> + <version>${okhttp.version}</version> </dependency> <dependency> <groupId>com.squareup.okhttp3</groupId> http://git-wip-us.apache.org/repos/asf/hadoop/blob/0e170c79/hadoop-tools/hadoop-azure-datalake/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-azure-datalake/pom.xml b/hadoop-tools/hadoop-azure-datalake/pom.xml index a83e8a2..4e21d29 100644 --- a/hadoop-tools/hadoop-azure-datalake/pom.xml +++ b/hadoop-tools/hadoop-azure-datalake/pom.xml @@ -30,7 +30,7 @@ </description> <packaging>jar</packaging> <properties> - <okHttpVersion>2.4.0</okHttpVersion> + <okHttpVersion>${okhttp.version}</okHttpVersion> <minimalJsonVersion>0.9.1</minimalJsonVersion> <file.encoding>UTF-8</file.encoding> <downloadSources>true</downloadSources> @@ -131,7 +131,8 @@ <dependency> <groupId>com.squareup.okhttp</groupId> <artifactId>okhttp</artifactId> - <version>2.4.0</version> + <version>${okhttp.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> @@ -153,7 +154,7 @@ <dependency> <groupId>com.squareup.okhttp</groupId> <artifactId>mockwebserver</artifactId> - <version>2.4.0</version> + <version>${okhttp.version}</version> <scope>test</scope> </dependency> </dependencies> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org