diff --git a/distro/pom.xml b/distro/pom.xml
index db1f23a..367b2c7 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -31,21 +31,9 @@
 
     <!-- by default configure hbase and solr with the distribution -->
     <properties>
-
-        <graph.storage.backend>hbase2</graph.storage.backend>
-        <graph.storage.properties>#Hbase
-#For standalone mode , specify localhost
-#for distributed mode, specify zookeeper quorum here
-atlas.graph.storage.hostname=
-atlas.graph.storage.hbase.regions-per-server=1
-atlas.graph.storage.lock.wait-time=10000
-
-#In order to use Cassandra as a backend, comment out the hbase specific properties above, and uncomment the
-#the following properties
-#atlas.graph.storage.clustername=
-#atlas.graph.storage.port=
-
-        </graph.storage.properties>
+        <cassandra.embedded>false</cassandra.embedded>
+        <elasticsearch.managed>false</elasticsearch.managed>
+        <entity.repository.properties>atlas.EntityAuditRepository.impl=org.apache.atlas.repository.audit.HBaseBasedAuditRepository</entity.repository.properties>
         <graph.index.backend>solr</graph.index.backend>
         <graph.index.properties>#Solr
 #Solr cloud mode properties
@@ -71,12 +59,21 @@
 #atlas.graph.index.search.hostname=localhost
 #atlas.graph.index.search.elasticsearch.client-only=true
         </graph.index.properties>
+        <graph.storage.backend>hbase2</graph.storage.backend>
+        <graph.storage.properties>#Hbase
+#For standalone mode , specify localhost
+#for distributed mode, specify zookeeper quorum here
+atlas.graph.storage.hostname=
+atlas.graph.storage.hbase.regions-per-server=1
+atlas.graph.storage.lock.wait-time=10000
+
+#In order to use Cassandra as a backend, comment out the hbase specific properties above, and uncomment the
+#the following properties
+#atlas.graph.storage.clustername=
+#atlas.graph.storage.port=
+        </graph.storage.properties>
         <hbase.embedded>false</hbase.embedded>
         <solr.embedded>false</solr.embedded>
-        <cassandra.embedded>false</cassandra.embedded>
-        <elasticsearch.managed>false</elasticsearch.managed>
-
-        <entity.repository.properties>atlas.EntityAuditRepository.impl=org.apache.atlas.repository.audit.HBaseBasedAuditRepository</entity.repository.properties>
     </properties>
 
     <profiles>
@@ -157,13 +154,8 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <properties>
-                <graph.storage.backend>berkeleyje</graph.storage.backend>
-                <graph.storage.properties>#Berkeley
-atlas.graph.storage.directory=${sys:atlas.home}/data/berkeley
-atlas.graph.storage.lock.clean-expired=true
-atlas.graph.storage.lock.expiry-time=500
-atlas.graph.storage.lock.wait-time=300
-                </graph.storage.properties>
+                <cassandra.embedded>false</cassandra.embedded>
+                <entity.repository.properties>atlas.EntityAuditRepository.impl=org.apache.atlas.repository.audit.NoopEntityAuditRepository</entity.repository.properties>
                 <graph.index.backend>solr</graph.index.backend>
                 <graph.index.properties>#Solr
 #Solr cloud mode properties
@@ -177,19 +169,21 @@
 #atlas.graph.index.search.solr.mode=http
 #atlas.graph.index.search.solr.http-urls=http://localhost:8983/solr
                 </graph.index.properties>
-		<entity.repository.properties>atlas.EntityAuditRepository.impl=org.apache.atlas.repository.audit.NoopEntityAuditRepository</entity.repository.properties>
-
-                <cassandra.embedded>false</cassandra.embedded>
+                <graph.storage.backend>berkeleyje</graph.storage.backend>
+                <graph.storage.properties>#Berkeley
+atlas.graph.storage.directory=${sys:atlas.home}/data/berkeley
+atlas.graph.storage.lock.clean-expired=true
+atlas.graph.storage.lock.expiry-time=500
+atlas.graph.storage.lock.wait-time=300
+                </graph.storage.properties>
                 <hbase.embedded>false</hbase.embedded>
