From a9a6f5d82a5b9e0458d27d1ee3287bb6fc244546 Mon Sep 17 00:00:00 2001 From: Dan Baxter Date: Tue, 25 Jan 2022 13:35:47 -0600 Subject: [PATCH] Release 3.2 1.1.1 (#30) * Increase timeout after deleting jobmanager pod Signed-off-by: Fred Ricci <60147759+FRicci618@users.noreply.github.com> * Run Nightly Signed-off-by: Fred Ricci <60147759+FRicci618@users.noreply.github.com> * revert after testing Signed-off-by: Fred Ricci <60147759+FRicci618@users.noreply.github.com> * Update error message Signed-off-by: Fred Ricci <60147759+FRicci618@users.noreply.github.com> * WHFHRI-745: Upgrade to flink 1.14.3 (#29) * WHFHRI-745: Upgrade to flink 1.14.3 Signed-off-by: Dan Baxter * WHFHRI-745: Upgrade to log4j 2.17.1 Signed-off-by: Dan Baxter * WHFHRI-745: Address vulnerabilities. Signed-off-by: Dan Baxter * WHFHRI-745: Fix commons-io version. Signed-off-by: Dan Baxter * Release v3.2-1.1.1 changes Signed-off-by: Dan Baxter Co-authored-by: Fred Ricci <60147759+FRicci618@users.noreply.github.com> --- build.gradle | 15 ++++++++------- ...link_validation_fhir_high_availability_spec.rb | 2 +- validator/build.gradle | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index b6d49e0..d658eab 100644 --- a/build.gradle +++ b/build.gradle @@ -20,19 +20,19 @@ plugins { allprojects { apply plugin: 'scala' group = 'org.alvearie.hri.flink' - version = '3.2-1.1.0' + version = '3.2-1.1.1' apply plugin: "org.sonatype.gradle.plugins.scan" ext { - pipelineCoreVersion = '3.2-1.1.0' + pipelineCoreVersion = '3.2-1.1.1' javaVersion = '1.8' - flinkVersion = '1.14.0' + flinkVersion = '1.14.3' scalaBinaryVersion = '2.12' scalaVersion = '2.12.11' scalaTestVersion = '3.1.1' jacksonVersion = '2.12.0' - log4jVersion = '2.13.2' + log4jVersion = '2.17.1' } sourceCompatibility = javaVersion @@ -89,7 +89,7 @@ allprojects { // pkg:maven/io.netty/netty@3.7.0.Final (from flink-test-utils) '20be5124-16a3-4d77-8668-d83f04a67808', '20167979-f872-4765-85ef-9b7be870cecb', 'f2a31abe-1af6-4f6f-aeeb-60e0e0d3e981', '6ff63cbd-c4ae-4268-be95-43322746b6be', '8b7d8928-61ee-4708-bf37-feece927a872', 'cbde3175-9c07-491c-836d-2a146b61e3b6', '846fbf13-a0b9-4cab-b820-8415a30326bd', 'b3c3a56f-37c0-4706-bf54-2f61c5c9786f', - 'a3df5795-2bdb-4ec6-b9c2-babe9ec470e5', '20b79835-7a43-4bea-a985-5e12df1d0b0a', + 'a3df5795-2bdb-4ec6-b9c2-babe9ec470e5', '20b79835-7a43-4bea-a985-5e12df1d0b0a', 'b6a1cffe-6f90-4b44-ad18-df9dc7dc6fc4', // pkg:maven/io.netty/netty@3.7.0.Final (from Snappy and Bzip2 compression components. Can’t force Flink to upgrade, and not used in Flink.) '14ed6543-1974-4241-b353-3afd846eadc9', '99b9cf63-0f91-43fb-b227-e53917370ed9', @@ -107,10 +107,11 @@ allprojects { 'bd0f0dd9-1356-4dec-a8a3-edc777cc92d5', 'b70e447a-06a1-48b0-a02b-cd5b78862777', //pkg:maven/org.apache.logging.log4j/log4j-core@2.11.2 (from org.scala-sbt:zinc_2.12:1.3.5 - Used by gradle scala plugin only) - 'd3477f9c-032a-44a7-a5e1-02ae35e4737c', + 'd3477f9c-032a-44a7-a5e1-02ae35e4737c', '9e818913-69a3-41c8-9bcc-6293b378c53a', 'f0ac54b6-9b81-45bb-99a4-e6cb54749f9d', '7cc258a5-d3ab-451f-bd27-415ae0e3b457', + 'edaf092e-e7f3-4c69-8f01-a5c6fc44890a', //pkg:maven/log4j/log4j@1.2.17 (from com.vladsch.flexmark:flexmark-all:0.35.10 - Used in Unit Test runs only) - 'e6e4ebea-da12-4bde-8f24-6272925ad093', + 'e6e4ebea-da12-4bde-8f24-6272925ad093', '4a7955ac-037c-42bc-a83e-b51efe2490af' ] // ossIndexAudit can be configured to exclude vulnerabilities from matching diff --git a/test/nightly/flink_validation_fhir_high_availability_spec.rb b/test/nightly/flink_validation_fhir_high_availability_spec.rb index 862863f..11ae206 100644 --- a/test/nightly/flink_validation_fhir_high_availability_spec.rb +++ b/test/nightly/flink_validation_fhir_high_availability_spec.rb @@ -152,7 +152,7 @@ Logger.new(STDOUT).info("Test messages sent to the #{@input_topic} topic") jar_found = false - Timeout.timeout(60, nil, 'Flink did not return a list of jars after 60 seconds') do + Timeout.timeout(90, nil, 'Flink did not return a list of jars after 90 seconds') do while true @response = @flink_helper.get_jars({'Authorization' => "Bearer #{@flink_api_oauth_token}"}) break if @response.code == 200 diff --git a/validator/build.gradle b/validator/build.gradle index cd4f8d4..c786ab0 100644 --- a/validator/build.gradle +++ b/validator/build.gradle @@ -18,7 +18,7 @@ dependencies { implementation "org.scala-lang:scala-library:${scalaVersion}" implementation "org.alvearie.hri.flink:hri-flink-pipeline-core:${pipelineCoreVersion}" - implementation "commons-io:commons-io:2.4" // not sure why this isn't getting picked up from hri-flink-pipeline-core + implementation "commons-io:commons-io:2.8.0" // not sure why this isn't getting picked up from hri-flink-pipeline-core implementation "org.apache.flink:flink-connector-kafka_${scalaBinaryVersion}:${flinkVersion}" // not sure why this isn't getting picked up from hri-flink-pipeline-core implementation "com.ibm.fhir:fhir-model:4.7.1"