You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by bh...@apache.org on 2019/04/05 19:36:06 UTC

[hadoop] branch trunk updated: HDDS-1390. Fix OzoneS3 Gateway server due to exclusion of hk2-api. (#698)

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

bharat pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 26dc940  HDDS-1390. Fix OzoneS3 Gateway server due to exclusion of hk2-api. (#698)
26dc940 is described below

commit 26dc9408139cfc67f89cd503bd046ed87843893b
Author: avijayanhwx <14...@users.noreply.github.com>
AuthorDate: Fri Apr 5 12:36:00 2019 -0700

    HDDS-1390. Fix OzoneS3 Gateway server due to exclusion of hk2-api. (#698)
---
 hadoop-ozone/s3gateway/pom.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml
index 3d47e72..b4df2b8 100644
--- a/hadoop-ozone/s3gateway/pom.xml
+++ b/hadoop-ozone/s3gateway/pom.xml
@@ -55,24 +55,27 @@
       <groupId>org.glassfish.jersey.inject</groupId>
       <artifactId>jersey-hk2</artifactId>
       <version>2.27</version>
-      <!-- The versions of these excluded dependencies are 2.5.0-beta. The
-      newer and release version 2.5.0 is being brought in by ozone-recon -->
       <exclusions>
         <exclusion>
           <artifactId>hk2-api</artifactId>
           <groupId>org.glassfish.hk2</groupId>
         </exclusion>
         <exclusion>
-          <groupId>org.glassfish.hk2.external</groupId>
-          <artifactId>aopalliance-repackaged</artifactId>
+          <artifactId>hk2-utils</artifactId>
+          <groupId>org.glassfish.hk2</groupId>
         </exclusion>
         <exclusion>
-          <groupId>org.glassfish.hk2</groupId>
-          <artifactId>hk2-utils</artifactId>
+          <artifactId>aopalliance-repackaged</artifactId>
+          <groupId>org.glassfish.hk2.external</groupId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
+      <groupId>org.glassfish.hk2</groupId>
+      <artifactId>hk2-api</artifactId>
+      <version>2.5.0</version>
+    </dependency>
+    <dependency>
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-xml</artifactId>
       <version>2.9.0</version>


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