-                <solr.embedded>true</solr.embedded>
-
                 <solr.dir>${project.build.directory}/solr</solr.dir>
-                <solr.tar>https://archive.apache.org/dist/lucene/solr/${solr.version}/solr-${solr.version}.tgz</solr.tar>
+                <solr.embedded>true</solr.embedded>
                 <solr.folder>solr-${solr.version}</solr.folder>
-
+                <solr.tar>https://archive.apache.org/dist/lucene/solr/${solr.version}/solr-${solr.version}.tgz</solr.tar>
                 <zk.dir>${project.build.directory}/zk</zk.dir>
-                <zk.tar>https://archive.apache.org/dist/zookeeper/zookeeper-${zookeeper.version}/zookeeper-${zookeeper.version}.tar.gz</zk.tar>
                 <zk.folder>zookeeper-${zookeeper.version}</zk.folder>
+                <zk.tar>https://archive.apache.org/dist/zookeeper/zookeeper-${zookeeper.version}/zookeeper-${zookeeper.version}.tar.gz</zk.tar>
             </properties>
             <build>
                 <plugins>
@@ -253,6 +247,17 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <properties>
+                <cassandra.embedded>false</cassandra.embedded>
+                <elasticsearch.dir>${project.build.directory}/elasticsearch</elasticsearch.dir>
+                <elasticsearch.folder>elasticsearch-${elasticsearch.version}</elasticsearch.folder>
+                <elasticsearch.managed>true</elasticsearch.managed>
+                <elasticsearch.tar>https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${elasticsearch.version}.tar.gz</elasticsearch.tar>
+                <entity.repository.properties>atlas.EntityAuditRepository.impl=org.apache.atlas.repository.audit.NoopEntityAuditRepository</entity.repository.properties>
+                <graph.index.backend>elasticsearch</graph.index.backend>
+                <graph.index.properties>#ElasticSearch
+atlas.graph.index.search.hostname=localhost
+atlas.graph.index.search.elasticsearch.client-only=true
+                </graph.index.properties>
                 <graph.storage.backend>berkeleyje</graph.storage.backend>
                 <graph.storage.properties>#Berkeley
 atlas.graph.storage.directory=${sys:atlas.home}/data/berkeley
@@ -260,19 +265,6 @@
 atlas.graph.storage.lock.expiry-time=500
 atlas.graph.storage.lock.wait-time=300
                 </graph.storage.properties>
-                <graph.index.backend>elasticsearch</graph.index.backend>
-                <graph.index.properties>#ElasticSearch
-atlas.graph.index.search.hostname=localhost
-atlas.graph.index.search.elasticsearch.client-only=true
-                </graph.index.properties>
-		        <entity.repository.properties>atlas.EntityAuditRepository.impl=org.apache.atlas.repository.audit.NoopEntityAuditRepository</entity.repository.properties>
-
-                <elasticsearch.managed>true</elasticsearch.managed>
-                <cassandra.embedded>false</cassandra.embedded>
-                <elasticsearch.dir>${project.build.directory}/elasticsearch</elasticsearch.dir>
-                <elasticsearch.tar>https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${elasticsearch.version}.tar.gz</elasticsearch.tar>
-                <elasticsearch.folder>elasticsearch-${elasticsearch.version}</elasticsearch.folder>
-
             </properties>
             <build>
                 <plugins>
@@ -323,13 +315,7 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <properties>
-                <graph.storage.properties>#Hbase
-#For standalone mode , specify localhost
-#for distributed mode, specify zookeeper quorum here
-atlas.graph.storage.hostname=localhost
-atlas.graph.storage.hbase.regions-per-server=1
-atlas.graph.storage.lock.wait-time=10000
-                </graph.storage.properties>
+                <cassandra.embedded>false</cassandra.embedded>
                 <graph.index.properties>#Solr
 #Solr cloud mode properties
 atlas.graph.index.search.solr.mode=cloud
