Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/beam_Publish_Beam_SDK_Snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ jobs:
job_phrase: ["N/A"]
container_task:
- "go:container"
- "java:container:java8"
- "java:container:java11"
- "java:container:java17"
- "java:container:java21"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
--runner=DataflowRunner
--region=us-central1
--temp_location=gs://temp-storage-for-perf-tests/
--sdk_harness_container_image_overrides=.*java.*,gcr.io/apache-beam-testing/beam-sdk/beam_java8_sdk:latest
--sdk_harness_container_image_overrides=.*java.*,gcr.io/apache-beam-testing/beam-sdk/beam_java11_sdk:latest
--publish_to_big_query=true
--metrics_dataset=beam_performance
--metrics_table=python_kafkaio_results
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ tasks.register("javaPreCommit") {
dependsOn(":runners:spark:3:job-server:build")
dependsOn(":runners:twister2:build")
dependsOn(":sdks:java:build-tools:build")
dependsOn(":sdks:java:container:java8:docker")
dependsOn(":sdks:java:container:java11:docker")
dependsOn(":sdks:java:core:build")
dependsOn(":sdks:java:core:jmh:build")
dependsOn(":sdks:java:expansion-service:build")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2371,7 +2371,7 @@ class BeamModulePlugin implements Plugin<Project> {
// development image at docker.io (see sdks/CONTAINERS.md):
//
// format: apache/beam_$NAME_sdk:latest
// ie: apache/beam_python3.7_sdk:latest apache/beam_java8_sdk:latest apache/beam_go_sdk:latest
// ie: apache/beam_python3.12_sdk:latest apache/beam_java21_sdk:latest apache/beam_go_sdk:latest
//
// Both the root and tag can be defined using properties or explicitly provided.
project.ext.containerImageName = {
Expand Down
1 change: 0 additions & 1 deletion runners/google-cloud-dataflow-java/arm/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ evaluationDependsOn(":sdks:java:io:google-cloud-platform")
evaluationDependsOn(":sdks:java:core")
evaluationDependsOn(":examples:java")
evaluationDependsOn(":runners:google-cloud-dataflow-java:worker")
evaluationDependsOn(":sdks:java:container:java8")
evaluationDependsOn(":sdks:java:container:java11")

processResources {
Expand Down
1 change: 0 additions & 1 deletion runners/google-cloud-dataflow-java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ evaluationDependsOn(":sdks:java:io:google-cloud-platform")
evaluationDependsOn(":sdks:java:core")
evaluationDependsOn(":examples:java")
evaluationDependsOn(":runners:google-cloud-dataflow-java:worker")
evaluationDependsOn(":sdks:java:container:java8")
evaluationDependsOn(":sdks:java:container:java11")

ext.dataflowLegacyEnvironmentMajorVersion = '8'
Expand Down
1 change: 0 additions & 1 deletion sdks/java/container/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ artifacts {
}

task pushAll {
dependsOn ":sdks:java:container:java8:docker"
dependsOn ":sdks:java:container:java11:docker"
dependsOn ":sdks:java:container:java17:docker"
dependsOn ":sdks:java:container:java21:docker"
Expand Down
24 changes: 0 additions & 24 deletions sdks/java/container/java8/build.gradle

This file was deleted.

47 changes: 0 additions & 47 deletions sdks/java/container/java8/java8-security.properties

This file was deleted.

9 changes: 0 additions & 9 deletions sdks/java/container/java8/option-java8-security.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public interface PortablePipelineOptions extends PipelineOptions, FileStagingOpt

@Description(
"Options for configuring the default environment of portable workers. This environment will be used for all executable stages except for external transforms. Recognized options depend on the value of defaultEnvironmentType:\n"
+ "DOCKER: docker_container_image (optional), e.g. 'apache/beam_java8_sdk:latest'. If unset, will default to the latest official release of the Beam Java SDK corresponding to your Java runtime version (8 or 11).\n"
+ "DOCKER: docker_container_image (optional), e.g. 'apache/beam_java21_sdk:latest'. If unset, will default to the latest official release of the Beam Java SDK corresponding to your Java runtime version (11, 17 or 21).\n"
+ "EXTERNAL: external_service_address (required), e.g. 'localhost:50000'\n"
+ "PROCESS: process_command (required), process_variables (optional). process_command must be the location of an executable file that starts a Beam SDK worker. process_variables is a comma-separated list of environment variable assignments which will be set before running the process, e.g. 'FOO=a,BAR=b'\n\n"
+ "environmentOptions and defaultEnvironmentConfig are mutually exclusive. Prefer environmentOptions.")
Expand Down
6 changes: 3 additions & 3 deletions sdks/python/apache_beam/examples/kafkataxi/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ prerequisites and additional information.

```sh
export DOCKER_ROOT="Your Docker Repository Root"
./gradlew :sdks:java:container:java8:docker -Pdocker-repository-root=$DOCKER_ROOT -Pdocker-tag=latest
docker push $DOCKER_ROOT/beam_java8_sdk:latest
./gradlew :sdks:java:container:java11:docker -Pdocker-repository-root=$DOCKER_ROOT -Pdocker-tag=latest
docker push $DOCKER_ROOT/beam_java11_sdk:latest
```

For portable Flink/Spark in local mode, instead of above command just build the
Expand Down Expand Up @@ -184,5 +184,5 @@ python -m apache_beam.examples.kafkataxi.kafka_taxi \
--num_workers $NUM_WORKERS \
--job_name $JOB_NAME \
--bootstrap_servers $BOOTSTRAP_SERVER \
--sdk_harness_container_image_overrides ".*java.*,${DOCKER_ROOT}/beam_java8_sdk:latest"
--sdk_harness_container_image_overrides ".*java.*,${DOCKER_ROOT}/beam_java11_sdk:latest"
```
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"\n",
"- Have the Java expansion service shadowjar built. Go to the root directory of your local beam repo and then execute:\n",
" `./gradlew :sdks:java:extensions:sql:expansion-service:shadowJar`.\n",
"- Based on your jdk version, pull the docker image `docker pull apache/beam_java11_sdk` or `docker pull apache/beam_java8_sdk`.\n",
"- Based on your jdk version, pull the docker image `docker pull apache/beam_java11_sdk` or java17, java21.\n",
"- Then tag the image with your current Beam dev version. You can check the dev version under `apache_beam.version.__version__`. For example, if you're using jdk11 and dev version is `x.x.x.dev`, execute `docker image tag apache/beam_java11_sdk:latest apache/beam_java11_sdk:x.x.x.dev`."
]
},
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/test-suites/dataflow/common.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ project(":sdks:python:test-suites:xlang").ext.xlangTasks.each { taskMetadata ->
"--project=${gcpProject}",
"--region=${gcpRegion}",
"--sdk_container_image=gcr.io/apache-beam-testing/beam-sdk/beam_python${project.ext.pythonVersion}_sdk:latest",
"--sdk_harness_container_image_overrides=.*java.*,gcr.io/apache-beam-testing/beam-sdk/beam_java8_sdk:latest"
"--sdk_harness_container_image_overrides=.*java.*,gcr.io/apache-beam-testing/beam-sdk/beam_java11_sdk:latest"
],
pytestOptions: basicPytestOpts,
additionalDeps: taskMetadata.additionalDeps,
Expand Down
1 change: 0 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ include(":sdks:java:bom:gcp")
include(":sdks:java:build-tools")
include(":sdks:java:container")
include(":sdks:java:container:agent")
include(":sdks:java:container:java8")
include(":sdks:java:container:java11")
include(":sdks:java:container:java17")
include(":sdks:java:container:java21")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,13 @@ This method requires building image artifacts from Beam source. For additional i
```
$> docker images --digests
REPOSITORY TAG DIGEST IMAGE ID CREATED SIZE
apache/beam_java8_sdk latest sha256:... ... 1 min ago ...
apache/beam_java11_sdk latest sha256:... ... 1 min ago ...
apache/beam_java17_sdk latest sha256:... ... 1 min ago ...
apache/beam_python3.6_sdk latest sha256:... ... 1 min ago ...
apache/beam_python3.7_sdk latest sha256:... ... 1 min ago ...
apache/beam_python3.8_sdk latest sha256:... ... 1 min ago ...
apache/beam_java21_sdk latest sha256:... ... 1 min ago ...
apache/beam_python3.9_sdk latest sha256:... ... 1 min ago ...
apache/beam_python3.10_sdk latest sha256:... ... 1 min ago ...
apache/beam_python3.11_sdk latest sha256:... ... 1 min ago ...
apache/beam_python3.12_sdk latest sha256:... ... 1 min ago ...
apache/beam_go_sdk latest sha256:... ... 1 min ago ...
```

Expand Down
Loading