#

.gitignore

@@ -12,3 +12,13 @@ rebel.xml
 **/.idea/
 atms-api/~
 /bin/
+
+/atms-api/src/main/resources/conf/conf_profile_dev_local.properties
+
+/atms-api/pom.xml
+
+atms-web/src/main/webapp/package-lock.json
+
+
+
+  atms-web/src/main/webapp/package.json

atms-api/pom.xml

@@ -431,7 +431,7 @@
 
     <profiles>
         <profile>
-            <id>dev</id>
+            <id>local</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
@@ -477,6 +477,17 @@
                 <env>uat</env>
             </properties>
         </profile>
+        <profile>
+            <id>local</id>
+            <build>
+                <filters>
+                    <filter>src/main/resources/conf/conf_profile_dev_local.properties</filter>
+                </filters>
+            </build>
+            <properties>
+                <env>uat</env>
+            </properties>
+        </profile>
     </profiles>
 
     <build>

atms-web/src/main/webapp/package.json

@@ -7,7 +7,7 @@
   "private": true,
   "scripts": {},
   "dependencies": {
-    "grunt": "1.0.1",
+    "grunt": "^1.0.4",
     "grunt-cli": "1.2.0"
   },
   "devDependencies": {
@@ -15,7 +15,7 @@
     "grunt-contrib-concat": "1.0.1",
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-cssmin": "^3.0.0",
-    "grunt-contrib-less": "1.4.1",
+    "grunt-contrib-less": "^2.0.0",
     "grunt-contrib-uglify": "^4.0.0",
     "grunt-contrib-watch": "^1.1.0"
   }