@@ -342,18 +328,21 @@
 #atlas.graph.index.search.solr.mode=http
 #atlas.graph.index.search.solr.http-urls=http://localhost:8983/solr
                 </graph.index.properties>
-
-                <cassandra.embedded>false</cassandra.embedded>
-                <hbase.embedded>true</hbase.embedded>
-                <solr.embedded>true</solr.embedded>
-
+                <graph.storage.properties>#Hbase
+#For standalone mode , specify localhost
+#for distributed mode, specify zookeeper quorum here
+atlas.graph.storage.hostname=localhost
+atlas.graph.storage.hbase.regions-per-server=1
+atlas.graph.storage.lock.wait-time=10000
+                </graph.storage.properties>
                 <hbase.dir>${project.build.directory}/hbase</hbase.dir>
-                <hbase.tar>https://archive.apache.org/dist/hbase/${hbase.version}/hbase-${hbase.version}-bin.tar.gz</hbase.tar>
+                <hbase.embedded>true</hbase.embedded>
                 <hbase.folder>hbase-${hbase.version}</hbase.folder>
-
+                <hbase.tar>https://archive.apache.org/dist/hbase/${hbase.version}/hbase-${hbase.version}-bin.tar.gz</hbase.tar>
                 <solr.dir>${project.build.directory}/solr</solr.dir>
-                <solr.tar>https://archive.apache.org/dist/lucene/solr/${solr.version}/solr-${solr.version}.tgz</solr.tar>
+                <solr.embedded>true</solr.embedded>
                 <solr.folder>solr-${solr.version}</solr.folder>
+                <solr.tar>https://archive.apache.org/dist/lucene/solr/${solr.version}/solr-${solr.version}.tgz</solr.tar>
             </properties>
             <build>
                 <plugins>
@@ -416,11 +405,8 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <properties>
-                <graph.storage.backend>embeddedcassandra</graph.storage.backend>
+                <cassandra.embedded>true</cassandra.embedded>
                 <entity.repository.properties>atlas.EntityAuditRepository.impl=org.apache.atlas.repository.audit.CassandraBasedAuditRepository</entity.repository.properties>
-                <graph.storage.properties>#Cassandra
-atlas.graph.storage.conf-file=${sys:atlas.home}/conf/cassandra.yml
-                </graph.storage.properties>
                 <graph.index.properties>#Solr
 #Solr cloud mode properties
 atlas.graph.index.search.solr.mode=cloud
@@ -433,18 +419,18 @@
 #atlas.graph.index.search.solr.mode=http
 #atlas.graph.index.search.solr.http-urls=http://localhost:8983/solr
                 </graph.index.properties>
-
-                <cassandra.embedded>true</cassandra.embedded>
+                <graph.storage.backend>embeddedcassandra</graph.storage.backend>
+                <graph.storage.properties>#Cassandra
+atlas.graph.storage.conf-file=${sys:atlas.home}/conf/cassandra.yml
+                </graph.storage.properties>
                 <hbase.embedded>false</hbase.embedded>
                 <solr.embedded>true</solr.embedded>
-
                 <solr.dir>${project.build.directory}/solr</solr.dir>
-                <solr.tar>https://archive.apache.org/dist/lucene/solr/${solr.version}/solr-${solr.version}.tgz</solr.tar>
                 <solr.folder>solr-${solr.version}</solr.folder>
-
+                <solr.tar>https://archive.apache.org/dist/lucene/solr/${solr.version}/solr-${solr.version}.tgz</solr.tar>
                 <zk.dir>${project.build.directory}/zk</zk.dir>
-                <zk.tar>https://archive.apache.org/dist/zookeeper/zookeeper-${zookeeper.version}/zookeeper-${zookeeper.version}.tar.gz</zk.tar>
                 <zk.folder>zookeeper-${zookeeper.version}</zk.folder>
+                <zk.tar>https://archive.apache.org/dist/zookeeper/zookeeper-${zookeeper.version}/zookeeper-${zookeeper.version}.tar.gz</zk.tar>
             </properties>
             <build>
                 <plugins>
