Repository: atlas Updated Branches: refs/heads/master 549310e3f -> c5da0fa1e
ATLAS-2253: Remove shading of janus graph-provider module Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/c5da0fa1 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/c5da0fa1 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/c5da0fa1 Branch: refs/heads/master Commit: c5da0fa1efcfc46775ff7d238154ae71bf05a974 Parents: 549310e Author: Sarath Subramanian <ssubraman...@hortonworks.com> Authored: Wed Nov 8 17:28:20 2017 -0800 Committer: Sarath Subramanian <ssubraman...@hortonworks.com> Committed: Wed Nov 8 17:28:20 2017 -0800 ---------------------------------------------------------------------- graphdb/janus/pom.xml | 44 ++------------------------------------------ graphdb/titan0/pom.xml | 6 ++++++ graphdb/titan1/pom.xml | 6 ++++++ pom.xml | 6 ------ 4 files changed, 14 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/c5da0fa1/graphdb/janus/pom.xml ---------------------------------------------------------------------- diff --git a/graphdb/janus/pom.xml b/graphdb/janus/pom.xml index e8a0a61..ad96db3 100644 --- a/graphdb/janus/pom.xml +++ b/graphdb/janus/pom.xml @@ -121,10 +121,11 @@ <version>${janus.version}</version> </dependency> + <!-- JanusGraph 0.1.1 is dependent on solr-solrj 5.2.1 --> <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-solrj</artifactId> - <version>6.1.0</version> + <version>5.2.1</version> </dependency> <dependency> @@ -193,47 +194,6 @@ </configuration> </plugin> - <!-- - Create 'uber' jar that contains all of the dependencies (except those whose scope is provided) - janus and its dependencies are included. The other dependencies are bundled in the war file. - --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>2.4.3</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <shadedArtifactAttached>false</shadedArtifactAttached> - <artifactSet> - <excludes> - <!-- these are bundled with Atlas --> - <exclude>org.slf4j:*</exclude> - </excludes> - </artifactSet> - <transformers> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> - </transformers> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> - </excludes> - </filter> - </filters> - </configuration> - </execution> - </executions> - </plugin> - </plugins> </build> http://git-wip-us.apache.org/repos/asf/atlas/blob/c5da0fa1/graphdb/titan0/pom.xml ---------------------------------------------------------------------- diff --git a/graphdb/titan0/pom.xml b/graphdb/titan0/pom.xml index d1674a9..2eec260 100644 --- a/graphdb/titan0/pom.xml +++ b/graphdb/titan0/pom.xml @@ -187,6 +187,12 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-solrj</artifactId> + <version>${solr.version}</version> + </dependency> + </dependencies> <build> http://git-wip-us.apache.org/repos/asf/atlas/blob/c5da0fa1/graphdb/titan1/pom.xml ---------------------------------------------------------------------- diff --git a/graphdb/titan1/pom.xml b/graphdb/titan1/pom.xml index 74596bd..c729caa 100644 --- a/graphdb/titan1/pom.xml +++ b/graphdb/titan1/pom.xml @@ -144,6 +144,12 @@ </dependency> <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-solrj</artifactId> + <version>${solr.version}</version> + </dependency> + + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/atlas/blob/c5da0fa1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5a6add6..bacec7f 100644 --- a/pom.xml +++ b/pom.xml @@ -1253,12 +1253,6 @@ </dependency> <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-solrj</artifactId> - <version>${solr.version}</version> - </dependency> - - <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> <version>${javax.servlet.version}</version>
