From dbcdec738695a470e4f211dca83385ea63c055af Mon Sep 17 00:00:00 2001 From: Charles Rothrock Date: Fri, 9 Dec 2022 12:15:30 -0500 Subject: [PATCH 1/2] Update CHANGES.md remove whitespace line endings --- CHANGES.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index b1b76063a4e7..68a8ff96db94 100644 --- a/CHANGES.md +++ b/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 From 9b905a883ae199877c6dc362006847af2d6d6ed0 Mon Sep 17 00:00:00 2001 From: Charles Rothrock Date: Fri, 9 Dec 2022 12:30:29 -0500 Subject: [PATCH 2/2] Fix invalid copy task configuration --- sdks/java/container/common.gradle | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/sdks/java/container/common.gradle b/sdks/java/container/common.gradle index 9c28271de894..7aeaae4e01fb 100644 --- a/sdks/java/container/common.gradle +++ b/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 \ No newline at end of file +dockerPrepare.dependsOn validateJavaHome