diff --git a/docs/pom.xml b/docs/pom.xml
index f22f9e2..545969f 100755
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -27,8 +27,8 @@
     <description>Apache Atlas Documentation</description>
     <name>Apache Atlas Documentation</name>
     <properties>
-        <skipTests>true</skipTests>
         <skipSite>false</skipSite>
+        <skipTests>true</skipTests>
     </properties>
     <!-- TODO -->
     <!-- <reporting>
diff --git a/pom.xml b/pom.xml
index aca36aa..13ff299 100644
--- a/pom.xml
+++ b/pom.xml
@@ -573,12 +573,12 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <properties>
-                <graph.storage.backend>hbase2</graph.storage.backend>
-                <graph.index.backend>solr</graph.index.backend>
-                <solr.zk.address>localhost:9983</solr.zk.address>
-                <graph.storage.hostname>localhost</graph.storage.hostname>
                 <entity.repository.impl>org.apache.atlas.repository.audit.HBaseBasedAuditRepository
                 </entity.repository.impl>
+                <graph.index.backend>solr</graph.index.backend>
+                <graph.storage.backend>hbase2</graph.storage.backend>
+                <graph.storage.hostname>localhost</graph.storage.hostname>
+                <solr.zk.address>localhost:9983</solr.zk.address>
             </properties>
         </profile>
 
@@ -613,13 +613,13 @@
                 </property>
             </activation>
             <properties>
-                <graphGroup>org.apache.atlas</graphGroup>
-                <graphArtifact>atlas-graphdb-janus</graphArtifact>
-                <skipDocs>false</skipDocs>
-                <graphdb.backend.impl>org.apache.atlas.repository.graphdb.janus.AtlasJanusGraphDatabase</graphdb.backend.impl>
-                <graph.index.backend>solr</graph.index.backend>
-                <tests.solr.embedded>true</tests.solr.embedded>
                 <distro.exclude.packages>WEB-INF/lib/je-*.jar,WEB-INF/lib/solr-test-framework-*.jar, WEB-INF/lib/jts-*.jar,WEB-INF/lib/logback-*.jar,WEB-INF/lib/dom4j-*.jar,WEB-INF/lib/ant-*.jar</distro.exclude.packages>
+                <graph.index.backend>solr</graph.index.backend>
+                <graphArtifact>atlas-graphdb-janus</graphArtifact>
+                <graphdb.backend.impl>org.apache.atlas.repository.graphdb.janus.AtlasJanusGraphDatabase</graphdb.backend.impl>
+                <graphGroup>org.apache.atlas</graphGroup>
+                <skipDocs>false</skipDocs>
+                <tests.solr.embedded>true</tests.solr.embedded>
             </properties>
         </profile>
 
@@ -632,14 +632,13 @@
                 </property>
             </activation>
             <properties>
-                <!-- Define graph dependency type/version -->
-                <graphGroup>org.apache.atlas</graphGroup>
-                <graphArtifact>atlas-graphdb-janus</graphArtifact>
-                <skipDocs>false</skipDocs>
-                <graphdb.backend.impl>org.apache.atlas.repository.graphdb.janus.AtlasJanusGraphDatabase</graphdb.backend.impl>
-                <graph.index.backend>solr</graph.index.backend>
-                <tests.solr.embedded>true</tests.solr.embedded>
                 <distro.exclude.packages>WEB-INF/lib/je-*.jar,WEB-INF/lib/solr-test-framework-*.jar, WEB-INF/lib/jts-*.jar,WEB-INF/lib/logback-*.jar,WEB-INF/lib/dom4j-*.jar,WEB-INF/lib/ant-*.jar</distro.exclude.packages>
+                <graph.index.backend>solr</graph.index.backend>
+                <graphArtifact>atlas-graphdb-janus</graphArtifact>
+                <graphdb.backend.impl>org.apache.atlas.repository.graphdb.janus.AtlasJanusGraphDatabase</graphdb.backend.impl>
+                <graphGroup>org.apache.atlas</graphGroup>
+                <skipDocs>false</skipDocs>
+                <tests.solr.embedded>true</tests.solr.embedded>
             </properties>
         </profile>
 
