Repository: incubator-beam Updated Branches: refs/heads/master cff57fd52 -> ab74eac34
Enable dependency-plugin at global level Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/dee44b34 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/dee44b34 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/dee44b34 Branch: refs/heads/master Commit: dee44b342b47b1a20c9cc39f653acae8de4c6250 Parents: cff57fd Author: Pei He <[email protected]> Authored: Tue Jun 21 15:25:06 2016 -0700 Committer: Dan Halperin <[email protected]> Committed: Fri Jun 24 14:57:00 2016 -0700 ---------------------------------------------------------------------- examples/java/pom.xml | 13 ---- examples/java8/pom.xml | 14 ---- pom.xml | 25 ++++--- runners/core-java/pom.xml | 13 ---- runners/direct-java/pom.xml | 13 ---- runners/flink/examples/pom.xml | 14 ++++ runners/flink/runner/pom.xml | 14 ++++ runners/google-cloud-dataflow-java/pom.xml | 13 ---- runners/spark/pom.xml | 89 ++++++++++++++++++++++++- sdks/java/core/pom.xml | 15 ----- sdks/java/io/google-cloud-platform/pom.xml | 22 +++++- sdks/java/io/hdfs/pom.xml | 29 ++++++++ sdks/java/io/kafka/pom.xml | 25 +++++++ sdks/java/java8tests/pom.xml | 13 ---- 14 files changed, 204 insertions(+), 108 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/dee44b34/examples/java/pom.xml ---------------------------------------------------------------------- diff --git a/examples/java/pom.xml b/examples/java/pom.xml index ba1e6e5..3b67797 100644 --- a/examples/java/pom.xml +++ b/examples/java/pom.xml @@ -54,19 +54,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <goals><goal>analyze-only</goal></goals> - <configuration> - <failOnWarning>true</failOnWarning> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/dee44b34/examples/java8/pom.xml ---------------------------------------------------------------------- diff --git a/examples/java8/pom.xml b/examples/java8/pom.xml index 82b1c46..ebc6f3d 100644 --- a/examples/java8/pom.xml +++ b/examples/java8/pom.xml @@ -66,20 +66,6 @@ </configuration> </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <goals><goal>analyze-only</goal></goals> - <configuration> - <failOnWarning>true</failOnWarning> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/dee44b34/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d933e8b..582ff62 100644 --- a/pom.xml +++ b/pom.xml @@ -863,16 +863,6 @@ </configuration> </plugin> - <!-- Ignore runtime-only dependencies in analysis --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> - <configuration> - <ignoreNonCompile>true</ignoreNonCompile> - </configuration> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> @@ -923,6 +913,21 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.10</version> + <executions> + <execution> + <goals><goal>analyze-only</goal></goals> + <configuration> + <!-- Ignore runtime-only dependencies in analysis --> + <ignoreNonCompile>true</ignoreNonCompile> + <failOnWarning>true</failOnWarning> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>1.3.1</version> <executions> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/dee44b34/runners/core-java/pom.xml ---------------------------------------------------------------------- diff --git a/runners/core-java/pom.xml b/runners/core-java/pom.xml index 98d80bb..3a91f7e 100644 --- a/runners/core-java/pom.xml +++ b/runners/core-java/pom.xml @@ -54,19 +54,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <goals><goal>analyze-only</goal></goals> - <configuration> - <failOnWarning>true</failOnWarning> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/dee44b34/runners/direct-java/pom.xml ---------------------------------------------------------------------- diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml index 3010757..13e8951 100644 --- a/runners/direct-java/pom.xml +++ b/runners/direct-java/pom.xml @@ -48,19 +48,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <goals><goal>analyze-only</goal></goals> - <configuration> - <failOnWarning>true</failOnWarning> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/dee44b34/runners/flink/examples/pom.xml ---------------------------------------------------------------------- diff --git a/runners/flink/examples/pom.xml b/runners/flink/examples/pom.xml index 1fba81c..b0ee2ed 100644 --- a/runners/flink/examples/pom.xml +++ b/runners/flink/examples/pom.xml @@ -96,6 +96,20 @@ <artifactId>maven-source-plugin</artifactId> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <goals><goal>analyze-only</goal></goals> + <configuration> + <!-- disable for now until dependencies are cleaned up --> + <failOnWarning>false</failOnWarning> + </configuration> + </execution> + </executions> + </plugin> + <!-- Checkstyle errors for now <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/dee44b34/runners/flink/runner/pom.xml ---------------------------------------------------------------------- diff --git a/runners/flink/runner/pom.xml b/runners/flink/runner/pom.xml index dd32063..1c522fc 100644 --- a/runners/flink/runner/pom.xml +++ b/runners/flink/runner/pom.xml @@ -152,6 +152,20 @@ <artifactId>maven-source-plugin</artifactId> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <goals><goal>analyze-only</goal></goals> + <configuration> + <!-- disable for now until dependencies are cleaned up --> + <failOnWarning>false</failOnWarning> + </configuration> + </execution> + </executions> + </plugin> + <!-- Checkstyle errors for now <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/dee44b34/runners/google-cloud-dataflow-java/pom.xml ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/pom.xml b/runners/google-cloud-dataflow-java/pom.xml index 5408462..38ffa49 100644 --- a/runners/google-cloud-dataflow-java/pom.xml +++ b/runners/google-cloud-dataflow-java/pom.xml @@ -93,19 +93,6 @@ </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <goals><goal>analyze-only</goal></goals> - <configuration> - <failOnWarning>true</failOnWarning> - </configuration> - </execution> - </executions> - </plugin> - <!-- Run CheckStyle pass on transforms, as they are release in source form. --> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/dee44b34/runners/spark/pom.xml ---------------------------------------------------------------------- diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml index 741f2db..94c42bd 100644 --- a/runners/spark/pom.xml +++ b/runners/spark/pom.xml @@ -35,6 +35,8 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <spark.version>1.6.1</spark.version> + <hadoop.version>2.2.0</hadoop.version> + <kafka.version>0.8.2.1</kafka.version> </properties> <profiles> @@ -113,9 +115,33 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-network-common_2.10</artifactId> + <version>${spark.version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.kafka</groupId> <artifactId>kafka_2.10</artifactId> - <version>0.8.2.1</version> + <version>${kafka.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.kafka</groupId> + <artifactId>kafka-clients</artifactId> + <version>${kafka.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <version>${hadoop.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -128,10 +154,67 @@ <optional>true</optional> </dependency> <dependency> + <groupId>com.google.http-client</groupId> + <artifactId>google-http-client</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>3.4.6</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <version>2.10.5</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.beam</groupId> <artifactId>beam-sdks-java-core</artifactId> <exclusions> - <!-- Use Hadoop/Spark's backend logger --> + <!-- Use Hadoop/Spark's backend logger instead of jdk14 for tests --> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.beam</groupId> + <artifactId>beam-runners-core-java</artifactId> + <exclusions> + <!-- Use Hadoop/Spark's backend logger instead of jdk14 for tests --> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> @@ -142,7 +225,7 @@ <groupId>org.apache.beam</groupId> <artifactId>beam-examples-java</artifactId> <exclusions> - <!-- Use Hadoop/Spark's backend logger --> + <!-- Use Hadoop/Spark's backend logger instead of jdk14 for tests --> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/dee44b34/sdks/java/core/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml index bbba77b..3b650c6 100644 --- a/sdks/java/core/pom.xml +++ b/sdks/java/core/pom.xml @@ -137,21 +137,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>analyze-only</goal> - </goals> - <configuration> - <failOnWarning>true</failOnWarning> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <configuration> <!-- Set testSourceDirectory in order to exclude generated-test-sources --> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/dee44b34/sdks/java/io/google-cloud-platform/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/google-cloud-platform/pom.xml b/sdks/java/io/google-cloud-platform/pom.xml index f567261..5786e84 100644 --- a/sdks/java/io/google-cloud-platform/pom.xml +++ b/sdks/java/io/google-cloud-platform/pom.xml @@ -79,7 +79,27 @@ <version>${bigtable.version}</version> </dependency> - <!-- test --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </dependency> + + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </dependency> + + <!-- test --> <dependency> <groupId>org.apache.beam</groupId> <artifactId>beam-sdks-java-core</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/dee44b34/sdks/java/io/hdfs/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/hdfs/pom.xml b/sdks/java/io/hdfs/pom.xml index 9c30792..9f4b38a 100644 --- a/sdks/java/io/hdfs/pom.xml +++ b/sdks/java/io/hdfs/pom.xml @@ -58,12 +58,41 @@ </dependency> <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </dependency> + + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> <version>2.7.0</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>2.7.0</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <version>2.7.0</version> + <scope>provided</scope> + </dependency> + <!-- test dependencies --> <dependency> <groupId>org.apache.beam</groupId> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/dee44b34/sdks/java/io/kafka/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/kafka/pom.xml b/sdks/java/io/kafka/pom.xml index 76c0eb6..578026b 100644 --- a/sdks/java/io/kafka/pom.xml +++ b/sdks/java/io/kafka/pom.xml @@ -69,6 +69,31 @@ <version>0.9.0.1</version> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + + <dependency> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + </dependency> + + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </dependency> + <!-- test dependencies--> <dependency> <groupId>org.apache.beam</groupId> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/dee44b34/sdks/java/java8tests/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/java8tests/pom.xml b/sdks/java/java8tests/pom.xml index 8e20228..775a7c7 100644 --- a/sdks/java/java8tests/pom.xml +++ b/sdks/java/java8tests/pom.xml @@ -53,19 +53,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <goals><goal>analyze-only</goal></goals> - <configuration> - <failOnWarning>true</failOnWarning> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> </plugin>
