diff --git a/pom.xml b/pom.xml
index f4686bf..c60a53b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -537,6 +537,93 @@
</developer>
</developers>
+ <profiles>
+
+ <!-- Turning on this profile affects only tests and does not affect packaging -->
+ <profile>
+ <id>distributed</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <graph.storage.backend>hbase</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>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>dist</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <skipDocs>false</skipDocs>
+ </properties>
+ </profile>
+
+ <!-- Graph provider selection profiles
+ The following profiles are used to select the graph provider.
+ These profiles are mutually exclusive and should be activated by setting the system
+ property GRAPH-PROVIDER.
+ This can be optionally specified when invoking mvn:
+ e.g. mvn clean install -DGRAPH-PROVIDER=janus
+ The settings for GRAPH-PROVIDER have the following effects:
+ * If GRAPH-PROVIDER is not specified, the graph-provider-default profile (janus) is activated.
+ * If GRAPH-PROVIDER is set to anything else, the build will fail.
+ Do not activate the graph-provider selection profiles using -P.
+ -->
+
+ <profile>
+ <!-- Default profile, i.e. GRAPH-PROVIDER not set -->
+ <id>graph-provider-default</id>
+ <activation>
+ <property>
+ <name>!GRAPH-PROVIDER</name>
+ </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</distro.exclude.packages>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>graph-provider-janus</id>
+ <activation>
+ <property>
+ <name>GRAPH-PROVIDER</name>
+ <value>janus</value>
+ </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</distro.exclude.packages>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>skipMinify</id>
+ <properties>
+ <project.build.dashboardv2.gruntBuild>build</project.build.dashboardv2.gruntBuild>
+ </properties>
+ </profile>
+
+ </profiles>
+
<properties>
<!-- platform encoding override -->
<skipTests>false</skipTests>
@@ -576,27 +663,36 @@
<!-- Needed for hooks -->
<aopalliance.version>1.0</aopalliance.version>
- <jackson.version>2.9.5</jackson.version>
+ <jackson.version>2.9.6</jackson.version>
+
+ <!-- Apache commons -->
<commons-conf.version>1.10</commons-conf.version>
<commons-conf2.version>2.2</commons-conf2.version>
-
<commons-collections.version>3.2.2</commons-collections.version>
<commons-logging.version>1.1.3</commons-logging.version>
<commons-lang.version>2.6</commons-lang.version>
- <commons-validator.version>1.4.0</commons-validator.version>
+ <commons-validator.version>1.6</commons-validator.version>
+ <commons-cli.version>1.4</commons-cli.version>
+ <commons-el.version>1.0</commons-el.version>
+ <commons-io.version>2.6</commons-io.version>
+ <!-- Apache commons -->
+
<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.10.1</enunciate-maven-plugin.version>
<antlr4.plugin.version>4.5</antlr4.plugin.version>
- <maven-site-plugin.version>3.7</maven-site-plugin.version>
- <doxia.version>1.8</doxia.version>
+ <maven-site-plugin.version>3.7</maven-site-plugin.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>2.8.1</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>
+ <!-- Storm dependencies -->
<PermGen>64m</PermGen>
<MaxPermGen>512m</MaxPermGen>
@@ -628,95 +724,10 @@
<aspectj.runtime.version>1.8.7</aspectj.runtime.version>
<project.build.dashboardv2.gruntBuild>build-minify</project.build.dashboardv2.gruntBuild>
<testng.version>6.9.4</testng.version>
+ <joda-time.version>2.10</joda-time.version>
+ <jersey-spring.version>1.19.4</jersey-spring.version>
</properties>
- <profiles>
-
- <!-- Turning on this profile affects only tests and does not affect packaging -->
- <profile>
- <id>distributed</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <graph.storage.backend>hbase</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>
- </properties>
- </profile>
-
- <profile>
- <id>dist</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <skipDocs>false</skipDocs>
- </properties>
- </profile>
-
- <!-- Graph provider selection profiles
- The following profiles are used to select the graph provider.
- These profiles are mutually exclusive and should be activated by setting the system
- property GRAPH-PROVIDER.
- This can be optionally specified when invoking mvn:
- e.g. mvn clean install -DGRAPH-PROVIDER=janus
- The settings for GRAPH-PROVIDER have the following effects:
- * If GRAPH-PROVIDER is not specified, the graph-provider-default profile (janus) is activated.
- * If GRAPH-PROVIDER is set to anything else, the build will fail.
- Do not activate the graph-provider selection profiles using -P.
- -->
-
- <profile>
- <!-- Default profile, i.e. GRAPH-PROVIDER not set -->
- <id>graph-provider-default</id>
- <activation>
- <property>
- <name>!GRAPH-PROVIDER</name>
- </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</distro.exclude.packages>
- </properties>
- </profile>
-
- <profile>
- <id>graph-provider-janus</id>
- <activation>
- <property>
- <name>GRAPH-PROVIDER</name>
- <value>janus</value>
- </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</distro.exclude.packages>
- </properties>
- </profile>
-
- <profile>
- <id>skipMinify</id>
- <properties>
- <project.build.dashboardv2.gruntBuild>build</project.build.dashboardv2.gruntBuild>
- </properties>
- </profile>
-
- </profiles>
-
<modules>
<module>build-tools</module>
<module>test-tools</module>
@@ -1024,19 +1035,19 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.2</version>
+ <version>${commons-cli.version}</version>
</dependency>
<dependency>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
- <version>1.0</version>
+ <version>${commons-el.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>${commons-io.version}</version>
</dependency>
<dependency>
@@ -1063,7 +1074,7 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.5</version>
+ <version>${joda-time.version}</version>
</dependency>
<!-- Jersey -->
@@ -1085,6 +1096,35 @@
<version>${jersey.version}</version>
</dependency>
+ <!-- Jersey + Spring -->
+ <dependency>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-spring</artifactId>
+ <version>${jersey-spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index ab86a78..78aa81e 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -325,29 +325,6 @@
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-spring</artifactId>
- <version>1.8</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>