@@ -654,131 +653,101 @@
     </profiles>
 
     <properties>
-        <!-- platform encoding override -->
-        <skipTests>false</skipTests>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <node-for-v2.version>v12.16.0</node-for-v2.version>
-        <npm-for-v2.version>6.13.7</npm-for-v2.version>
-        <slf4j.version>1.7.21</slf4j.version>
-        <jetty.version>9.4.31.v20200723</jetty.version>
-        <jetty.jsp.version>9.2.30.v20200428</jetty.jsp.version>
-        <jersey.version>1.19</jersey.version>
-        <jsr.version>1.1</jsr.version>
-
-        <janus.version>0.5.1</janus.version>
-        <tinkerpop.version>3.4.6</tinkerpop.version>
-        <lucene-solr.version>7.7.2</lucene-solr.version>
-        <solr-test-framework.version>7.7.2</solr-test-framework.version>
-        <junit.version>4.13</junit.version>
-
-        <hadoop.version>3.1.1</hadoop.version>
-        <hbase.version>2.0.2</hbase.version>
-        <solr.version>7.7.2</solr.version>
-        <hive.version>3.1.0</hive.version>
-        <kafka.version>2.0.0</kafka.version>
-        <kafka.scala.binary.version>2.11</kafka.scala.binary.version>
-        <calcite.version>1.16.0</calcite.version>
-        <zookeeper.version>3.4.6</zookeeper.version>
-        <falcon.version>0.8</falcon.version>
-        <sqoop.version>1.4.6.2.3.99.0-195</sqoop.version>
-        <storm.version>1.2.0</storm.version>
-        <curator.version>4.0.1</curator.version>
-        <elasticsearch.version>5.6.4</elasticsearch.version>
-
-        <json.version>3.2.11</json.version>
         <akka.version>2.3.7</akka.version>
-        <spray.version>1.3.1</spray.version>
-        <gson.version>2.5</gson.version>
-        <fastutil.version>6.5.16</fastutil.version>
-        <guice.version>4.1.0</guice.version>
-        <spring.version>4.3.29.RELEASE</spring.version>
-        <spring.security.version>4.2.17.RELEASE</spring.security.version>
-
-        <javax.servlet.version>3.1.0</javax.servlet.version>
-        <guava.version>25.1-jre</guava.version>
+        <antlr4.plugin.version>4.5</antlr4.plugin.version>
         <antlr4.version>4.7</antlr4.version>
-        <log4j.version>1.2.17</log4j.version>
-        <log4j2.version>2.11.0</log4j2.version>
-
-        <!-- Needed for hooks -->
         <aopalliance.version>1.0</aopalliance.version>
-        <jackson.version>2.10.5</jackson.version>
-        <jackson.databind.version>2.10.5</jackson.databind.version>
-
-        <!-- Apache commons -->
-        <commons-conf.version>1.10</commons-conf.version>
-        <commons-conf2.version>2.2</commons-conf2.version>
+        <aspectj.runtime.version>1.8.7</aspectj.runtime.version>
+        <atlas.surefire.options></atlas.surefire.options>
+        <calcite.version>1.16.0</calcite.version>
+        <checkstyle.failOnViolation>false</checkstyle.failOnViolation>
+        <codehaus.woodstox.stax2-api.version>3.1.4</codehaus.woodstox.stax2-api.version>
+        <commons-cli.version>1.4</commons-cli.version>
         <commons-collections.version>3.2.2</commons-collections.version>
         <commons-collections4.version>4.4</commons-collections4.version>
-        <commons-logging.version>1.1.3</commons-logging.version>
-        <commons-lang.version>2.6</commons-lang.version>
-        <commons-validator.version>1.6</commons-validator.version>
-        <commons-cli.version>1.4</commons-cli.version>
+        <commons-conf.version>1.10</commons-conf.version>
+        <commons-conf2.version>2.2</commons-conf2.version>
         <commons-el.version>1.0</commons-el.version>
         <commons-io.version>2.6</commons-io.version>
