Skip to content

A
atlas
Commit c5da0fa1 by Sarath Subramanian
Options

ATLAS-2253: Remove shading of janus graph-provider module

parent 549310e3
Showing with 14 additions and 48 deletions
graphdb/janus/pom.xml
...@@ -121,10 +121,11 @@ ...@@ -121,10 +121,11 @@
<version>${janus.version}</version> <version>${janus.version}</version>
</dependency> </dependency>
<!-- JanusGraph 0.1.1 is dependent on solr-solrj 5.2.1 -->
<dependency> <dependency>
<groupId>org.apache.solr</groupId> <groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId> <artifactId>solr-solrj</artifactId>
<version>6.1.0</version> <version>5.2.1</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -193,47 +194,6 @@ ...@@ -193,47 +194,6 @@
</configuration> </configuration>
</plugin> </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> </plugins>
</build> </build>
......
graphdb/titan0/pom.xml
...@@ -187,6 +187,12 @@ ...@@ -187,6 +187,12 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<version>${solr.version}</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
graphdb/titan1/pom.xml
...@@ -144,6 +144,12 @@ ...@@ -144,6 +144,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<version>${solr.version}</version>
</dependency>
<dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>
<artifactId>testng</artifactId> <artifactId>testng</artifactId>
</dependency> </dependency>
......
pom.xml
...@@ -1253,12 +1253,6 @@ ...@@ -1253,12 +1253,6 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<version>${solr.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet.version}</version> <version>${javax.servlet.version}</version>
......
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