You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fluo.apache.org by kt...@apache.org on 2016/07/18 19:09:32 UTC
[1/2] incubator-fluo git commit: fixed #435 analyze dependencies and
removed unwanted dependencies
Repository: incubator-fluo
Updated Branches:
refs/heads/master d70b8606f -> 8944203df
fixed #435 analyze dependencies and removed unwanted dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/22a49113
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/22a49113
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/22a49113
Branch: refs/heads/master
Commit: 22a49113bc972285398b983bc45ab9dc67a205a7
Parents: 377571f
Author: garvit244 <ga...@gmail.com>
Authored: Fri Jul 8 21:09:19 2016 +0530
Committer: garvit244 <ga...@gmail.com>
Committed: Tue Jul 19 00:19:26 2016 +0530
----------------------------------------------------------------------
modules/accumulo/pom.xml | 5 -----
modules/api/pom.xml | 14 -------------
modules/cluster/pom.xml | 41 +++------------------------------------
modules/core/pom.xml | 14 +++++--------
modules/distribution/pom.xml | 8 --------
modules/integration/pom.xml | 19 +++++++++---------
modules/mapreduce/pom.xml | 30 ++++++++++++++++++++--------
modules/mini/pom.xml | 8 --------
pom.xml | 23 ++++++++++++++++++++++
9 files changed, 63 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/22a49113/modules/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/modules/accumulo/pom.xml b/modules/accumulo/pom.xml
index 55544d2..9351bc9 100644
--- a/modules/accumulo/pom.xml
+++ b/modules/accumulo/pom.xml
@@ -62,10 +62,5 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/22a49113/modules/api/pom.xml
----------------------------------------------------------------------
diff --git a/modules/api/pom.xml b/modules/api/pom.xml
index 61c8e2a..83078d7 100644
--- a/modules/api/pom.xml
+++ b/modules/api/pom.xml
@@ -33,10 +33,6 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
@@ -45,20 +41,10 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/22a49113/modules/cluster/pom.xml
----------------------------------------------------------------------
diff --git a/modules/cluster/pom.xml b/modules/cluster/pom.xml
index 07e433f..cf2a75b 100644
--- a/modules/cluster/pom.xml
+++ b/modules/cluster/pom.xml
@@ -51,12 +51,9 @@
<version>4.0</version>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
@@ -67,10 +64,6 @@
<artifactId>curator-framework</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-recipes</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.fluo</groupId>
<artifactId>fluo-accumulo</artifactId>
</dependency>
@@ -83,10 +76,6 @@
<artifactId>fluo-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.fluo</groupId>
- <artifactId>fluo-mini</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
</dependency>
@@ -118,29 +107,5 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.fluo</groupId>
- <artifactId>fluo-integration</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
- <profiles>
- <profile>
- <id>mini-accumulo</id>
- <activation>
- <property>
- <name>!skipTests</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/22a49113/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 51d02ec..15d1b72 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -42,6 +42,11 @@
<artifactId>metrics-graphite</artifactId>
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
@@ -78,10 +83,6 @@
<artifactId>zookeeper</artifactId>
</dependency>
<dependency>
- <groupId>org.hdrhistogram</groupId>
- <artifactId>HdrHistogram</artifactId>
- </dependency>
- <dependency>
<groupId>org.mpierce.metrics.reservoir</groupId>
<artifactId>hdrhistogram-metrics-reservoir</artifactId>
</dependency>
@@ -94,10 +95,5 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/22a49113/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 7d4ea20..0727749 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -52,14 +52,6 @@
<groupId>org.apache.fluo</groupId>
<artifactId>fluo-mini</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
</dependencies>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/22a49113/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index e989afd..61cffa9 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -26,8 +26,8 @@
<description>This module contains Fluo integration tests</description>
<dependencies>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -41,6 +41,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
<scope>test</scope>
@@ -86,13 +92,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/22a49113/modules/mapreduce/pom.xml
----------------------------------------------------------------------
diff --git a/modules/mapreduce/pom.xml b/modules/mapreduce/pom.xml
index 2bd2b35..0eed66b 100644
--- a/modules/mapreduce/pom.xml
+++ b/modules/mapreduce/pom.xml
@@ -26,14 +26,6 @@
<description>This module provides utility code for MapReduce jobs that read from or write to a Fluo table.</description>
<dependencies>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
@@ -70,6 +62,28 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.10</version>
+ <executions>
+ <execution>
+ <id>analyze</id>
+ <goals>
+ <goal>analyze-only</goal>
+ </goals>
+ <configuration>
+ <ignoredDependencies combine.children="append">
+ <ignoredDependency>org.apache.accumulo:accumulo-minicluster:jar:${accumulo.version}</ignoredDependency>
+ </ignoredDependencies>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
<profile>
<id>mini-accumulo</id>
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/22a49113/modules/mini/pom.xml
----------------------------------------------------------------------
diff --git a/modules/mini/pom.xml b/modules/mini/pom.xml
index 1d05bef..b554f35 100644
--- a/modules/mini/pom.xml
+++ b/modules/mini/pom.xml
@@ -31,10 +31,6 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
@@ -51,10 +47,6 @@
</dependency>
<dependency>
<groupId>org.apache.fluo</groupId>
- <artifactId>fluo-accumulo</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.fluo</groupId>
<artifactId>fluo-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/22a49113/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1f46eab..9c80bbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -330,6 +330,29 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.10</version>
+ <executions>
+ <execution>
+ <id>analyze</id>
+ <goals>
+ <goal>analyze-only</goal>
+ </goals>
+ <configuration>
+ <failOnWarning>true</failOnWarning>
+ <ignoredDependencies>
+ <ignoredDependency>org.apache.hadoop:hadoop-common:jar:2.6.3</ignoredDependency>
+ <ignoredDependency>org.apache.hadoop:hadoop-client:jar:2.6.3</ignoredDependency>
+ <ignoredDependency>org.apache.hadoop:hadoop-mapreduce-client-core:jar:2.6.3</ignoredDependency>
+ <ignoredDependency>org.apache.hadoop:hadoop-yarn-api:jar:2.6.3</ignoredDependency>
+ <ignoredDependency>org.apache.hadoop:hadoop-yarn-client:jar:2.6.3</ignoredDependency>
+ </ignoredDependencies>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<profiles>
[2/2] incubator-fluo git commit: Merge branch 'fixes435'
Posted by kt...@apache.org.
Merge branch 'fixes435'
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/8944203d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/8944203d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/8944203d
Branch: refs/heads/master
Commit: 8944203df03c3ec35edb1784a47f3b49091a051a
Parents: d70b860 22a4911
Author: Keith Turner <kt...@apache.org>
Authored: Mon Jul 18 15:05:24 2016 -0400
Committer: Keith Turner <kt...@apache.org>
Committed: Mon Jul 18 15:05:24 2016 -0400
----------------------------------------------------------------------
modules/accumulo/pom.xml | 5 -----
modules/api/pom.xml | 14 -------------
modules/cluster/pom.xml | 41 +++------------------------------------
modules/core/pom.xml | 14 +++++--------
modules/distribution/pom.xml | 8 --------
modules/integration/pom.xml | 19 +++++++++---------
modules/mapreduce/pom.xml | 30 ++++++++++++++++++++--------
modules/mini/pom.xml | 8 --------
pom.xml | 23 ++++++++++++++++++++++
9 files changed, 63 insertions(+), 99 deletions(-)
----------------------------------------------------------------------