ATLAS-109 Remove v2 Folder. Contributed by Vishal Kadam

dashboard/v2/.bowerrc → dashboard/.bowerrc

 {
-  "directory": "../../webapp/target/dist/lib/",
+  "directory": "../webapp/target/dist/lib/",
   "storage": {
           "packages": ".bower-cache",
           "registry": ".bower-registry"

dashboard/v2/gruntfile.js → dashboard/gruntfile.js

@@ -24,7 +24,7 @@ module.exports = function(grunt) {
     var classPathSep = (process.platform === "win32") ? ';' : ':',
         gitHash = '',
         pkg = grunt.file.readJSON('package.json'),
-        distPath = '../../webapp/target/dist';
+        distPath = '../webapp/target/dist';
 
     grunt.initConfig({
         watch: {
@@ -137,9 +137,9 @@ module.exports = function(grunt) {
             }
         },
         clean: {
-            build :[distPath],
+            build: [distPath],
             options: {
-            	force: true
+                force: true
             }
         },
         proxit: {

distro/src/main/assemblies/src-package.xml

@@ -36,11 +36,11 @@
                 <exclude>**/*.iml</exclude>
                 <exclude>**/*.log</exclude>
                 <exclude>**/*.pyc</exclude> <!-- python compiled executable -->
-                <exclude>dashboard/**/.bower-*/**</exclude> <!-- temp libs -->
-                <exclude>dashboard/v2/lib/**</exclude>  <!-- temp libs -->
-                <exclude>dashboard/v2/node*/**</exclude>  <!-- temp libs -->
-                <exclude>dashboard/v2/dist/**</exclude>  <!-- package -->
-                <exclude>dashboard/v2/**/*.min.js*</exclude> <!-- minified JS -->
+                <exclude>dashboard/.bower-*/**</exclude> <!-- temp libs -->
+                <exclude>dashboard/lib/**</exclude>  <!-- temp libs -->
+                <exclude>dashboard/node*/**</exclude>  <!-- temp libs -->
+                <exclude>dashboard/dist/**</exclude>  <!-- package -->
+                <exclude>dashboard/*.min.js*</exclude> <!-- minified JS -->
             </excludes>
         </fileSet>
     </fileSets>

pom.xml

@@ -1255,7 +1255,7 @@
                     <artifactId>frontend-maven-plugin</artifactId>
                     <version>0.0.23</version>
                     <configuration>
-                        <workingDirectory>../dashboard/v2/</workingDirectory>
+                        <workingDirectory>../dashboard/</workingDirectory>
                     </configuration>
                 </plugin>
 
@@ -1552,19 +1552,19 @@
                         <exclude>**/.externalToolBuilders/**</exclude>
                         <exclude>**/build.log</exclude>
                         <!-- temp libs -->
-                        <exclude>dashboard/**/.bower-*/**</exclude>
+                        <exclude>dashboard/.bower-*/**</exclude>
                         <!-- json file -->
-                        <exclude>dashboard/v2/.bowerrc</exclude>
+                        <exclude>dashboard/.bowerrc</exclude>
                         <!-- temp libs -->
-                        <exclude>dashboard/v2/lib/**</exclude>
+                        <exclude>dashboard/lib/**</exclude>
                         <!-- temp libs -->
-                        <exclude>dashboard/v2/node*/**</exclude>
+                        <exclude>dashboard/node*/**</exclude>
                         <!-- package -->
-                        <exclude>dashboard/v2/dist/**</exclude>
+                        <exclude>dashboard/dist/**</exclude>
                         <!-- lib files -->
-                        <exclude>dashboard/v2/public/lib/**</exclude>
+                        <exclude>dashboard/public/lib/**</exclude>
                         <!-- minified JS -->
-                        <exclude>dashboard/v2/**/*.min.js*</exclude>
+                        <exclude>dashboard/**/*.min.js*</exclude>
                     </excludes>
                 </configuration>
                 <executions>

release-log.txt

@@ -8,6 +8,7 @@ ATLAS-54 Rename configs in hive hook (shwethags)
 ATLAS-3 Mixed Index creation fails with Date types (suma.shivaprasad via shwethags)
 
 ALL CHANGES:
+ATLAS-109 Remove v2 Folder (Vishal Kadam via Venkatesh Seetharam)
 ATLAS-90 Support offline builds (Vishal Kadam via Venkatesh Seetharam)
 ATLAS-154 Update website for 0.5-incubating release (Venkatesh Seetharam)
 ATLAS-153 Build failure - org.glassfish:javax.el (shwethags)