atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yhema...@apache.org
Subject incubator-atlas git commit: ATLAS-672 UI: Make dashboard v2 the default UI implementation (bergenholtz via yhemanth)
Date Mon, 02 May 2016 05:00:58 GMT
Repository: incubator-atlas
Updated Branches:
  refs/heads/master 7d040c52f -> c69df40f7


ATLAS-672 UI: Make dashboard v2 the default UI implementation (bergenholtz via yhemanth)


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

Branch: refs/heads/master
Commit: c69df40f7c069646b613ebb58739f6be47ea0f89
Parents: 7d040c5
Author: Hemanth Yamijala <hyamijala@hortonworks.com>
Authored: Mon May 2 10:30:14 2016 +0530
Committer: Hemanth Yamijala <hyamijala@hortonworks.com>
Committed: Mon May 2 10:30:14 2016 +0530

----------------------------------------------------------------------
 pom.xml         | 10 +++++-----
 release-log.txt |  1 +
 webapp/pom.xml  | 16 ++++++++--------
 3 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/c69df40f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 562bdcd..c14e0b3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -461,8 +461,8 @@
         <module>client</module>
         <module>titan</module>
         <module>repository</module>
-        <module>dashboard</module>
-        <!-- <module>dashboardv2</module> -->
+        <!-- <module>dashboard</module> -->
+        <module>dashboardv2</module>
         <module>webapp</module>
         <module>docs</module>
         <module>addons/hdfs-model</module>
@@ -1040,12 +1040,12 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <dependency>
+            <!-- <dependency>
                 <groupId>org.apache.atlas</groupId>
                 <artifactId>atlas-dashboard</artifactId>
                 <version>${project.version}</version>
                 <type>war</type>
-            </dependency>
+            </dependency> -->
 
             <dependency>
                 <groupId>org.apache.atlas</groupId>
@@ -1651,7 +1651,7 @@
                         <exclude>**/maven-eclipse.xml</exclude>
                         <exclude>**/.externalToolBuilders/**</exclude>
                         <exclude>**/build.log</exclude>
-                        <exclude>.bowerrc</exclude>
+                        <exclude>**/.bowerrc</exclude>
                         <exclude>*.json</exclude>
                         <exclude>**/overlays/**</exclude>
                         <exclude>dev-support/**</exclude>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/c69df40f/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index c13ad48..ef74ddd 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -3,6 +3,7 @@ Apache Atlas Release Notes
 
 --trunk - unreleased
 INCOMPATIBLE CHANGES:
+ATLAS-672 UI: Make dashboard v2 the default UI implementation (bergenholtz via yhemanth)
 ATLAS-532 Change Data types of all timestamps in Hive model(currently long)(sumasai via yhemanth)
 ATLAS-622 Introduce soft delete (shwethags)
 ATLAS-494 UI Authentication (nixonrodrigues via shwethags)

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/c69df40f/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 1df4112..393863c 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -282,17 +282,17 @@
                 <version>${spring-ldap-core.version}</version>
         </dependency>
 
-        <dependency>
+       <!-- <dependency>
             <groupId>org.apache.atlas</groupId>
             <artifactId>atlas-dashboard</artifactId>
             <type>war</type>
-        </dependency>
+        </dependency> -->
 
-       <!-- <dependency>
+       <dependency>
             <groupId>org.apache.atlas</groupId>
             <artifactId>atlas-dashboardv2</artifactId>
             <type>war</type>
-        </dependency> -->
+        </dependency>
     </dependencies>
 
     <build>
@@ -303,14 +303,14 @@
                 <configuration>
                     <attachClasses>true</attachClasses>
                     <overlays>
-                        <overlay>
+                        <!-- <overlay>
                             <groupId>org.apache.atlas</groupId>
                             <artifactId>atlas-dashboard</artifactId>
-                        </overlay>
-                        <!-- <overlay>
+                        </overlay> -->
+                        <overlay>
                             <groupId>org.apache.atlas</groupId>
                             <artifactId>atlas-dashboardv2</artifactId>
-                        </overlay> -->
+                        </overlay>
 		        <overlay>
 		             <!-- empty groupId/artifactId represents the current build -->
             		</overlay>


Mime
View raw message