You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ma...@apache.org on 2016/12/17 00:15:29 UTC

incubator-atlas git commit: ATLAS-1367: fix to use correct version of curator-client library

Repository: incubator-atlas
Updated Branches:
  refs/heads/master b3efebc96 -> 05bdbc621


ATLAS-1367: fix to use correct version of curator-client library


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

Branch: refs/heads/master
Commit: 05bdbc621f5312e001c428fbd4abe4dc1341a7c0
Parents: b3efebc
Author: Madhan Neethiraj <ma...@apache.org>
Authored: Fri Dec 16 14:47:24 2016 -0800
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Fri Dec 16 16:15:05 2016 -0800

----------------------------------------------------------------------
 pom.xml                                                        | 6 ++++++
 release-log.txt                                                | 1 +
 webapp/pom.xml                                                 | 5 +++++
 .../src/main/java/org/apache/atlas/web/setup/SetupSteps.java   | 2 +-
 4 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/05bdbc62/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bdfd785..0321d84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -816,6 +816,12 @@
 
             <dependency>
                 <groupId>org.apache.curator</groupId>
+                <artifactId>curator-client</artifactId>
+                <version>${curator.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.curator</groupId>
                 <artifactId>curator-recipes</artifactId>
                 <version>${curator.version}</version>
             </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/05bdbc62/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 15e042d..3de0ce6 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -9,6 +9,7 @@ ATLAS-1060 Add composite indexes for exact match performance improvements for al
 ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai)
 
 ALL CHANGES:
+ATLAS-1367 fix to use correct version of curator-client library (mneethiraj)
 ATLAS-1371 create/edit tag dialog to allow choosing of data-type for attributes (Kalyanikashikar via mneethiraj)
 ATLAS-1395 Lineage improvement for tooltip (kevalbhatt via mneethiraj)
 ATLAS-1193 UI to create/update entities (Kalyanikashikar via mneethiraj)

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/05bdbc62/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 09701e1..5dc7401 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -175,6 +175,11 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-client</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/05bdbc62/webapp/src/main/java/org/apache/atlas/web/setup/SetupSteps.java
----------------------------------------------------------------------
diff --git a/webapp/src/main/java/org/apache/atlas/web/setup/SetupSteps.java b/webapp/src/main/java/org/apache/atlas/web/setup/SetupSteps.java
index 65c88fe..bc532e9 100644
--- a/webapp/src/main/java/org/apache/atlas/web/setup/SetupSteps.java
+++ b/webapp/src/main/java/org/apache/atlas/web/setup/SetupSteps.java
@@ -78,7 +78,7 @@ public class SetupSteps {
         } catch (SetupException se) {
             LOG.error("Got setup exception while trying to setup", se);
             throw se;
-        } catch (Exception e) {
+        } catch (Throwable e) {
             LOG.error("Error running setup steps", e);
             throw new SetupException("Error running setup steps", e);
         } finally {