Set worker harness container image to INVALID until next release ----Release Notes---- [] ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=115473121
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/1cc0211c Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/1cc0211c Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/1cc0211c Branch: refs/heads/master Commit: 1cc0211c19910d1d67d28ade1fd0c044bec8421d Parents: d15d924 Author: herohde <[email protected]> Authored: Wed Feb 24 11:20:32 2016 -0800 Committer: Davor Bonaci <[email protected]> Committed: Thu Feb 25 23:58:27 2016 -0800 ---------------------------------------------------------------------- pom.xml | 1 - .../sdk/runners/DataflowPipelineRunner.java | 9 +- worker/pom.xml | 301 ------------------- 3 files changed, 4 insertions(+), 307 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1cc0211c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d946605..760a10d 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,6 @@ <packaging>pom</packaging> <modules> <module>sdk</module> - <module>worker</module> <module>examples</module> <module>maven-archetypes/starter</module> <module>maven-archetypes/examples</module> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1cc0211c/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java ---------------------------------------------------------------------- diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java index ac0dcea..54fadea 100644 --- a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java +++ b/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java @@ -206,11 +206,10 @@ public class DataflowPipelineRunner extends PipelineRunner<DataflowPipelineJob> // Default Docker container images that execute Dataflow worker harness, residing in Google // Container Registry, separately for Batch and Streaming. - // TODO: Set these once versioned containers are ready. - public static final String BATCH_WORKER_HARNESS_CONTAINER_IMAGE = null; - //"dataflow.gcr.io/v1beta3/java-batch:20160201-rc00---INVALID"; - public static final String STREAMING_WORKER_HARNESS_CONTAINER_IMAGE = null; - //"dataflow.gcr.io/v1beta3/java-streaming:20160201-rc00---INVALID"; + public static final String BATCH_WORKER_HARNESS_CONTAINER_IMAGE + = "dataflow.gcr.io/v1beta3/java-batch:INVALID"; + public static final String STREAMING_WORKER_HARNESS_CONTAINER_IMAGE + = "dataflow.gcr.io/v1beta3/java-streaming:INVALID"; // The limit of CreateJob request size. private static final int CREATE_JOB_REQUEST_LIMIT_BYTES = 10 * 1024 * 1024; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1cc0211c/worker/pom.xml ---------------------------------------------------------------------- diff --git a/worker/pom.xml b/worker/pom.xml deleted file mode 100644 index ab9e172..0000000 --- a/worker/pom.xml +++ /dev/null @@ -1,301 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ Copyright (C) 2015 Google Inc. - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); you may not - ~ use this file except in compliance with the License. You may obtain a copy of - ~ the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>com.google.cloud.dataflow</groupId> - <artifactId>google-cloud-dataflow-java-sdk-parent</artifactId> - <version>1.5.0-SNAPSHOT</version> - </parent> - - <groupId>com.google.cloud.dataflow</groupId> - <artifactId>google-cloud-dataflow-java-worker-all</artifactId> - <name>Google Cloud Dataflow Java Worker - All</name> - <description>Google Cloud Dataflow Java SDK provides a simple, Java-based - interface for processing virtually any size data using Google cloud - resources. This artifact includes entire Dataflow Java Worker.</description> - <url>http://cloud.google.com/dataflow</url> - - <packaging>jar</packaging> - - <properties> - <timestamp>${maven.build.timestamp}</timestamp> - <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format> - <testParallelValue>none</testParallelValue> - </properties> - - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - </resources> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - - <!-- Run CheckStyle. --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.12</version> - <dependencies> - <dependency> - <groupId>com.puppycrawl.tools</groupId> - <artifactId>checkstyle</artifactId> - <version>6.6</version> - </dependency> - </dependencies> - <configuration> - <configLocation>../checkstyle.xml</configLocation> - <consoleOutput>true</consoleOutput> - <failOnViolation>true</failOnViolation> - <includeResources>false</includeResources> - <includeTestSourceDirectory>true</includeTestSourceDirectory> - <excludes>${project.build.directory}/generated-test-sources/**</excludes> - </configuration> - <executions> - <execution> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>default-jar</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - <execution> - <id>default-test-jar</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - - <!-- Source plugin for generating source and test-source JARs. --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>2.4</version> - <executions> - <execution> - <id>attach-sources</id> - <phase>compile</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - <execution> - <id>attach-test-sources</id> - <phase>test-compile</phase> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>2.4.1</version> - <executions> - <!-- In the first phase, we pick dependencies and relocate them. --> - <execution> - <id>bundle-and-repackage</id> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <shadeTestJar>true</shadeTestJar> - <artifactSet> - <includes> - <include>com.google.guava:guava</include> - </includes> - </artifactSet> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> - </excludes> - </filter> - </filters> - <relocations> - <!-- TODO: Once ready, change the following pattern to 'com' - only, exclude 'com.google.cloud.dataflow.**', and remove - the second relocation. --> - <relocation> - <pattern>com.google.common</pattern> - <shadedPattern>com.google.cloud.dataflow.worker.repackaged.com.google.common</shadedPattern> - </relocation> - <relocation> - <pattern>com.google.thirdparty</pattern> - <shadedPattern>com.google.cloud.dataflow.worker.repackaged.com.google.thirdparty</shadedPattern> - </relocation> - </relocations> - </configuration> - </execution> - - <!-- In the second phase, we pick remaining dependencies and bundle - them without repackaging. --> - <execution> - <id>bundle-rest-without-repackaging</id> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <shadeTestJar>true</shadeTestJar> - <finalName>${project.artifactId}-bundled-${project.version}</finalName> - <artifactSet> - <excludes> - <exclude>com.google.guava:guava</exclude> - </excludes> - </artifactSet> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> - </excludes> - </filter> - </filters> - </configuration> - </execution> - </executions> - </plugin> - - <!-- Coverage analysis for unit tests. --> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>com.google.cloud.dataflow</groupId> - <artifactId>google-cloud-dataflow-java-sdk-all</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>com.google.cloud.dataflow</groupId> - <artifactId>google-cloud-dataflow-java-sdk-all</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${guava.version}</version> - </dependency> - - <dependency> - <groupId>io.grpc</groupId> - <artifactId>grpc-all</artifactId> - <version>0.12.0</version> - </dependency> - - <dependency> - <groupId>com.google.auth</groupId> - <artifactId>google-auth-library-oauth2-http</artifactId> - <version>0.3.0</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>9.2.10.v20150310</version> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <version>9.2.10.v20150310</version> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> - </dependency> - - <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - <version>${jsr305.version}</version> - </dependency> - - <!-- test dependencies --> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - <version>${hamcrest.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - <version>${slf4j.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> - <scope>test</scope> - </dependency> - </dependencies> -</project>
