ibzib commented on a change in pull request #13691:
URL: https://github.com/apache/beam/pull/13691#discussion_r554124322
##########
File path: sdks/java/core/build.gradle
##########
@@ -49,11 +49,11 @@ interface for processing virtually any size data. This
artifact includes entire Apache Beam Java SDK."""
processResources {
+ inputs.property('version', version)
+ inputs.property('sdk_version', sdk_version)
filter org.apache.tools.ant.filters.ReplaceTokens, tokens: [
'pom.version': version,
'pom.sdk_version': sdk_version,
- 'pom.docker_image_default_repo_root': docker_image_default_repo_root,
Review comment:
> I can see that `docker_image_default_repo_root` is still used in this
codebase and this file, but it isn't used as a replacement token in the
processResource task from what I can see. Perhaps I am missing something
though. Can you explain where the `docker_image_default_repo_root` is replaced
or how it is used?
Oh, you're correct. That's strange, it looks like ReleaseInfo.java looks for
`docker_image_default_repo_root` and `docker_image_default_repo_prefix` in
sdk.properties, but it is never written because the sdk.properties template is
missing placeholders for those fields. That seems like a bug to me. We should
add those fields to the sdk.properties template.
##########
File path: sdks/java/core/build.gradle
##########
@@ -49,6 +49,10 @@ interface for processing virtually any size data. This
artifact includes entire Apache Beam Java SDK."""
processResources {
+ inputs.property('version', version)
+ inputs.property('sdk_version', sdk_version)
+ inputs.property('docker_image_default_repo_root', sdk_version)
+ inputs.property('docker_image_default_repo_prefix', sdk_version)
Review comment:
```suggestion
inputs.property('docker_image_default_repo_prefix',
docker_image_default_repo_prefix)
```
##########
File path: sdks/java/core/build.gradle
##########
@@ -49,6 +49,10 @@ interface for processing virtually any size data. This
artifact includes entire Apache Beam Java SDK."""
processResources {
+ inputs.property('version', version)
+ inputs.property('sdk_version', sdk_version)
+ inputs.property('docker_image_default_repo_root', sdk_version)
Review comment:
```suggestion
inputs.property('docker_image_default_repo_root',
docker_image_default_repo_root)
```
##########
File path: sdks/java/core/src/main/resources/org/apache/beam/sdk/sdk.properties
##########
@@ -18,3 +18,5 @@
[email protected]@
[email protected]_version@
[email protected]_image_default_repo_root@
+docker_image_default_repo_prefix=@docker_image_default_repo_prefix@
Review comment:
```suggestion
[email protected]_image_default_repo_prefix@
```
##########
File path: sdks/java/core/src/main/resources/org/apache/beam/sdk/sdk.properties
##########
@@ -18,3 +18,5 @@
[email protected]@
[email protected]_version@
[email protected]_image_default_repo_root@
+docker_image_default_repo_prefix=@docker_image_default_repo_prefix@
Review comment:
(I don't know if the `pom` part is significant, but some Dataflow Runner
code assumes it's there so it's probably best to keep the pattern here.)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