-        <!-- Apache commons -->
-
-        <!--Apache poi and Open csv-->
-        <opencsv.version>5.0</opencsv.version>
-        <poi.version>4.1.1</poi.version>
-        <poi-ooxml.version>4.1.1</poi-ooxml.version>
-
-        <javax-inject.version>1</javax-inject.version>
-        <jettison.version>1.3.7</jettison.version>
-        <paranamer.version>2.7</paranamer.version>
-        <zkclient.version>0.8</zkclient.version>
-        <enunciate-maven-plugin.version>2.11.1</enunciate-maven-plugin.version>
-        <antlr4.plugin.version>4.5</antlr4.plugin.version>
-        <maven-site-plugin.version>3.7</maven-site-plugin.version>
+        <commons-lang.version>2.6</commons-lang.version>
+        <commons-logging.version>1.1.3</commons-logging.version>
+        <commons-validator.version>1.6</commons-validator.version>
+        <curator.version>4.0.1</curator.version>
         <doxia.version>1.8</doxia.version>
         <dropwizard-metrics>3.2.2</dropwizard-metrics>
-        <!-- hadoop.hdfs-client.version should same as hadoop version -->
-        <hadoop.hdfs-client.version>${hadoop.version}</hadoop.hdfs-client.version>
-
-        <!-- Storm dependencies -->
-        <codehaus.woodstox.stax2-api.version>3.1.4</codehaus.woodstox.stax2-api.version>
-        <woodstox-core.version>5.0.3</woodstox-core.version>
-        <hppc.version>0.8.1</hppc.version>
-        <!-- Storm dependencies -->
-
-        <!-- keycloak dependencies -->
-        <keycloak.version>6.0.1</keycloak.version>
-        <!-- keycloak dependencies -->
-
-        <PermGen>64m</PermGen>
-        <MaxPermGen>512m</MaxPermGen>
-
-        <!-- skips checkstyle and find bugs -->
-        <skipCheck>false</skipCheck>
-        <checkstyle.failOnViolation>false</checkstyle.failOnViolation>
-        <skipUTs>false</skipUTs>
-        <skipITs>false</skipITs>
-        <skipDocs>true</skipDocs>
-        <skipSite>true</skipSite>
-        <skipEnunciate>false</skipEnunciate>
-        <projectBaseDir>${project.basedir}</projectBaseDir>
-        <jetty-maven-plugin.stopWait>10</jetty-maven-plugin.stopWait>
-
-        <!-- The following graph.{storage|index}.backend definitions dictate the backends for test
-             resources in intg and each of the graph profiles. They do not affect packaging
-             which is handled by defaults and profiles set in atlas-distro POM -->
-        <graph.storage.backend>berkeleyje</graph.storage.backend>
-        <graph.index.backend>solr</graph.index.backend>
-
+        <elasticsearch.version>5.6.4</elasticsearch.version>
         <entity.repository.impl>org.apache.atlas.repository.audit.InMemoryEntityAuditRepository</entity.repository.impl>
-
-        <surefire.version>2.18.1</surefire.version>
-        <surefire.forkCount>2C</surefire.forkCount>
+        <enunciate-maven-plugin.version>2.11.1</enunciate-maven-plugin.version>
         <failsafe.version>2.18.1</failsafe.version>
