You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by gr...@apache.org on 2018/05/01 15:13:24 UTC
atlas git commit: ATLAS-2571: duplicate declarations
Repository: atlas
Updated Branches:
refs/heads/master 145ba9897 -> efe0935eb
ATLAS-2571: duplicate declarations
Signed-off-by: Graham Wallis <gr...@uk.ibm.com>
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/efe0935e
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/efe0935e
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/efe0935e
Branch: refs/heads/master
Commit: efe0935eb2affc2358f4298d20b7c3952cdba20c
Parents: 145ba98
Author: Nigel Jones <ni...@gmail.com>
Authored: Mon Apr 16 12:51:37 2018 +0100
Committer: Graham Wallis <gr...@uk.ibm.com>
Committed: Tue May 1 15:57:37 2018 +0100
----------------------------------------------------------------------
addons/falcon-bridge/pom.xml | 6 ------
addons/hbase-bridge/pom.xml | 7 +------
addons/hive-bridge/pom.xml | 6 +-----
addons/sqoop-bridge/pom.xml | 7 +------
addons/storm-bridge/pom.xml | 7 +------
graphdb/titan0/pom.xml | 10 ----------
pom.xml | 4 ----
7 files changed, 4 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/efe0935e/addons/falcon-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/falcon-bridge/pom.xml b/addons/falcon-bridge/pom.xml
index 40e91d4..53f6d36 100644
--- a/addons/falcon-bridge/pom.xml
+++ b/addons/falcon-bridge/pom.xml
@@ -364,12 +364,6 @@
</resources>
</configuration>
</execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
<execution>
<id>copy-solr-resources</id>
<phase>validate</phase>
http://git-wip-us.apache.org/repos/asf/atlas/blob/efe0935e/addons/hbase-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml
index 28d3e8b..eea6b65 100644
--- a/addons/hbase-bridge/pom.xml
+++ b/addons/hbase-bridge/pom.xml
@@ -502,12 +502,6 @@
</resources>
</configuration>
</execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
<execution>
<id>copy-solr-resources</id>
<phase>validate</phase>
@@ -525,6 +519,7 @@
</execution>
</executions>
</plugin>
+
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/atlas/blob/efe0935e/addons/hive-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml
index b3ebe8e..0d4ab2c 100755
--- a/addons/hive-bridge/pom.xml
+++ b/addons/hive-bridge/pom.xml
@@ -479,11 +479,6 @@
</resources>
</configuration>
</execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
<execution>
<id>copy-solr-resources</id>
<phase>validate</phase>
@@ -501,6 +496,7 @@
</execution>
</executions>
</plugin>
+
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/atlas/blob/efe0935e/addons/sqoop-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/sqoop-bridge/pom.xml b/addons/sqoop-bridge/pom.xml
index f44002a..24747a9 100644
--- a/addons/sqoop-bridge/pom.xml
+++ b/addons/sqoop-bridge/pom.xml
@@ -427,12 +427,6 @@
</resources>
</configuration>
</execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
<execution>
<id>copy-solr-resources</id>
<phase>validate</phase>
@@ -450,6 +444,7 @@
</execution>
</executions>
</plugin>
+
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/atlas/blob/efe0935e/addons/storm-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/storm-bridge/pom.xml b/addons/storm-bridge/pom.xml
index 484902c..c26446f 100644
--- a/addons/storm-bridge/pom.xml
+++ b/addons/storm-bridge/pom.xml
@@ -530,12 +530,6 @@
</resources>
</configuration>
</execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
<execution>
<id>copy-solr-resources</id>
<phase>validate</phase>
@@ -553,6 +547,7 @@
</execution>
</executions>
</plugin>
+
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/atlas/blob/efe0935e/graphdb/titan0/pom.xml
----------------------------------------------------------------------
diff --git a/graphdb/titan0/pom.xml b/graphdb/titan0/pom.xml
index 28d051b..dc84058 100644
--- a/graphdb/titan0/pom.xml
+++ b/graphdb/titan0/pom.xml
@@ -117,16 +117,6 @@
</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>
<artifactId>titan-es</artifactId>
<version>${titan.version}</version>
http://git-wip-us.apache.org/repos/asf/atlas/blob/efe0935e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 18572b7..aa675cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,10 +35,6 @@
<packaging>pom</packaging>
<url>http://atlas.apache.org</url>
- <prerequisites>
- <maven>3.0.4</maven>
- </prerequisites>
-
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>