Commit efe0935e by Nigel Jones Committed by Graham Wallis

ATLAS-2571: duplicate declarations

parent 145ba989
...@@ -364,12 +364,6 @@ ...@@ -364,12 +364,6 @@
</resources> </resources>
</configuration> </configuration>
</execution> </execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution> <execution>
<id>copy-solr-resources</id> <id>copy-solr-resources</id>
<phase>validate</phase> <phase>validate</phase>
......
...@@ -502,12 +502,6 @@ ...@@ -502,12 +502,6 @@
</resources> </resources>
</configuration> </configuration>
</execution> </execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution> <execution>
<id>copy-solr-resources</id> <id>copy-solr-resources</id>
<phase>validate</phase> <phase>validate</phase>
...@@ -525,6 +519,7 @@ ...@@ -525,6 +519,7 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
...@@ -479,11 +479,6 @@ ...@@ -479,11 +479,6 @@
</resources> </resources>
</configuration> </configuration>
</execution> </execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution> <execution>
<id>copy-solr-resources</id> <id>copy-solr-resources</id>
<phase>validate</phase> <phase>validate</phase>
...@@ -501,6 +496,7 @@ ...@@ -501,6 +496,7 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
...@@ -427,12 +427,6 @@ ...@@ -427,12 +427,6 @@
</resources> </resources>
</configuration> </configuration>
</execution> </execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution> <execution>
<id>copy-solr-resources</id> <id>copy-solr-resources</id>
<phase>validate</phase> <phase>validate</phase>
...@@ -450,6 +444,7 @@ ...@@ -450,6 +444,7 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
...@@ -530,12 +530,6 @@ ...@@ -530,12 +530,6 @@
</resources> </resources>
</configuration> </configuration>
</execution> </execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution> <execution>
<id>copy-solr-resources</id> <id>copy-solr-resources</id>
<phase>validate</phase> <phase>validate</phase>
...@@ -553,6 +547,7 @@ ...@@ -553,6 +547,7 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
...@@ -117,16 +117,6 @@ ...@@ -117,16 +117,6 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
</dependency>
<dependency>
<groupId>com.thinkaurelius.titan</groupId> <groupId>com.thinkaurelius.titan</groupId>
<artifactId>titan-es</artifactId> <artifactId>titan-es</artifactId>
<version>${titan.version}</version> <version>${titan.version}</version>
......
...@@ -35,10 +35,6 @@ ...@@ -35,10 +35,6 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<url>http://atlas.apache.org</url> <url>http://atlas.apache.org</url>
<prerequisites>
<maven>3.0.4</maven>
</prerequisites>
<licenses> <licenses>
<license> <license>
<name>The Apache Software License, Version 2.0</name> <name>The Apache Software License, Version 2.0</name>
......
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