diff --git a/.github/actions/setup-env/action.yml b/.github/actions/setup-env/action.yml index 8ef59df42a..4f2a968de2 100644 --- a/.github/actions/setup-env/action.yml +++ b/.github/actions/setup-env/action.yml @@ -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' diff --git a/.github/actions/setup-java-env/action.yml b/.github/actions/setup-java-env/action.yml index c3b50c7158..1d736f179c 100644 --- a/.github/actions/setup-java-env/action.yml +++ b/.github/actions/setup-java-env/action.yml @@ -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' diff --git a/contributor-docs/code-contributions.md b/contributor-docs/code-contributions.md index 0e3f6efceb..073881adfa 100644 --- a/contributor-docs/code-contributions.md +++ b/contributor-docs/code-contributions.md @@ -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 diff --git a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/artifacts/matchers/ArtifactsSubject.java b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/artifacts/matchers/ArtifactsSubject.java index 06ea14d039..770f32386d 100644 --- a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/artifacts/matchers/ArtifactsSubject.java +++ b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/artifacts/matchers/ArtifactsSubject.java @@ -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 @@ -46,6 +48,8 @@ }) public final class ArtifactsSubject extends Subject { + private static final Logger LOG = LoggerFactory.getLogger(ArtifactsSubject.class); + private final List actual; private static final ObjectMapper objectMapper = new ObjectMapper(); @@ -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); } } diff --git a/metadata/pom.xml b/metadata/pom.xml index 674388eb91..a7dc4b3269 100644 --- a/metadata/pom.xml +++ b/metadata/pom.xml @@ -34,8 +34,8 @@ https://github.com/GoogleCloudPlatform/DataflowTemplates - 11 - 11 + 17 + 17 diff --git a/plaintext-logging/pom.xml b/plaintext-logging/pom.xml index 723de36fcc..d1d731dd86 100644 --- a/plaintext-logging/pom.xml +++ b/plaintext-logging/pom.xml @@ -27,7 +27,7 @@ plaintext-logging - 11 + 17 2.21.0 diff --git a/plugins/core-plugin/pom.xml b/plugins/core-plugin/pom.xml index 68e4ac0079..e29e8f4e9b 100644 --- a/plugins/core-plugin/pom.xml +++ b/plugins/core-plugin/pom.xml @@ -32,8 +32,8 @@ https://github.com/GoogleCloudPlatform/DataflowTemplates - 11 - 11 + 17 + 17 0.9.11 2.9.1 diff --git a/plugins/core-plugin/src/main/java/com/google/cloud/teleport/plugin/DockerfileGenerator.java b/plugins/core-plugin/src/main/java/com/google/cloud/teleport/plugin/DockerfileGenerator.java index 35b4181ecc..575470db27 100644 --- a/plugins/core-plugin/src/main/java/com/google/cloud/teleport/plugin/DockerfileGenerator.java +++ b/plugins/core-plugin/src/main/java/com/google/cloud/teleport/plugin/DockerfileGenerator.java @@ -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 = diff --git a/plugins/templates-maven-plugin/pom.xml b/plugins/templates-maven-plugin/pom.xml index 84202358f2..214373a3b2 100644 --- a/plugins/templates-maven-plugin/pom.xml +++ b/plugins/templates-maven-plugin/pom.xml @@ -36,12 +36,12 @@ - 11 - 11 - 3.3.9 + 17 + 17 + 3.9.9 0.7.6 2.4.0 - 3.6.0 + 3.15.1 diff --git a/plugins/templates-maven-plugin/src/main/java/com/google/cloud/teleport/plugin/maven/TemplatesReleaseFinishMojo.java b/plugins/templates-maven-plugin/src/main/java/com/google/cloud/teleport/plugin/maven/TemplatesReleaseFinishMojo.java index 227734d2e6..083c75aaaf 100644 --- a/plugins/templates-maven-plugin/src/main/java/com/google/cloud/teleport/plugin/maven/TemplatesReleaseFinishMojo.java +++ b/plugins/templates-maven-plugin/src/main/java/com/google/cloud/teleport/plugin/maven/TemplatesReleaseFinishMojo.java @@ -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; diff --git a/pom.xml b/pom.xml index bfc8983fc6..659b12343d 100644 --- a/pom.xml +++ b/pom.xml @@ -31,13 +31,13 @@ UTF-8 - 11 + 17 1.0-SNAPSHOT 3.2.1 3.11.0 - 3.6.0 + 3.8.1 3.5.0 1.8.0 3.3.0 diff --git a/python/pom.xml b/python/pom.xml index 63996fbf94..f107d5886f 100644 --- a/python/pom.xml +++ b/python/pom.xml @@ -34,8 +34,8 @@ https://github.com/GoogleCloudPlatform/DataflowTemplates - 11 - 11 + 17 + 17 2.57.0 diff --git a/v1/pom.xml b/v1/pom.xml index f329ac49ef..d1123a8380 100644 --- a/v1/pom.xml +++ b/v1/pom.xml @@ -801,7 +801,7 @@ - 11 + 17