-        <atlas.surefire.options></atlas.surefire.options>
-
-        <aspectj.runtime.version>1.8.7</aspectj.runtime.version>
+        <falcon.version>0.8</falcon.version>
+        <fastutil.version>6.5.16</fastutil.version>
+        <graph.index.backend>solr</graph.index.backend>
+        <graph.storage.backend>berkeleyje</graph.storage.backend>
+        <gson.version>2.5</gson.version>
+        <guava.version>25.1-jre</guava.version>
+        <guice.version>4.1.0</guice.version>
+        <hadoop.hdfs-client.version>${hadoop.version}</hadoop.hdfs-client.version>
+        <hadoop.version>3.1.1</hadoop.version>
+        <hbase.version>2.0.2</hbase.version>
+        <hive.version>3.1.0</hive.version>
+        <hppc.version>0.8.1</hppc.version>
+        <jackson.databind.version>2.10.5</jackson.databind.version>
+        <jackson.version>2.10.5</jackson.version>
+        <janus.version>0.5.1</janus.version>
+        <javax-inject.version>1</javax-inject.version>
+        <javax.servlet.version>3.1.0</javax.servlet.version>
+        <jersey-spring.version>1.19.4</jersey-spring.version>
+        <jersey.version>1.19</jersey.version>
+        <jettison.version>1.3.7</jettison.version>
+        <jetty-maven-plugin.stopWait>10</jetty-maven-plugin.stopWait>
+        <jetty.jsp.version>9.2.30.v20200428</jetty.jsp.version>
+        <jetty.version>9.4.31.v20200723</jetty.version>
+        <joda-time.version>2.10.6</joda-time.version>
+        <json.version>3.2.11</json.version>
+        <jsr.version>1.1</jsr.version>
+        <junit.version>4.13</junit.version>
+        <kafka.scala.binary.version>2.11</kafka.scala.binary.version>
+        <kafka.version>2.0.0</kafka.version>
+        <keycloak.version>6.0.1</keycloak.version>
+        <log4j.version>1.2.17</log4j.version>
+        <log4j2.version>2.11.0</log4j2.version>
+        <lucene-solr.version>7.7.2</lucene-solr.version>
+        <maven-site-plugin.version>3.7</maven-site-plugin.version>
+        <MaxPermGen>512m</MaxPermGen>
+        <node-for-v2.version>v12.16.0</node-for-v2.version>
+        <npm-for-v2.version>6.13.7</npm-for-v2.version>
+        <opencsv.version>5.0</opencsv.version>
+        <paranamer.version>2.7</paranamer.version>
+        <PermGen>64m</PermGen>
+        <poi-ooxml.version>4.1.1</poi-ooxml.version>
+        <poi.version>4.1.1</poi.version>
         <project.build.dashboardv2.gruntBuild>build-minify</project.build.dashboardv2.gruntBuild>
         <project.build.dashboardv3.gruntBuild>build-minify</project.build.dashboardv3.gruntBuild>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <projectBaseDir>${project.basedir}</projectBaseDir>
+        <skipCheck>false</skipCheck>
+        <skipDocs>true</skipDocs>
+        <skipEnunciate>false</skipEnunciate>
+        <skipITs>false</skipITs>
+        <skipSite>true</skipSite>
+        <skipTests>false</skipTests>
+        <skipUTs>false</skipUTs>
+        <slf4j.version>1.7.21</slf4j.version>
+        <solr-test-framework.version>7.7.2</solr-test-framework.version>
+        <solr.version>7.7.2</solr.version>
+        <spray.version>1.3.1</spray.version>
+        <spring.security.version>4.2.17.RELEASE</spring.security.version>
+        <spring.version>4.3.29.RELEASE</spring.version>
+        <sqoop.version>1.4.6.2.3.99.0-195</sqoop.version>
+        <storm.version>1.2.0</storm.version>
+        <surefire.forkCount>2C</surefire.forkCount>
+        <surefire.version>2.18.1</surefire.version>
         <testng.version>6.9.4</testng.version>
-        <joda-time.version>2.10.6</joda-time.version>
-        <jersey-spring.version>1.19.4</jersey-spring.version>
+        <tinkerpop.version>3.4.6</tinkerpop.version>
+        <woodstox-core.version>5.0.3</woodstox-core.version>
+        <zkclient.version>0.8</zkclient.version>
+        <zookeeper.version>3.4.6</zookeeper.version>
     </properties>
 
     <modules>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 5a8cfe6..fe5dc0b 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -32,9 +32,9 @@
     <packaging>war</packaging>
 
     <properties>
-        <projectBaseDir>${project.basedir}/..</projectBaseDir>
         <debug.jetty.daemon>true</debug.jetty.daemon>
         <log4j.configuration.url>file:///${project.build.directory}/../../distro/src/conf/atlas-log4j.xml</log4j.configuration.url>
+        <projectBaseDir>${project.basedir}/..</projectBaseDir>
     </properties>
 
     <profiles>