Fix the maven-archetypes pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/1f30255e Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/1f30255e Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/1f30255e Branch: refs/heads/master Commit: 1f30255edcdd9c1e445b69248191c8552724f086 Parents: 1047e03 Author: Pei He <[email protected]> Authored: Tue Sep 13 16:46:36 2016 -0700 Committer: Luke Cwik <[email protected]> Committed: Tue Sep 13 18:01:09 2016 -0700 ---------------------------------------------------------------------- pom.xml | 14 +++++++--- sdks/java/maven-archetypes/examples/pom.xml | 28 ++++++++++++++++++++ .../main/resources/archetype-resources/pom.xml | 16 +++++------ sdks/java/maven-archetypes/starter/pom.xml | 8 ++++++ .../main/resources/archetype-resources/pom.xml | 2 +- .../resources/projects/basic/reference/pom.xml | 2 +- 6 files changed, 54 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1f30255e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f9e0479..242a9ce 100644 --- a/pom.xml +++ b/pom.xml @@ -92,13 +92,13 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <dataflow.javadoc_opts /> + <dataflow.javadoc_opts/> <!-- Disable integration tests by default --> <skipITs>true</skipITs> <!-- Do not add additional surefire arguments by default --> - <beamSurefireArgline /> + <beamSurefireArgline/> <!-- If updating dependencies, please update any relevant javadoc offlineLinks --> <avro.version>1.8.1</avro.version> @@ -250,6 +250,12 @@ <dependency> <groupId>org.apache.beam</groupId> + <artifactId>beam-runners-direct-java</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.beam</groupId> <artifactId>beam-runners-google-cloud-dataflow-java</artifactId> <version>${project.version}</version> </dependency> @@ -926,7 +932,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore /> + <ignore/> </action> </pluginExecution> <pluginExecution> @@ -940,7 +946,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore /> + <ignore/> </action> </pluginExecution> </pluginExecutions> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1f30255e/sdks/java/maven-archetypes/examples/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/examples/pom.xml b/sdks/java/maven-archetypes/examples/pom.xml index e9bb5d8..75b88e2 100644 --- a/sdks/java/maven-archetypes/examples/pom.xml +++ b/sdks/java/maven-archetypes/examples/pom.xml @@ -66,4 +66,32 @@ </plugins> </pluginManagement> </build> + <dependencies> + <!-- Adds a dependency on a specific version of the Beam SDK. --> + <dependency> + <groupId>org.apache.beam</groupId> + <artifactId>beam-sdks-java-core</artifactId> + <scope>runtime</scope> + </dependency> + + <!-- Adds a dependency on a specific version of the Dataflow runnner. --> + <dependency> + <groupId>org.apache.beam</groupId> + <artifactId>beam-runners-direct-java</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.beam</groupId> + <artifactId>beam-runners-google-cloud-dataflow-java</artifactId> + <scope>runtime</scope> + </dependency> + + <!-- Adds a dependency on a specific version of the Beam Google Cloud Platform IO module. --> + <dependency> + <groupId>org.apache.beam</groupId> + <artifactId>beam-sdks-java-io-google-cloud-platform</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1f30255e/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml index db7b899..3f8408d 100644 --- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml +++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml @@ -108,27 +108,29 @@ <dependency> <groupId>org.apache.beam</groupId> <artifactId>beam-sdks-java-core</artifactId> - <version>[0-incubating, 2-incubating)</version> + <version>0.3.0-incubating-SNAPSHOT</version> </dependency> <!-- Adds a dependency on a specific version of the Dataflow runnner. --> <dependency> <groupId>org.apache.beam</groupId> <artifactId>beam-runners-direct-java</artifactId> - <version>[0-incubating, 2-incubating)</version> + <version>0.3.0-incubating-SNAPSHOT</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.beam</groupId> <artifactId>beam-runners-google-cloud-dataflow-java</artifactId> - <version>[0-incubating, 2-incubating)</version> + <version>0.3.0-incubating-SNAPSHOT</version> + <scope>runtime</scope> </dependency> <!-- Adds a dependency on a specific version of the Beam Google Cloud Platform IO module. --> <dependency> <groupId>org.apache.beam</groupId> <artifactId>beam-sdks-java-io-google-cloud-platform</artifactId> - <version>[0-incubating, 2-incubating)</version> + <version>0.3.0-incubating-SNAPSHOT</version> </dependency> <dependency> @@ -200,12 +202,6 @@ <version>19.0</version> </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> - </dependency> - <!-- Add slf4j API frontend binding with JUL backend --> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1f30255e/sdks/java/maven-archetypes/starter/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/starter/pom.xml b/sdks/java/maven-archetypes/starter/pom.xml index 3830387..45b60a6 100644 --- a/sdks/java/maven-archetypes/starter/pom.xml +++ b/sdks/java/maven-archetypes/starter/pom.xml @@ -72,4 +72,12 @@ </plugins> </pluginManagement> </build> + + <dependencies> + <dependency> + <groupId>org.apache.beam</groupId> + <artifactId>beam-sdks-java-core</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1f30255e/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml index bd2de9c..fb932af 100644 --- a/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml +++ b/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml @@ -55,7 +55,7 @@ <dependency> <groupId>org.apache.beam</groupId> <artifactId>beam-sdks-java-core</artifactId> - <version>[0-incubating, 1-incubating)</version> + <version>0.3.0-incubating-SNAPSHOT</version> </dependency> <!-- slf4j API frontend binding with JUL backend --> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1f30255e/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml index a778fb6..11e32fb 100644 --- a/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml +++ b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml @@ -55,7 +55,7 @@ <dependency> <groupId>org.apache.beam</groupId> <artifactId>beam-sdks-java-core</artifactId> - <version>[0-incubating, 1-incubating)</version> + <version>0.3.0-incubating-SNAPSHOT</version> </dependency> <!-- slf4j API frontend binding with JUL backend -->
