Updated Branches: refs/heads/trunk d17c03019 -> 9b3036074
FLUME-1515: Fix flume-1.3.0 branch test failures on ASF Jenkins (Hari Shreedharan via Brock Noland) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/9b303607 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/9b303607 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/9b303607 Branch: refs/heads/trunk Commit: 9b3036074050271e53cccc3625b6b62545ed28b5 Parents: d17c030 Author: Brock Noland <[email protected]> Authored: Wed Oct 17 10:52:26 2012 -0500 Committer: Brock Noland <[email protected]> Committed: Wed Oct 17 10:52:26 2012 -0500 ---------------------------------------------------------------------- flume-ng-clients/flume-ng-log4jappender/pom.xml | 8 +++++++- flume-ng-sinks/flume-ng-hbase-sink/pom.xml | 7 ++++++- flume-ng-tests/pom.xml | 4 ++++ 3 files changed, 17 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/9b303607/flume-ng-clients/flume-ng-log4jappender/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-clients/flume-ng-log4jappender/pom.xml b/flume-ng-clients/flume-ng-log4jappender/pom.xml index 0456671..b5f7e39 100644 --- a/flume-ng-clients/flume-ng-log4jappender/pom.xml +++ b/flume-ng-clients/flume-ng-log4jappender/pom.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> @@ -63,6 +63,12 @@ limitations under the License. <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.flume</groupId> + <artifactId>flume-ng-configuration</artifactId> + <scope>test</scope> + </dependency> + </dependencies> http://git-wip-us.apache.org/repos/asf/flume/blob/9b303607/flume-ng-sinks/flume-ng-hbase-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-ng-hbase-sink/pom.xml b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml index 1507ecd..25f3be7 100644 --- a/flume-ng-sinks/flume-ng-hbase-sink/pom.xml +++ b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml @@ -42,6 +42,11 @@ </dependency> <dependency> + <groupId>org.apache.flume</groupId> + <artifactId>flume-ng-configuration</artifactId> + </dependency> + + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> @@ -96,7 +101,7 @@ <artifactId>commons-io</artifactId> <scope>test</scope> </dependency> - + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> http://git-wip-us.apache.org/repos/asf/flume/blob/9b303607/flume-ng-tests/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-tests/pom.xml b/flume-ng-tests/pom.xml index 01f84a2..f839053 100644 --- a/flume-ng-tests/pom.xml +++ b/flume-ng-tests/pom.xml @@ -37,6 +37,10 @@ <artifactId>flume-ng-core</artifactId> </dependency> <dependency> + <groupId>org.apache.flume</groupId> + <artifactId>flume-ng-configuration</artifactId> + </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>test</scope>
