You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by do...@apache.org on 2020/03/16 06:57:34 UTC

[spark] branch branch-3.0 updated: [SPARK-31135][BUILD][TESTS] Upgrdade docker-client version to 8.14.1

This is an automated email from the ASF dual-hosted git repository.

dongjoon pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/branch-3.0 by this push:
     new aad1f5a  [SPARK-31135][BUILD][TESTS] Upgrdade docker-client version to 8.14.1
aad1f5a is described below

commit aad1f5aa2d3e281dde2a019c1c4975533c908b66
Author: Gabor Somogyi <ga...@gmail.com>
AuthorDate: Sun Mar 15 23:55:04 2020 -0700

    [SPARK-31135][BUILD][TESTS] Upgrdade docker-client version to 8.14.1
    
    ### What changes were proposed in this pull request?
    Upgrdade `docker-client` version.
    
    ### Why are the changes needed?
    `docker-client` what Spark uses is super old. Snippet from the project page:
    ```
    Spotify no longer uses recent versions of this project internally.
    The version of docker-client we're using is whatever helios has in its pom.xml. => 8.14.1
    ```
    
    ### Does this PR introduce any user-facing change?
    No.
    
    ### How was this patch tested?
    ```
    build/mvn install -DskipTests
    build/mvn -Pdocker-integration-tests -pl :spark-docker-integration-tests_2.12 -Dtest=none -DwildcardSuites=org.apache.spark.sql.jdbc.DB2IntegrationSuite test`
    build/mvn -Pdocker-integration-tests -pl :spark-docker-integration-tests_2.12 -Dtest=none -DwildcardSuites=org.apache.spark.sql.jdbc.MsSqlServerIntegrationSuite test`
    build/mvn -Pdocker-integration-tests -pl :spark-docker-integration-tests_2.12 -Dtest=none -DwildcardSuites=org.apache.spark.sql.jdbc.PostgresIntegrationSuite test`
    ```
    
    Closes #27892 from gaborgsomogyi/docker-client.
    
    Authored-by: Gabor Somogyi <ga...@gmail.com>
    Signed-off-by: Dongjoon Hyun <do...@apache.org>
    (cherry picked from commit b0d2956a359f00e703d5ebe9a58fb9fec869721e)
    Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
 external/docker-integration-tests/pom.xml | 1 +
 pom.xml                                   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/external/docker-integration-tests/pom.xml b/external/docker-integration-tests/pom.xml
index aff79b8..cdf76e9 100644
--- a/external/docker-integration-tests/pom.xml
+++ b/external/docker-integration-tests/pom.xml
@@ -50,6 +50,7 @@
       <groupId>com.spotify</groupId>
       <artifactId>docker-client</artifactId>
       <scope>test</scope>
+      <classifier>shaded</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
diff --git a/pom.xml b/pom.xml
index 5aa100e..978127e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -931,8 +931,9 @@
       <dependency>
         <groupId>com.spotify</groupId>
         <artifactId>docker-client</artifactId>
-        <version>5.0.2</version>
+        <version>8.14.1</version>
         <scope>test</scope>
+        <classifier>shaded</classifier>
         <exclusions>
           <exclusion>
             <artifactId>guava</artifactId>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org