Skip to content

Commit

Permalink
Switch to Java 17 for all Dataflow Templates (#2050)
Browse files Browse the repository at this point in the history
* [DO NOT MERGE] Test Java 17

* Polished the test

* changed other places to java 17

* mvn spotless:apply

* updated maven and maven plugin versions

* fixed action.yml

* changed maven-plugin.version

* changed maven-dependency-plugin.version

* use System.out.printf

* updated the new hash caused by Java 17
  • Loading branch information
liferoad authored Jan 15, 2025
1 parent 8217f1a commit 5cda88d
Show file tree
Hide file tree
Showing 52 changed files with 70 additions and 59 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup-env/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ inputs:
type: string
description: 'The version of Java to install'
required: false
default: '11'
default: '17'
go-version:
type: string
description: 'The version of Go to install'
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-java-env/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ inputs:
type: string
description: 'The version of Java to install'
required: false
default: '11'
default: '17'
outputs:
cache-hit:
description: 'Whether or not there was a cache hit'
Expand Down
2 changes: 1 addition & 1 deletion contributor-docs/code-contributions.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ these can be found in the following locations:

### Requirements

* Java 11
* Java 17
* Maven 3
* IntelliJ (recommended) or another editor of your choice

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
import org.apache.beam.it.gcp.artifacts.utils.JsonTestUtil;
import org.apache.beam.it.gcp.artifacts.utils.ParquetTestUtil;
import org.apache.beam.it.truthmatchers.RecordsSubject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* Subject that has assertion operations for artifact lists (GCS files), usually coming from the
Expand All @@ -46,6 +48,8 @@
})
public final class ArtifactsSubject extends Subject {

private static final Logger LOG = LoggerFactory.getLogger(ArtifactsSubject.class);

private final List<Artifact> actual;

private static final ObjectMapper objectMapper = new ObjectMapper();
Expand Down Expand Up @@ -96,8 +100,15 @@ public void hasContent(String content) {
* @param hash Content to search for
*/
public void hasHash(String hash) {

if (actual.stream()
.noneMatch(artifact -> sha256().hashBytes(artifact.contents()).toString().equals(hash))) {
actual.stream()
.forEach(
artifact -> {
String calculatedHash = sha256().hashBytes(artifact.contents()).toString();
System.out.printf("Calculated Hash (no match found): {%s} \n", calculatedHash);
});
failWithActual("expected to contain hash", hash);
}
}
Expand Down
4 changes: 2 additions & 2 deletions metadata/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<url>https://github.com/GoogleCloudPlatform/DataflowTemplates</url>

<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion plaintext-logging/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<artifactId>plaintext-logging</artifactId>

<properties>
<java.version>11</java.version>
<java.version>17</java.version>
<surefire.version>2.21.0</surefire.version>
</properties>

Expand Down
4 changes: 2 additions & 2 deletions plugins/core-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
<url>https://github.com/GoogleCloudPlatform/DataflowTemplates</url>

<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>

<reflections.version>0.9.11</reflections.version>
<gson.version>2.9.1</gson.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
public class DockerfileGenerator {

public static final String BASE_CONTAINER_IMAGE =
"gcr.io/dataflow-templates-base/java11-template-launcher-base-distroless:latest";
"gcr.io/dataflow-templates-base/java17-template-launcher-base-distroless:latest";
// Keep in sync with python version used in
// https://github.com/GoogleCloudPlatform/DataflowTemplates/blob/main/python/generate_dependencies.sh
public static final String BASE_PYTHON_CONTAINER_IMAGE =
Expand Down
8 changes: 4 additions & 4 deletions plugins/templates-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
</prerequisites>

<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.version>3.3.9</maven.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.version>3.9.9</maven.version>
<dataflow.api.version>0.7.6</dataflow.api.version>
<mojo.executor.version>2.4.0</mojo.executor.version>
<maven-plugin.version>3.6.0</maven-plugin.version>
<maven-plugin.version>3.15.1</maven-plugin.version>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public class TemplatesReleaseFinishMojo extends TemplatesBaseMojo {
@Parameter(
name = "baseContainerImage",
defaultValue =
"gcr.io/dataflow-templates-base/java11-template-launcher-base-distroless:latest",
"gcr.io/dataflow-templates-base/java17-template-launcher-base-distroless:latest",
required = false)
protected String baseContainerImage;

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>11</java.version>
<java.version>17</java.version>
<!-- <os.detected.classifier>osx-x86_64</os.detected.classifier>-->
<!-- Plugins -->
<templates-maven-plugin.version>1.0-SNAPSHOT</templates-maven-plugin.version>
<maven-checkstyle-plugin.version>3.2.1</maven-checkstyle-plugin.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version>
<maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
<extra.enforcer.rules.version>1.8.0</extra.enforcer.rules.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
Expand Down
4 changes: 2 additions & 2 deletions python/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<url>https://github.com/GoogleCloudPlatform/DataflowTemplates</url>

<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>

<!-- TODO - remove line when repo is upgraded to Beam 2.59.0 -->
<beam-python.version>2.57.0</beam-python.version>
Expand Down
2 changes: 1 addition & 1 deletion v1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@
<configuration>
<rules>
<enforceBytecodeVersion>
<maxJdkVersion>11</maxJdkVersion>
<maxJdkVersion>17</maxJdkVersion>
<excludes>
<!--
Supplied by the user JDK and compiled with matching
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public void setup() throws IOException, URISyntaxException {
@Test
public void testCompressGzip() throws IOException {
baseCompress(
Compression.GZIP, "81f7b7afd932b4754caaa9ba6ced7a8bcb2cbfec6857cf823e4d112125c6e939");
Compression.GZIP, "050f90e5523bc0ed37beb817f1ff7c68f48a537bd6246dd309132576bab009fd");
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion v2/astradb-to-bigquery/docs/AstraDbToBigQuery/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export PROJECT=<project-id>
export IMAGE_NAME="astradb-to-bigquery"
export BUCKET_NAME=gs://<bucket-name>
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export TEMPLATE_MODULE="astradb-to-bigquery"
export APP_ROOT="/template/astradb-to-bigquery"
Expand Down
2 changes: 1 addition & 1 deletion v2/azure-eventhub-to-pubsub/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export PROJECT=my-project
export IMAGE_NAME=azure-eventhub-to-pubsub
export MODULE_NAME=azure-eventhub-to-pubsub
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export APP_ROOT="/template/${MODULE_NAME}"
export COMMAND_SPEC="${APP_ROOT}/resources/${MODULE_NAME}-command-spec.json"
Expand Down
2 changes: 1 addition & 1 deletion v2/bigquery-to-bigtable/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export PROJECT=<my-project>
export IMAGE_NAME=<my-image-name>
export BUCKET_NAME=gs://<bucket-name>
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export TEMPLATE_MODULE=bigquery-to-bigtable
export APP_ROOT=/template/${TEMPLATE_MODULE}
Expand Down
2 changes: 1 addition & 1 deletion v2/bigquery-to-parquet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export PROJECT=<my-project>
export IMAGE_NAME=<my-image-name>
export BUCKET_NAME=gs://<bucket-name>
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export TEMPLATE_MODULE=bigquery-to-parquet
export APP_ROOT=/template/${TEMPLATE_MODULE}
Expand Down
2 changes: 1 addition & 1 deletion v2/datastream-to-bigquery/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export PROJECT=<my-project>
export IMAGE_NAME=datastream-to-bigquery
export BUCKET_NAME=gs://<bucket-name>
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export APP_ROOT=/template/${IMAGE_NAME}
export DATAFLOW_JAVA_COMMAND_SPEC=${APP_ROOT}/resources/${IMAGE_NAME}-command-spec.json
Expand Down
2 changes: 1 addition & 1 deletion v2/datastream-to-mongodb/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export PROJECT=<my-project>
export IMAGE_NAME=datastream-to-mongodb
export BUCKET_NAME=gs://<bucket-name>
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export APP_ROOT=/template/${IMAGE_NAME}
export DATAFLOW_JAVA_COMMAND_SPEC=${APP_ROOT}/resources/${IMAGE_NAME}-command-spec.json
Expand Down
2 changes: 1 addition & 1 deletion v2/datastream-to-postgres/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export PROJECT=<my-project>
export IMAGE_NAME=datastream-to-postgres
export BUCKET_NAME=gs://<bucket-name>
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export APP_ROOT=/template/${IMAGE_NAME}
export DATAFLOW_JAVA_COMMAND_SPEC=${APP_ROOT}/resources/${IMAGE_NAME}-command-spec.json
Expand Down
2 changes: 1 addition & 1 deletion v2/datastream-to-spanner/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export PROJECT=<my-project>
export IMAGE_NAME=datastream-to-spanner
export BUCKET_NAME=gs://<bucket-name>
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export APP_ROOT=/template/${IMAGE_NAME}
export DATAFLOW_JAVA_COMMAND_SPEC=${APP_ROOT}/resources/${IMAGE_NAME}-command-spec.json
Expand Down
2 changes: 1 addition & 1 deletion v2/datastream-to-sql/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export PROJECT=<my-project>
export IMAGE_NAME=datastream-to-postgres
export BUCKET_NAME=gs://<bucket-name>
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export APP_ROOT=/template/${IMAGE_NAME}
export DATAFLOW_JAVA_COMMAND_SPEC=${APP_ROOT}/resources/${IMAGE_NAME}-command-spec.json
Expand Down
2 changes: 1 addition & 1 deletion v2/file-format-conversion/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export PROJECT=<my-project>
export IMAGE_NAME=<my-image-name>
export BUCKET_NAME=gs://<bucket-name>
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export TEMPLATE_MODULE=file-format-conversion
export APP_ROOT=/template/${TEMPLATE_MODULE}
Expand Down
2 changes: 1 addition & 1 deletion v2/gcs-to-sourcedb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export PROJECT=<my-project>
export IMAGE_NAME=gcs-to-sourcedb
export BUCKET_NAME=gs://<bucket-name>
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export APP_ROOT=/template/${IMAGE_NAME}
export DATAFLOW_JAVA_COMMAND_SPEC=${APP_ROOT}/resources/${IMAGE_NAME}-command-spec.json
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export PROJECT=<my-project>
export IMAGE_NAME=<my-image-name>
export BUCKET_NAME=gs://<bucket-name>
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export TEMPLATE_MODULE=bigquery-to-elasticsearch
export APP_ROOT=/template/${TEMPLATE_MODULE}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export PROJECT=<my-project>
export IMAGE_NAME=<my-image-name>
export BUCKET_NAME=gs://<bucket-name>
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export TEMPLATE_MODULE=GCS-to-elasticsearch
export APP_ROOT=/template/${TEMPLATE_MODULE}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export PROJECT=<my-project>
export IMAGE_NAME=<my-image-name>
export BUCKET_NAME=gs://<bucket-name>
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export TEMPLATE_MODULE=pubsub-to-elasticsearch
export APP_ROOT=/template/${TEMPLATE_MODULE}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export PROJECT=project
export IMAGE_NAME=googlecloud-to-googlecloud
export BUCKET_NAME=gs://bucket
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/images/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export TEMPLATE_MODULE=googlecloud-to-googlecloud
export COMMAND_MODULE=spanner-changestreams-to-gcs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export TEMPLATE_MODULE=googlecloud-to-googlecloud
export COMMAND_MODULE=spanner-to-bigquery

export TARGET_GCR_IMAGE="gcr.io/$PROJECT/images/$IMAGE_NAME"
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export APP_ROOT="/template/$COMMAND_MODULE"
export COMMAND_SPEC="$APP_ROOT/resources/$COMMAND_MODULE-command-spec.json"
Expand Down
2 changes: 1 addition & 1 deletion v2/googlecloud-to-mongodb/docs/BigQueryToMongoDb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export PROJECT=<project-id>
export IMAGE_NAME="bigquery-to-mongodb"
export BUCKET_NAME=gs://<bucket-name>
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export TEMPLATE_MODULE="googlecloud-to-mongodb"
export APP_ROOT=/template/${TEMPLATE_MODULE}
Expand Down
2 changes: 1 addition & 1 deletion v2/googlecloud-to-neo4j/docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export IMAGE_NAME=neo4j-dataflow
export IMAGE_NAME_VERSION=b0.12
export BUCKET_NAME= [URI FOR CLOUD STORAGE BUCKET AND FOLDER (ex. gs://bucket-name/folder-name)]
export TARGET_GCR_IMAGE=us.gcr.io/${PROJECT}/${IMAGE_NAME}-${IMAGE_NAME_VERSION}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export TEMPLATE_POM_MODULE=googlecloud-to-neo4j
export APP_ROOT=/template/${APP_NAME}
Expand Down
2 changes: 1 addition & 1 deletion v2/googlecloud-to-splunk/docs/GCSToSplunk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export REGION=us-central1
export IMAGE_NAME=<my-image-name>
export BUCKET_NAME=gs://<bucket-name>
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export TEMPLATE_MODULE=googlecloud-to-splunk
export APP_ROOT=/template/gcs-to-splunk
Expand Down
2 changes: 1 addition & 1 deletion v2/jms-to-pubsub/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export PROJECT=my-project
export IMAGE_NAME=jms-to-pubsub-image
export MODULE_NAME=jms-to-pubsub
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export APP_ROOT="/template/${MODULE_NAME}"
export COMMAND_SPEC="${APP_ROOT}/resources/${MODULE_NAME}-command-spec.json"
Expand Down
2 changes: 1 addition & 1 deletion v2/kafka-to-bigquery/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export PROJECT=<my-project>
export IMAGE_NAME=<my-image-name>
export BUCKET_NAME=gs://<bucket-name>
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export TEMPLATE_MODULE=kafka-to-bigquery
export APP_ROOT=/template/${TEMPLATE_MODULE}
Expand Down
2 changes: 1 addition & 1 deletion v2/kafka-to-gcs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export PROJECT=<my-project>
export IMAGE_NAME=<my-image-name>
export BUCKET_NAME=gs://<bucket-name>
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export TEMPLATE_MODULE=kafka-to-gcs
export APP_ROOT=/template/${TEMPLATE_MODULE}
Expand Down
2 changes: 1 addition & 1 deletion v2/kinesis-to-pubsub/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ gsutil mb gs://${BUCKET_NAME}
IMAGE_NAME="$USERNAME-kinesis-to-pubsub"
MODULE_NAME=kinesis-to-pubsub
TARGET_GCR_IMAGE="gcr.io/$PROJECT/$IMAGE_NAME"
BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
BASE_CONTAINER_IMAGE_VERSION=latest
APP_ROOT="/template/$MODULE_NAME"
COMMAND_SPEC="$APP_ROOT/resources/$MODULE_NAME-command-spec.json"
Expand Down
2 changes: 1 addition & 1 deletion v2/kudu-to-bigquery/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export PROJECT=my-project
export IMAGE_NAME=my-image-name
export OUTPUT_TABLE=${PROJECT}:dataflow_template.bigquery_table
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export APP_ROOT=/template/kudu-to-bigquery
export COMMAND_SPEC=${APP_ROOT}/resources/kudu-to-bigquery-command-spec.json
Expand Down
2 changes: 1 addition & 1 deletion v2/mongodb-to-googlecloud/docs/MongoDbToBigQuery/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export PROJECT=<project-id>
export IMAGE_NAME="mongodb-to-bigquery"
export BUCKET_NAME=gs://<bucket-name>
export TARGET_GCR_IMAGE=gcr.io/${PROJECT}/${IMAGE_NAME}
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java11-template-launcher-base
export BASE_CONTAINER_IMAGE=gcr.io/dataflow-templates-base/java17-template-launcher-base
export BASE_CONTAINER_IMAGE_VERSION=latest
export TEMPLATE_MODULE="mongodb-to-googlecloud"
export APP_ROOT="/template/mongodb-to-googlecloud"
Expand Down
Loading

0 comments on commit 5cda88d

Please sign in to comment.