[beam] branch master updated: Fix sdk.properties caching, remove timestamp.

[ib...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ibzib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new c72fac9  Fix sdk.properties caching, remove timestamp.
     new d3422f3  Merge pull request #13652 from runningcode/no/remove-timestamp
c72fac9 is described below

commit c72fac9673e4fb8de63c981715bc748735b90de6
Author: Nelson Osacky <no...@gradle.com>
AuthorDate: Mon Jan 4 21:00:48 2021 +0100

    Fix sdk.properties caching, remove timestamp.
    
    This PR does two things.
    1. It removes the timestamp from the sdk.properties file.
    2. This doesn't ignore the `sdk.properties` anymore for the purposes of the runtime classpath. This means that the tests will rerun when the versions change.
    
    This PR assumes that [there is no need for the timestamp in the sdk.properties](https://github.com/apache/beam/pull/13597#issuecomment-750423282). If there is such a need, the other option to resolve this issue is to wait until Gradle 6.8 is released which will have the ability to ignore specific properties [such as the timestamp](https://docs.gradle.org/6.8-rc-3/release-notes.html#more-cache-hits-for-tasks-with-runtime-classpaths) in the sdk.properties file.
    
    See the discussion on [the PR](https://github.com/apache/beam/pull/13597) for more information.
---
 build.gradle                                                     | 9 ---------
 sdks/java/core/build.gradle                                      | 1 -
 .../core/src/main/resources/org/apache/beam/sdk/sdk.properties   | 3 ---
 3 files changed, 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index 15cfc24..12f355d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -381,12 +381,3 @@ if (project.hasProperty('compileAndRunTestsWithJava11')) {
     }
   }
 }
-
-// Ignore sdk.properties so it doesn't spoil the build cache unnecessarily (see https://docs.gradle.org/6.6/userguide/more_about_tasks.html#sec:configure_input_normalization)
-allprojects {
-  normalization {
-    runtimeClasspath {
-      ignore('**/sdk.properties')
-    }
-  }
-}
\ No newline at end of file
diff --git a/sdks/java/core/build.gradle b/sdks/java/core/build.gradle
index e8b07f6..99264d0 100644
--- a/sdks/java/core/build.gradle
+++ b/sdks/java/core/build.gradle
@@ -54,7 +54,6 @@ processResources {
     'pom.sdk_version': sdk_version,
     'pom.docker_image_default_repo_root': docker_image_default_repo_root,
     'pom.docker_image_default_repo_prefix': docker_image_default_repo_prefix,
-    'timestamp': new Date().format("yyyy-MM-dd HH:mm")
   ]
 }
 
diff --git a/sdks/java/core/src/main/resources/org/apache/beam/sdk/sdk.properties b/sdks/java/core/src/main/resources/org/apache/beam/sdk/sdk.properties
index 3320a4c..af09037 100644
--- a/sdks/java/core/src/main/resources/org/apache/beam/sdk/sdk.properties
+++ b/sdks/java/core/src/main/resources/org/apache/beam/sdk/sdk.properties
@@ -18,6 +18,3 @@
 
 version=@pom.version@
 sdk_version=@pom.sdk_version@
-
-build.date=@timestamp@
-