You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by su...@apache.org on 2019/01/23 20:22:15 UTC

[incubator-pinot] branch master updated: Update versions of packages to move to jersey 2.28 (#3730)

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 4dd29d7  Update versions of packages to move to jersey 2.28 (#3730)
4dd29d7 is described below

commit 4dd29d7cf91d99cb0cea2438f1455c7d3bf0b1ae
Author: Sunitha Beeram <sb...@linkedin.com>
AuthorDate: Wed Jan 23 12:22:11 2019 -0800

    Update versions of packages to move to jersey 2.28 (#3730)
    
    * Update versions of packages to move to jersey 2.28
    
    * Remove hardcoded jersey version
    
    * Add jersey-hk2 dependency explicitly; bump swagger back to the old version
    
    * Fix pinot-server launch errors
    
    * Use the right hk2 dependency
---
 pinot-broker/pom.xml     |  4 ++++
 pinot-controller/pom.xml |  4 ++++
 pinot-server/pom.xml     |  4 ++++
 pom.xml                  | 26 +++++++++++++++-----------
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/pinot-broker/pom.xml b/pinot-broker/pom.xml
index 09c4dbd..daa0e1e 100644
--- a/pinot-broker/pom.xml
+++ b/pinot-broker/pom.xml
@@ -81,6 +81,10 @@
       <artifactId>jersey-container-grizzly2-http</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.glassfish.jersey.inject</groupId>
+      <artifactId>jersey-hk2</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.pinot</groupId>
       <artifactId>pinot-transport</artifactId>
     </dependency>
diff --git a/pinot-controller/pom.xml b/pinot-controller/pom.xml
index 901f0cb..83c322c 100644
--- a/pinot-controller/pom.xml
+++ b/pinot-controller/pom.xml
@@ -108,6 +108,10 @@
       <artifactId>jersey-server</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.glassfish.jersey.inject</groupId>
+      <artifactId>jersey-hk2</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.glassfish.jersey.media</groupId>
       <artifactId>jersey-media-multipart</artifactId>
     </dependency>
diff --git a/pinot-server/pom.xml b/pinot-server/pom.xml
index 295a528..911e7f0 100644
--- a/pinot-server/pom.xml
+++ b/pinot-server/pom.xml
@@ -159,6 +159,10 @@
       <artifactId>jersey-common</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.glassfish.jersey.inject</groupId>
+      <artifactId>jersey-hk2</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.glassfish.jersey.media</groupId>
       <artifactId>jersey-media-json-jackson</artifactId>
     </dependency>
diff --git a/pom.xml b/pom.xml
index 07ac631..e4bd807 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,10 +111,9 @@
     <!-- jfim: for Kafka 0.9.0.0, use zkclient 0.7 -->
     <kafka.version>0.9.0.1</kafka.version>
     <zkclient.version>0.7</zkclient.version>
-    <!-- TODO: bump up the jackson version once we update jersey version to 2.28 or later -->
-    <jackson.version>2.8.3</jackson.version>
+    <jackson.version>2.9.8</jackson.version>
     <async-http-client.version>1.9.21</async-http-client.version>
-    <jersey.version>2.23</jersey.version>
+    <jersey.version>2.28-RC4</jersey.version>
     <swagger.version>1.5.10</swagger.version>
     <hadoop.version>2.7.0</hadoop.version>
     <antlr.version>4.6</antlr.version>
@@ -405,6 +404,11 @@
         <version>1.7.7</version>
       </dependency>
       <dependency>
+        <groupId>javax.validation</groupId>
+        <artifactId>validation-api</artifactId>
+        <version>2.0.1.Final</version>
+      </dependency>
+      <dependency>
         <groupId>org.apache.helix</groupId>
         <artifactId>helix-core</artifactId>
         <version>${helix.version}</version>
@@ -640,6 +644,11 @@
         <version>${jersey.version}</version>
       </dependency>
       <dependency>
+        <groupId>org.glassfish.jersey.inject</groupId>
+        <artifactId>jersey-hk2</artifactId>
+        <version>${jersey.version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.glassfish.jersey.media</groupId>
         <artifactId>jersey-media-multipart</artifactId>
         <version>${jersey.version}</version>
@@ -647,7 +656,7 @@
       <dependency>
         <groupId>org.glassfish.jersey.media</groupId>
         <artifactId>jersey-media-json-jackson</artifactId>
-        <version>2.24</version>
+        <version>${jersey.version}</version>
       </dependency>
       <dependency>
         <groupId>com.sun.jersey</groupId>
@@ -676,11 +685,6 @@
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>org.glassfish.hk2.external</groupId>
-        <artifactId>javax.inject</artifactId>
-        <version>2.4.0-b34</version>
-      </dependency>
-      <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-math</artifactId>
         <version>2.1</version>
@@ -774,7 +778,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.5.1</version>
+          <version>3.8.0</version>
           <configuration>
             <source>${jdk.version}</source>
             <target>${jdk.version}</target>
@@ -1098,7 +1102,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>2.4.3</version>
+        <version>3.2.1</version>
         <configuration>
           <shadedArtifactAttached>true</shadedArtifactAttached>
           <transformers>


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