Merge branch 'master' of https://github.com/cwrothrock/beam

merging browser changes

CHANGES.md

@@ -63,10 +63,10 @@
 ## New Features / Improvements
 
 * X feature added (Java/Python) ([#X](https://github.com/apache/beam/issues/X)).
-* Adding override of allowed TLS algorithms (Java), now maintaining the disabled/legacy algorithms 
+* Adding override of allowed TLS algorithms (Java), now maintaining the disabled/legacy algorithms
   present in 2.43.0 (up to 1.8.0_151, 11.0.9, 17.0.2 for respective Java versions). This primarily
-  re-enables TLSv1 and TLSv1.1 for Java 8 and Java 11 by default, and gives control over this 
-  property for JVMs in the future. 
+  re-enables TLSv1 and TLSv1.1 for Java 8 and Java 11 by default, and gives control over this
+  property for JVMs in the future.
 
 ## Breaking Changes
 

sdks/java/container/common.gradle

@@ -80,13 +80,10 @@ task copyGolangLicenses(type: Copy) {
 task copyJdkOptions(type: Copy) {
     if (imageJavaVersion == "17" || imageJavaVersion == "11") {
         from "option-jamm.json"
-        into "build/target/options"
-    }
-
-    into("build/target/options") {
-        from "jdk${imageJavaVersion}-tls.properties"
-        from "option-tls-${imageJavaVersion}.json"
     }
+    from "jdk${imageJavaVersion}-tls.properties"
+    from "option-tls-${imageJavaVersion}.json"
+    into "build/target/options"
 }
 
 task skipPullLicenses(type: Exec) {
@@ -134,4 +131,4 @@ dockerPrepare.dependsOn copySdkHarnessLauncher
 dockerPrepare.dependsOn copyDockerfileDependencies
 dockerPrepare.dependsOn ":sdks:java:container:downloadCloudProfilerAgent"
 dockerPrepare.dependsOn copyJdkOptions
-dockerPrepare.dependsOn validateJavaHome
+dockerPrepare.dependsOn validateJavaHome