Skip to content

A
atlas
Commit 3205ca4a by Sarath Subramanian
Options

ATLAS-2287: Include lucene libraries when building atlas distribution with Janus profile

parent 0ddc022f
Showing with 11 additions and 53 deletions
distro/pom.xml
......@@ -47,6 +47,7 @@ atlas.graph.index.search.solr.mode=cloud
atlas.graph.index.search.solr.zookeeper-url=
atlas.graph.index.search.solr.zookeeper-connect-timeout=60000
atlas.graph.index.search.solr.zookeeper-session-timeout=60000
atlas.graph.index.search.solr.wait-searcher=true
#Solr http mode properties
#atlas.graph.index.search.solr.mode=http
......@@ -170,6 +171,7 @@ atlas.graph.index.search.solr.mode=cloud
atlas.graph.index.search.solr.zookeeper-url=localhost:2181
atlas.graph.index.search.solr.zookeeper-connect-timeout=60000
atlas.graph.index.search.solr.zookeeper-session-timeout=60000
atlas.graph.index.search.solr.wait-searcher=true
#Solr http mode properties
#atlas.graph.index.search.solr.mode=http
......
graphdb/janus/src/test/resources/atlas-application.properties
......@@ -50,7 +50,7 @@ atlas.graph.index.search.elasticsearch.create.sleep=2000
# Solr cloud mode properties
atlas.graph.index.search.solr.mode=cloud
atlas.graph.index.search.solr.zookeeper-url=${solr.zk.address}
atlas.graph.index.search.solr.embedded=${solr.embedded}
atlas.graph.index.search.solr.embedded=${tests.solr.embedded}
######### Hive Lineage Configs #########
# This models reflects the base super types for Data and Process
......
intg/src/test/resources/atlas-application.properties
......@@ -72,7 +72,7 @@ atlas.graph.index.search.elasticsearch.create.sleep=2000
# Solr cloud mode properties
atlas.graph.index.search.solr.mode=cloud
atlas.graph.index.search.solr.zookeeper-url=${solr.zk.address}
atlas.graph.index.search.solr.embedded=${solr.embedded}
atlas.graph.index.search.solr.embedded=${tests.solr.embedded}
atlas.graph.index.search.max-result-set-size=150
######### Hive Lineage Configs #########
......
pom.xml
......@@ -634,7 +634,6 @@
The settings for GRAPH-PROVIDER have the following effects:
* If GRAPH-PROVIDER is not specified, the graph-provider-default profile is activated.
* If GRAPH-PROVIDER is set to titan0, the graph-provider-titan0 profile is activated.
* If GRAPH-PROVIDER is set to titan1, the graph-provider-titan1 profile is activated.
* If GRAPH-PROVIDER is set to anything else, the build will fail.
Do not activate the graph-provider selection profiles using -P.
-->
......@@ -654,7 +653,8 @@
<skipDocs>false</skipDocs>
<graphdb.backend.impl>org.apache.atlas.repository.graphdb.janus.AtlasJanusGraphDatabase</graphdb.backend.impl>
<graph.index.backend>solr</graph.index.backend>
<solr.embedded>true</solr.embedded>
<tests.solr.embedded>true</tests.solr.embedded>
<distro.exclude.packages>WEB-INF/lib/je-*.jar,WEB-INF/lib/elasticsearch-*.jar</distro.exclude.packages>
</properties>
</profile>
......@@ -674,27 +674,8 @@
<skipDocs>false</skipDocs>
<graphdb.backend.impl>org.apache.atlas.repository.graphdb.titan0.Titan0GraphDatabase</graphdb.backend.impl>
<graph.index.backend>elasticsearch</graph.index.backend>
<solr.embedded>false</solr.embedded>
</properties>
</profile>
<profile>
<!-- Explicitly activate by setting -DGRAPH-PROVIDER=titan1 -->
<id>graph-provider-titan1</id>
<activation>
<property>
<name>GRAPH-PROVIDER</name>
<value>titan1</value>
</property>
</activation>
<properties>
<!-- Define graph dependency type/version -->
<graphGroup>org.apache.atlas</graphGroup>
<graphArtifact>atlas-graphdb-titan1</graphArtifact>
<skipDocs>false</skipDocs>
<graphdb.backend.impl>org.apache.atlas.repository.graphdb.titan1.Titan1GraphDatabase</graphdb.backend.impl>
<graph.index.backend>elasticsearch</graph.index.backend>
<solr.embedded>false</solr.embedded>
<tests.solr.embedded>false</tests.solr.embedded>
<distro.exclude.packages>WEB-INF/lib/titan-*.jar,WEB-INF/lib/je-*.jar,WEB-INF/lib/elasticsearch-*.jar,WEB-INF/lib/lucene-*.jar</distro.exclude.packages>
</properties>
</profile>
......@@ -714,7 +695,8 @@
<skipDocs>false</skipDocs>
<graphdb.backend.impl>org.apache.atlas.repository.graphdb.janus.AtlasJanusGraphDatabase</graphdb.backend.impl>
<graph.index.backend>solr</graph.index.backend>
<solr.embedded>true</solr.embedded>
<tests.solr.embedded>true</tests.solr.embedded>
<distro.exclude.packages>WEB-INF/lib/je-*.jar,WEB-INF/lib/elasticsearch-*.jar</distro.exclude.packages>
</properties>
</profile>
......
repository/pom.xml
......@@ -223,30 +223,6 @@
</dependencies>
</profile>
<profile>
<id>graph-provider-titan1</id>
<activation>
<property>
<name>GRAPH-PROVIDER</name>
<value>titan1</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-common</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.lucene</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</profile>
</profiles>
<build>
......
webapp/pom.xml
......@@ -35,18 +35,16 @@
<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>
<packages.to.exclude />
</properties>
<profiles>
<profile>
<!-- default profile is for external HBase and Solr - hence not packaging those jars -->
<id>dist</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<properties>
<packages.to.exclude>WEB-INF/lib/titan-*.jar,WEB-INF/lib/je-*.jar,WEB-INF/lib/elasticsearch-*.jar,WEB-INF/lib/lucene-*.jar</packages.to.exclude>
<packages.to.exclude>${distro.exclude.packages}</packages.to.exclude>
</properties>
</profile>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment