Repository: hadoop Updated Branches: refs/heads/branch-2 4276a858f -> e5351608c refs/heads/branch-2.9 3ec0c11e8 -> eb5241add
HADOOP-14651. Update okhttp version to 2.7.5. Contributed by Ray Chiang and John Zhuge. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e5351608 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e5351608 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e5351608 Branch: refs/heads/branch-2 Commit: e5351608ca040f0a081394bc821f8f4fda7d0c8d Parents: 4276a85 Author: Steve Loughran <ste...@apache.org> Authored: Wed Apr 4 15:16:20 2018 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Wed Apr 4 15:16:20 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/e5351608/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 2d05601..8812132 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -98,6 +98,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> @@ -144,7 +145,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/e5351608/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 cf26cbb..f98ed1d 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
