[incubator-pulsar] branch master updated: set correct guice version to prevent dependency inject errors in docker container (#2534)

[je...@apache.org]

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

jerrypeng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 9f6f5c0  set correct guice version to prevent dependency inject errors in docker container (#2534)
9f6f5c0 is described below

commit 9f6f5c0ccd2d273c2b4a3eaa3c894284ffc384c7
Author: Boyang Jerry Peng <je...@gmail.com>
AuthorDate: Fri Sep 7 12:28:05 2018 -0700

    set correct guice version to prevent dependency inject errors in docker container (#2534)
    
    * set correct guice version to prevent dependency inject errors in docker container
    
    * correct guice dependency in license file
---
 pulsar-sql/presto-distribution/LICENSE | 2 +-
 pulsar-sql/presto-distribution/pom.xml | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index 67adc68..fb093d6 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -230,7 +230,7 @@ The Apache Software License, Version 2.0
     - guava-24.1-jre.jar
  * Google Guice
     - guice-4.2.0.jar
-    - guice-multibindings-4.0.jar
+    - guice-multibindings-4.2.0.jar
  * Apache Commons
     - commons-math3-3.6.1.jar
     - commons-beanutils-core-1.8.3.jar
diff --git a/pulsar-sql/presto-distribution/pom.xml b/pulsar-sql/presto-distribution/pom.xml
index a355777..4446d83 100644
--- a/pulsar-sql/presto-distribution/pom.xml
+++ b/pulsar-sql/presto-distribution/pom.xml
@@ -32,6 +32,7 @@
         <airlift.version>0.170</airlift.version>
         <objenesis.version>2.6</objenesis.version>
         <objectsize.version>0.0.12</objectsize.version>
+        <guice.version>4.2.0</guice.version>
         <!-- Launcher properties -->
         <main-class>com.facebook.presto.server.PrestoServer</main-class>
         <process-name>${project.artifactId}</process-name>
@@ -94,6 +95,13 @@
             <version>${objectsize.version}</version>
         </dependency>
 
+        <!-- make sure guice is set to the correct version -->
+        <dependency>
+            <groupId>com.google.inject.extensions</groupId>
+            <artifactId>guice-multibindings</artifactId>
+            <version>${guice.version}</version>
+        </dependency>
+
     </dependencies>
 
     <build>