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
5 changes: 4 additions & 1 deletion runners/google-cloud-dataflow-java/arm/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,14 @@ evaluationDependsOn(":runners:google-cloud-dataflow-java:worker")
evaluationDependsOn(":sdks:java:container:java11")

processResources {
filter org.apache.tools.ant.filters.ReplaceTokens, tokens: [
// Filter arguments are not tracked by Gradle, so declare the tokens as an input property.
def resourceTokens = [
'dataflow.fnapi_environment_major_version' : project(':runners:google-cloud-dataflow-java').ext.dataflowFnapiEnvironmentMajorVersion,
'dataflow.fnapi_container_version' : project(':runners:google-cloud-dataflow-java').ext.dataflowFnapiContainerVersion,
'dataflow.container_base_repository' : project(':runners:google-cloud-dataflow-java').ext.dataflowContainerBaseRepository,
]
inputs.property('resourceTokens', resourceTokens)
filter org.apache.tools.ant.filters.ReplaceTokens, tokens: resourceTokens
}

// Exclude tests that need a runner
Expand Down
5 changes: 4 additions & 1 deletion runners/google-cloud-dataflow-java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,16 @@ ext.dataflowFnapiContainerVersion = 'beam-master-20260731'
ext.dataflowContainerBaseRepository = 'gcr.io/cloud-dataflow/v1beta3'

processResources {
filter org.apache.tools.ant.filters.ReplaceTokens, tokens: [
// Filter arguments are not tracked by Gradle, so declare the tokens as an input property.
def resourceTokens = [
'dataflow.legacy_environment_major_version' : project.ext.dataflowFnapiEnvironmentMajorVersion,
'dataflow.fnapi_environment_major_version' : project.ext.dataflowFnapiEnvironmentMajorVersion,
'dataflow.legacy_container_version' : project.ext.dataflowLegacyContainerVersion,
'dataflow.fnapi_container_version' : project.ext.dataflowFnapiContainerVersion,
'dataflow.container_base_repository' : project.ext.dataflowContainerBaseRepository,
]
inputs.property('resourceTokens', resourceTokens)
filter org.apache.tools.ant.filters.ReplaceTokens, tokens: resourceTokens
}

// Exclude tests that need a runner
Expand Down
5 changes: 4 additions & 1 deletion sdks/java/extensions/sql/jdbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,12 @@ dependencies {
}

processResources {
filter org.apache.tools.ant.filters.ReplaceTokens, tokens: [
// Filter arguments are not tracked by Gradle, so declare the tokens as an input property.
def resourceTokens = [
'beam.version': version,
]
inputs.property('resourceTokens', resourceTokens)
filter org.apache.tools.ant.filters.ReplaceTokens, tokens: resourceTokens
}

shadowJar {
Expand Down
5 changes: 4 additions & 1 deletion sdks/java/maven-archetypes/examples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ example pipelines from the Apache Beam Java SDK."""

processResources {
dependsOn 'generateSources'
filter org.apache.tools.ant.filters.ReplaceTokens, tokens: [
// Filter arguments are not tracked by Gradle, so declare the tokens as an input property.
def resourceTokens = [
'project.version': version,
'bigquery.version': dependencies.create(project.library.java.google_api_services_bigquery).getVersion(),
'google-api-client.version': dependencies.create(project.library.java.google_api_client).getVersion(),
Expand All @@ -49,6 +50,8 @@ processResources {
'maven-surefire-plugin.version': dependencies.create(project.library.maven.maven_surefire_plugin).getVersion(),
'flink.artifact.name': 'beam-runners-flink-'.concat(project(":runners:flink:${project.ext.latestFlinkVersion}").getName()),
]
inputs.property('resourceTokens', resourceTokens)
filter org.apache.tools.ant.filters.ReplaceTokens, tokens: resourceTokens
}

/*
Expand Down
5 changes: 4 additions & 1 deletion sdks/java/maven-archetypes/gcp-bom-examples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ using the Beam Google Cloud Platform BOM"""

processResources {
dependsOn 'generateSources'
filter org.apache.tools.ant.filters.ReplaceTokens, tokens: [
// Filter arguments are not tracked by Gradle, so declare the tokens as an input property.
def resourceTokens = [
'project.version': version,
'bigquery.version': dependencies.create(project.library.java.google_api_services_bigquery).getVersion(),
'google-api-client.version': dependencies.create(project.library.java.google_api_client).getVersion(),
Expand All @@ -48,6 +49,8 @@ processResources {
'maven-surefire-plugin.version': dependencies.create(project.library.maven.maven_surefire_plugin).getVersion(),
'flink.artifact.name': 'beam-runners-flink-'.concat(project(":runners:flink:${project.ext.latestFlinkVersion}").getName()),
]
inputs.property('resourceTokens', resourceTokens)
filter org.apache.tools.ant.filters.ReplaceTokens, tokens: resourceTokens
}

/*
Expand Down
5 changes: 4 additions & 1 deletion sdks/java/maven-archetypes/starter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,13 @@ ext.summary = """A Maven archetype to create a simple starter pipeline to
get started using the Apache Beam Java SDK."""

processResources {
filter org.apache.tools.ant.filters.ReplaceTokens, tokens: [
// Filter arguments are not tracked by Gradle, so declare the tokens as an input property.
def resourceTokens = [
'project.version': version,
'slf4j.version': dependencies.create(project.library.java.slf4j_api).getVersion(),
'maven-compiler-plugin.version': dependencies.create(project.library.maven.maven_compiler_plugin).getVersion(),
'maven-exec-plugin.version': dependencies.create(project.library.maven.maven_exec_plugin).getVersion(),
]
inputs.property('resourceTokens', resourceTokens)
filter org.apache.tools.ant.filters.ReplaceTokens, tokens: resourceTokens
}
Loading