Repository: atlas
Updated Branches:
  refs/heads/master 8535e88cd -> b17d0e970


ATLAS-2340: Fix for java.lang.IncompatibleClassChangeError while running 
import-hive.sh script

Signed-off-by: Madhan Neethiraj <mad...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/b17d0e97
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/b17d0e97
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/b17d0e97

Branch: refs/heads/master
Commit: b17d0e970b61950d2738ec721fa3a4d5a1e3f3c9
Parents: 8535e88
Author: nixonrodrigues <ni...@apache.org>
Authored: Thu Jan 11 18:07:27 2018 +0530
Committer: Madhan Neethiraj <mad...@apache.org>
Committed: Thu Jan 11 07:30:02 2018 -0800

----------------------------------------------------------------------
 addons/falcon-bridge/pom.xml | 10 ++++++++++
 addons/hbase-bridge/pom.xml  | 10 ++++++++++
 addons/hive-bridge/pom.xml   | 10 ++++++++++
 addons/sqoop-bridge/pom.xml  | 10 ++++++++++
 addons/storm-bridge/pom.xml  | 10 ++++++++++
 pom.xml                      |  1 +
 webapp/pom.xml               | 13 +++++++++++++
 7 files changed, 64 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/atlas/blob/b17d0e97/addons/falcon-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/falcon-bridge/pom.xml b/addons/falcon-bridge/pom.xml
index 3169927..f8d3570 100644
--- a/addons/falcon-bridge/pom.xml
+++ b/addons/falcon-bridge/pom.xml
@@ -181,6 +181,16 @@
                                             
<artifactId>kafka-clients</artifactId>
                                             <version>${kafka.version}</version>
                                         </artifactItem>
+                                        <artifactItem>
+                                            <groupId>com.sun.jersey</groupId>
+                                            
<artifactId>jersey-json</artifactId>
+                                            
<version>${jersey.version}</version>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>javax.ws.rs</groupId>
+                                            <artifactId>jsr311-api</artifactId>
+                                            <version>${jsr.version}</version>
+                                        </artifactItem>
                                     </artifactItems>
                                 </configuration>
                             </execution>

http://git-wip-us.apache.org/repos/asf/atlas/blob/b17d0e97/addons/hbase-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml
index dd5979a..ece82f6 100644
--- a/addons/hbase-bridge/pom.xml
+++ b/addons/hbase-bridge/pom.xml
@@ -320,6 +320,16 @@
                                             
<artifactId>hbase-common</artifactId>
                                             <version>${hbase.version}</version>
                                         </artifactItem>
+                                        <artifactItem>
+                                            <groupId>com.sun.jersey</groupId>
+                                            
<artifactId>jersey-json</artifactId>
+                                            
<version>${jersey.version}</version>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>javax.ws.rs</groupId>
+                                            <artifactId>jsr311-api</artifactId>
+                                            <version>${jsr.version}</version>
+                                        </artifactItem>
                                     </artifactItems>
                                 </configuration>
                             </execution>

http://git-wip-us.apache.org/repos/asf/atlas/blob/b17d0e97/addons/hive-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml
index ae11384..9421e32 100755
--- a/addons/hive-bridge/pom.xml
+++ b/addons/hive-bridge/pom.xml
@@ -288,6 +288,16 @@
                                             
<artifactId>hbase-common</artifactId>
                                             <version>${hbase.version}</version>
                                         </artifactItem>
+                                        <artifactItem>
+                                            <groupId>com.sun.jersey</groupId>
+                                            
<artifactId>jersey-json</artifactId>
+                                            
<version>${jersey.version}</version>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>javax.ws.rs</groupId>
+                                            <artifactId>jsr311-api</artifactId>
+                                            <version>${jsr.version}</version>
+                                        </artifactItem>
                                     </artifactItems>
                                 </configuration>
                             </execution>

http://git-wip-us.apache.org/repos/asf/atlas/blob/b17d0e97/addons/sqoop-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/sqoop-bridge/pom.xml b/addons/sqoop-bridge/pom.xml
index 2989fbc..6c9f5b3 100644
--- a/addons/sqoop-bridge/pom.xml
+++ b/addons/sqoop-bridge/pom.xml
@@ -243,6 +243,16 @@
                                             
<artifactId>kafka-clients</artifactId>
                                             <version>${kafka.version}</version>
                                         </artifactItem>
+                                        <artifactItem>
+                                            <groupId>com.sun.jersey</groupId>
+                                            
<artifactId>jersey-json</artifactId>
+                                            
<version>${jersey.version}</version>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>javax.ws.rs</groupId>
+                                            <artifactId>jsr311-api</artifactId>
+                                            <version>${jsr.version}</version>
+                                        </artifactItem>
                                     </artifactItems>
                                 </configuration>
                             </execution>

http://git-wip-us.apache.org/repos/asf/atlas/blob/b17d0e97/addons/storm-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/storm-bridge/pom.xml b/addons/storm-bridge/pom.xml
index cc20741..29c7021 100644
--- a/addons/storm-bridge/pom.xml
+++ b/addons/storm-bridge/pom.xml
@@ -262,6 +262,16 @@
                                             <artifactId>log4j</artifactId>
                                             <version>${log4j.version}</version>
                                         </artifactItem>
+                                        <artifactItem>
+                                            <groupId>com.sun.jersey</groupId>
+                                            
<artifactId>jersey-json</artifactId>
+                                            
<version>${jersey.version}</version>
+                                        </artifactItem>
+                                        <artifactItem>
+                                            <groupId>javax.ws.rs</groupId>
+                                            <artifactId>jsr311-api</artifactId>
+                                            <version>${jsr.version}</version>
+                                        </artifactItem>
                                     </artifactItems>
                                 </configuration>
                             </execution>

http://git-wip-us.apache.org/repos/asf/atlas/blob/b17d0e97/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 203c4b0..c64b26e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -530,6 +530,7 @@
         <jetty.version>9.3.14.v20161028</jetty.version>
         <jetty.jsp.version>9.2.12.v20150709</jetty.jsp.version>
         <jersey.version>1.19</jersey.version>
+        <jsr.version>1.1</jsr.version>
 
         <hadoop.version>2.7.1</hadoop.version>
         <hbase.version>1.1.2</hbase.version>

http://git-wip-us.apache.org/repos/asf/atlas/blob/b17d0e97/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 2cf6e10..352b8cd 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -237,6 +237,19 @@
         </dependency>
 
         <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-json</artifactId>
+            <version>${jersey.version}</version>
+
+        </dependency>
+
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>jsr311-api</artifactId>
+            <version>${jsr.version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
         </dependency>

Reply via email to