Repository: beam Updated Branches: refs/heads/master fad07f6b0 -> ae72456b7
Remove unneeded elements from the POM files The compiler-plugin, jar-plugin and checkstyle are all inherited from the parent pom. This was validated by using: mvn help:effective-pom. Also we don't need the extra configuration for surefire because the TestPipelineRunner uses DirectRunner if it is available instead of the DummyRunner. Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/a76a20ee Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/a76a20ee Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/a76a20ee Branch: refs/heads/master Commit: a76a20ee4e883b5891d7440be640ac9700b4c06c Parents: fad07f6 Author: Ismaël MejÃa <ieme...@apache.org> Authored: Wed Apr 26 16:18:33 2017 +0200 Committer: Jean-Baptiste Onofré <jbono...@apache.org> Committed: Tue May 2 09:40:22 2017 +0200 ---------------------------------------------------------------------- examples/java/pom.xml | 9 --- examples/java8/pom.xml | 6 -- runners/apex/pom.xml | 6 -- runners/core-java/pom.xml | 10 --- runners/direct-java/pom.xml | 10 --- runners/google-cloud-dataflow-java/pom.xml | 11 --- runners/spark/pom.xml | 11 --- sdks/java/core/pom.xml | 10 --- sdks/java/extensions/gcp-core/pom.xml | 10 --- sdks/java/extensions/jackson/pom.xml | 99 +++++++++++-------------- sdks/java/extensions/join-library/pom.xml | 22 ------ sdks/java/extensions/protobuf/pom.xml | 10 --- sdks/java/extensions/sorter/pom.xml | 24 +----- sdks/java/java8tests/pom.xml | 19 ----- 14 files changed, 43 insertions(+), 214 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/a76a20ee/examples/java/pom.xml ---------------------------------------------------------------------- diff --git a/examples/java/pom.xml b/examples/java/pom.xml index 4c8b76d..d1db3c3 100644 --- a/examples/java/pom.xml +++ b/examples/java/pom.xml @@ -368,10 +368,6 @@ <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> @@ -417,11 +413,6 @@ </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - <!-- Coverage analysis for unit tests. --> <plugin> <groupId>org.jacoco</groupId> http://git-wip-us.apache.org/repos/asf/beam/blob/a76a20ee/examples/java8/pom.xml ---------------------------------------------------------------------- diff --git a/examples/java8/pom.xml b/examples/java8/pom.xml index cd69acb..a30c6a0 100644 --- a/examples/java8/pom.xml +++ b/examples/java8/pom.xml @@ -187,11 +187,6 @@ </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - <!-- Coverage analysis for unit tests. --> <plugin> <groupId>org.jacoco</groupId> @@ -293,7 +288,6 @@ </dependency> <!-- Test dependencies --> - <!-- For testing the example itself, use the direct runner. This is separate from the use of ValidatesRunner tests for testing a particular runner. http://git-wip-us.apache.org/repos/asf/beam/blob/a76a20ee/runners/apex/pom.xml ---------------------------------------------------------------------- diff --git a/runners/apex/pom.xml b/runners/apex/pom.xml index f441e3d..36252e8 100644 --- a/runners/apex/pom.xml +++ b/runners/apex/pom.xml @@ -179,12 +179,6 @@ <build> <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <!-- Integration Tests --> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/beam/blob/a76a20ee/runners/core-java/pom.xml ---------------------------------------------------------------------- diff --git a/runners/core-java/pom.xml b/runners/core-java/pom.xml index 5aa8a82..ab3f09e 100644 --- a/runners/core-java/pom.xml +++ b/runners/core-java/pom.xml @@ -36,11 +36,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludedGroups> @@ -52,11 +47,6 @@ </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - <!-- Coverage analysis for unit tests. --> <plugin> <groupId>org.jacoco</groupId> http://git-wip-us.apache.org/repos/asf/beam/blob/a76a20ee/runners/direct-java/pom.xml ---------------------------------------------------------------------- diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml index fc28fd6..e76f65d 100644 --- a/runners/direct-java/pom.xml +++ b/runners/direct-java/pom.xml @@ -43,16 +43,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <systemPropertyVariables> http://git-wip-us.apache.org/repos/asf/beam/blob/a76a20ee/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 4c9d8d3..1f3db34 100644 --- a/runners/google-cloud-dataflow-java/pom.xml +++ b/runners/google-cloud-dataflow-java/pom.xml @@ -105,11 +105,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <systemPropertyVariables> @@ -135,12 +130,6 @@ </execution> </executions> </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/beam/blob/a76a20ee/runners/spark/pom.xml ---------------------------------------------------------------------- diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml index bf00149..38d250e 100644 --- a/runners/spark/pom.xml +++ b/runners/spark/pom.xml @@ -382,16 +382,5 @@ </plugin> </plugins> </pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - </plugins> </build> - </project> http://git-wip-us.apache.org/repos/asf/beam/blob/a76a20ee/sdks/java/core/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml index 110de52..b27fea8 100644 --- a/sdks/java/core/pom.xml +++ b/sdks/java/core/pom.xml @@ -63,11 +63,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludedGroups> @@ -79,11 +74,6 @@ </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - <!-- Coverage analysis for unit tests. --> <plugin> <groupId>org.jacoco</groupId> http://git-wip-us.apache.org/repos/asf/beam/blob/a76a20ee/sdks/java/extensions/gcp-core/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/extensions/gcp-core/pom.xml b/sdks/java/extensions/gcp-core/pom.xml index e9086a6..714cb0f 100644 --- a/sdks/java/extensions/gcp-core/pom.xml +++ b/sdks/java/extensions/gcp-core/pom.xml @@ -37,11 +37,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludedGroups> @@ -53,11 +48,6 @@ </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - <!-- Coverage analysis for unit tests. --> <plugin> <groupId>org.jacoco</groupId> http://git-wip-us.apache.org/repos/asf/beam/blob/a76a20ee/sdks/java/extensions/jackson/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/extensions/jackson/pom.xml b/sdks/java/extensions/jackson/pom.xml index dbeec24..be13914 100644 --- a/sdks/java/extensions/jackson/pom.xml +++ b/sdks/java/extensions/jackson/pom.xml @@ -17,69 +17,54 @@ --> <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 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.beam</groupId> - <artifactId>beam-sdks-java-extensions-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>beam-sdks-java-extensions-json-jackson</artifactId> - <name>Apache Beam :: SDKs :: Java :: Extensions :: Jackson</name> - <description> - Jackson extension provides PTransforms for deserializing and generating JSON strings. - </description> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - </plugins> - </build> + <parent> + <groupId>org.apache.beam</groupId> + <artifactId>beam-sdks-java-extensions-parent</artifactId> + <version>0.7.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <dependencies> - <dependency> - <groupId>org.apache.beam</groupId> - <artifactId>beam-sdks-java-core</artifactId> - </dependency> + <artifactId>beam-sdks-java-extensions-json-jackson</artifactId> + <name>Apache Beam :: SDKs :: Java :: Extensions :: Jackson</name> + <description> + Jackson extension provides PTransforms for deserializing and generating JSON strings. + </description> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </dependency> - - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> + <dependencies> + <dependency> + <groupId>org.apache.beam</groupId> + <artifactId>beam-sdks-java-core</artifactId> + </dependency> - <!-- Dependencies for tests --> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> - <dependency> - <groupId>org.apache.beam</groupId> - <artifactId>beam-runners-direct-java</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - <scope>test</scope> - </dependency> + <!-- Dependencies for tests --> + <dependency> + <groupId>org.apache.beam</groupId> + <artifactId>beam-runners-direct-java</artifactId> + <scope>test</scope> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/beam/blob/a76a20ee/sdks/java/extensions/join-library/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/extensions/join-library/pom.xml b/sdks/java/extensions/join-library/pom.xml index 721f378..94f8673 100644 --- a/sdks/java/extensions/join-library/pom.xml +++ b/sdks/java/extensions/join-library/pom.xml @@ -29,28 +29,6 @@ <artifactId>beam-sdks-java-extensions-join-library</artifactId> <name>Apache Beam :: SDKs :: Java :: Extensions :: Join library</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemPropertyVariables> - <beamUseDummyRunner>false</beamUseDummyRunner> - </systemPropertyVariables> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - </plugins> - </build> - <dependencies> <dependency> <groupId>org.apache.beam</groupId> http://git-wip-us.apache.org/repos/asf/beam/blob/a76a20ee/sdks/java/extensions/protobuf/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/extensions/protobuf/pom.xml b/sdks/java/extensions/protobuf/pom.xml index ad220a6..81fb4de 100644 --- a/sdks/java/extensions/protobuf/pom.xml +++ b/sdks/java/extensions/protobuf/pom.xml @@ -35,16 +35,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - - <plugin> <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> <configuration> http://git-wip-us.apache.org/repos/asf/beam/blob/a76a20ee/sdks/java/extensions/sorter/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/extensions/sorter/pom.xml b/sdks/java/extensions/sorter/pom.xml index 5a566a6..5485952 100644 --- a/sdks/java/extensions/sorter/pom.xml +++ b/sdks/java/extensions/sorter/pom.xml @@ -28,33 +28,11 @@ <artifactId>beam-sdks-java-extensions-sorter</artifactId> <name>Apache Beam :: SDKs :: Java :: Extensions :: Sorter</name> - + <properties> <hadoop.version>2.7.1</hadoop.version> </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemPropertyVariables> - <beamUseDummyRunner>false</beamUseDummyRunner> - </systemPropertyVariables> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - </plugins> - </build> - <dependencies> <dependency> <groupId>org.apache.beam</groupId> http://git-wip-us.apache.org/repos/asf/beam/blob/a76a20ee/sdks/java/java8tests/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/java8tests/pom.xml b/sdks/java/java8tests/pom.xml index e7c6cc0..cafae11 100644 --- a/sdks/java/java8tests/pom.xml +++ b/sdks/java/java8tests/pom.xml @@ -47,25 +47,6 @@ </pluginManagement> <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemPropertyVariables> - <beamUseDummyRunner>false</beamUseDummyRunner> - </systemPropertyVariables> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - <!-- Coverage analysis for unit tests. --> <plugin> <groupId>org.jacoco</groupId>