Repository: beam Updated Branches: refs/heads/master b82cd2446 -> b57ae2633
Use parent pom version of hadoop, move common deps into the hadoop parent pom Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/9c9ce7a3 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/9c9ce7a3 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/9c9ce7a3 Branch: refs/heads/master Commit: 9c9ce7a32812033e85f7c0b73260974d6ac56d5f Parents: b82cd24 Author: Ismaël MejÃa <[email protected]> Authored: Wed Apr 26 13:18:24 2017 +0200 Committer: Ismaël MejÃa <[email protected]> Committed: Thu Apr 27 08:53:29 2017 +0200 ---------------------------------------------------------------------- sdks/java/io/hadoop/input-format/pom.xml | 15 --------------- sdks/java/io/hadoop/jdk1.8-tests/pom.xml | 10 ---------- sdks/java/io/hadoop/pom.xml | 18 ++++++++++++++++++ 3 files changed, 18 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/9c9ce7a3/sdks/java/io/hadoop/input-format/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/hadoop/input-format/pom.xml b/sdks/java/io/hadoop/input-format/pom.xml index 9558ecd..e211541 100644 --- a/sdks/java/io/hadoop/input-format/pom.xml +++ b/sdks/java/io/hadoop/input-format/pom.xml @@ -28,8 +28,6 @@ <description>IO to read data from data sources which implement Hadoop Input Format.</description> <properties> - <log4j.core.version>2.6.2</log4j.core.version> - <hadoop.common.version>2.7.0</hadoop.common.version> <guava.version>19.0</guava.version> </properties> @@ -61,13 +59,11 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.common.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop.common.version}</version> <scope>provided</scope> </dependency> @@ -79,17 +75,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.beam</groupId> - <artifactId>beam-runners-direct-java</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>${log4j.core.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest-all</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/beam/blob/9c9ce7a3/sdks/java/io/hadoop/jdk1.8-tests/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/hadoop/jdk1.8-tests/pom.xml b/sdks/java/io/hadoop/jdk1.8-tests/pom.xml index 84b923a..cc5e49a 100644 --- a/sdks/java/io/hadoop/jdk1.8-tests/pom.xml +++ b/sdks/java/io/hadoop/jdk1.8-tests/pom.xml @@ -125,8 +125,6 @@ </profiles> <properties> - <log4j.core.version>2.6.2</log4j.core.version> - <hadoop.common.version>2.7.0</hadoop.common.version> <guava.version>19.0</guava.version> <transport.netty4.client.version>5.0.0</transport.netty4.client.version> <netty.transport.native.epoll.version>4.1.0.CR3</netty.transport.native.epoll.version> @@ -151,13 +149,11 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.common.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop.common.version}</version> <scope>provided</scope> </dependency> @@ -174,12 +170,6 @@ <classifier>tests</classifier> </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>2.6.2</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.elasticsearch.plugin</groupId> <artifactId>transport-netty4-client</artifactId> <version>${transport.netty4.client.version}</version> http://git-wip-us.apache.org/repos/asf/beam/blob/9c9ce7a3/sdks/java/io/hadoop/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/hadoop/pom.xml b/sdks/java/io/hadoop/pom.xml index 7cd801d..8576182 100644 --- a/sdks/java/io/hadoop/pom.xml +++ b/sdks/java/io/hadoop/pom.xml @@ -28,6 +28,10 @@ <name>Apache Beam :: SDKs :: Java :: IO :: Hadoop</name> <description>Parent for Beam SDK Hadoop IO which reads data from any source which implements Hadoop Input Format.</description> + <properties> + <log4j.core.version>2.6.2</log4j.core.version> + </properties> + <modules> <module>input-format</module> </modules> @@ -51,10 +55,24 @@ </dependency> <dependency> + <groupId>org.apache.beam</groupId> + <artifactId>beam-runners-direct-java</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4j.core.version}</version> + <scope>test</scope> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId>
