From 38713e04866d759eb112a1b33ae3e422f2bd145e Mon Sep 17 00:00:00 2001 From: Ponnia Muyen Date: Mon, 9 Dec 2024 18:57:44 -0500 Subject: [PATCH 1/4] Fix secrel issues --- domain-cc/cc-app/src/requirements.txt | 2 +- domain-ee/ee-ep-merge-app/src/requirements.txt | 2 +- domain-ee/ee-max-cfi-app/pyproject.toml | 2 +- .../src/main/groovy/shared.java.vro-dep-constraints.gradle | 4 ++-- shared/lib-hoppy/pyproject.toml | 2 +- .../gov/va/vro/metricslogging/MetricLoggerServiceTest.java | 3 +-- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/domain-cc/cc-app/src/requirements.txt b/domain-cc/cc-app/src/requirements.txt index 2b3f9cb857..c732c83fb5 100644 --- a/domain-cc/cc-app/src/requirements.txt +++ b/domain-cc/cc-app/src/requirements.txt @@ -3,6 +3,6 @@ httpx==0.24.* pika==1.3.* pydantic==2.6.1 pytest==7.3.1 -setuptools>=70.0.0 +setuptools>=75.6.0 starlette>=0.40.0 uvicorn[standard]==0.20.* diff --git a/domain-ee/ee-ep-merge-app/src/requirements.txt b/domain-ee/ee-ep-merge-app/src/requirements.txt index c39befb243..e46af7e7b7 100644 --- a/domain-ee/ee-ep-merge-app/src/requirements.txt +++ b/domain-ee/ee-ep-merge-app/src/requirements.txt @@ -9,7 +9,7 @@ pytest-cov==5.0.0 pytest-env==1.0.1 pytest-mock==3.11.1 python-statemachine==2.1.* -setuptools>=70.0.0 +setuptools>=75.6.0 SQLAlchemy==2.0.* starlette>=0.40.0 uvicorn[standard]==0.20.* diff --git a/domain-ee/ee-max-cfi-app/pyproject.toml b/domain-ee/ee-max-cfi-app/pyproject.toml index 2cdb36cc2e..53d211c994 100644 --- a/domain-ee/ee-max-cfi-app/pyproject.toml +++ b/domain-ee/ee-max-cfi-app/pyproject.toml @@ -1,4 +1,4 @@ -requires = ["setuptools >= 70.0.0"] +requires = ["setuptools >= 75.6.0"] # pyproject.toml [tool.pytest.ini_options] minversion = "6.0" diff --git a/gradle-plugins/src/main/groovy/shared.java.vro-dep-constraints.gradle b/gradle-plugins/src/main/groovy/shared.java.vro-dep-constraints.gradle index 2c3f16f238..249ed97001 100644 --- a/gradle-plugins/src/main/groovy/shared.java.vro-dep-constraints.gradle +++ b/gradle-plugins/src/main/groovy/shared.java.vro-dep-constraints.gradle @@ -48,12 +48,12 @@ dependencies { implementation 'ca.uhn.hapi.fhir:org.hl7.fhir.r4b:5.6.92' implementation 'ca.uhn.hapi.fhir:org.hl7.fhir.convertors:5.6.92' - implementation 'io.netty:netty-handler:4.1.105.Final' + implementation 'io.netty:netty-handler:4.1.115.Final' // For Kafka svc-bie-kafka service override implementation('org.xerial.snappy:snappy-java:1.1.10.4') - implementation('com.google.guava:guava:33.0.0-jre') + implementation('com.google.guava:guava:33.3.1-jre') implementation 'org.bouncycastle:bcpkix-jdk18on:1.74' implementation 'org.webjars:swagger-ui:4.1.3' implementation 'org.springframework.kafka:spring-kafka:2.9.11' diff --git a/shared/lib-hoppy/pyproject.toml b/shared/lib-hoppy/pyproject.toml index 2060056ae8..d6b55887c9 100644 --- a/shared/lib-hoppy/pyproject.toml +++ b/shared/lib-hoppy/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools >= 70.0.0"] +requires = ["setuptools >= 75.6.0"] build-backend = "setuptools.build_meta" [project] diff --git a/shared/lib-metrics/src/test/java/gov/va/vro/metricslogging/MetricLoggerServiceTest.java b/shared/lib-metrics/src/test/java/gov/va/vro/metricslogging/MetricLoggerServiceTest.java index 6b56a94d49..fc91a833cb 100644 --- a/shared/lib-metrics/src/test/java/gov/va/vro/metricslogging/MetricLoggerServiceTest.java +++ b/shared/lib-metrics/src/test/java/gov/va/vro/metricslogging/MetricLoggerServiceTest.java @@ -137,8 +137,7 @@ void testGetTimestamp() { // TODO: This test is commented out because it is flaky and causing CI pipeline failures. // It intermittently fails due to depracated gradle version as well as due to a mismatch in the - // test assertions, - // likely caused by unexpected values in the generated DistributionPointsPayload. + // test assertions,selikely caused by unexpected values in the generated DistributionPointsPayload. // The gradle version has been upgraded at this time and this test requires further investigation. // @Test From d7bc947cdd08fcedad26385138860025e5ae4b16 Mon Sep 17 00:00:00 2001 From: Ponnia Muyen Date: Mon, 9 Dec 2024 19:20:46 -0500 Subject: [PATCH 2/4] fix java lint test --- .../gov/va/vro/metricslogging/MetricLoggerServiceTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shared/lib-metrics/src/test/java/gov/va/vro/metricslogging/MetricLoggerServiceTest.java b/shared/lib-metrics/src/test/java/gov/va/vro/metricslogging/MetricLoggerServiceTest.java index fc91a833cb..c78467a67c 100644 --- a/shared/lib-metrics/src/test/java/gov/va/vro/metricslogging/MetricLoggerServiceTest.java +++ b/shared/lib-metrics/src/test/java/gov/va/vro/metricslogging/MetricLoggerServiceTest.java @@ -137,7 +137,8 @@ void testGetTimestamp() { // TODO: This test is commented out because it is flaky and causing CI pipeline failures. // It intermittently fails due to depracated gradle version as well as due to a mismatch in the - // test assertions,selikely caused by unexpected values in the generated DistributionPointsPayload. + // test assertions,selikely caused by unexpected values in the generated + // DistributionPointsPayload. // The gradle version has been upgraded at this time and this test requires further investigation. // @Test From e3273c0ef34c81a1fe2f6a9091b07ee9be410ed8 Mon Sep 17 00:00:00 2001 From: Ponnia Muyen Date: Mon, 9 Dec 2024 19:24:03 -0500 Subject: [PATCH 3/4] fix java lint test --- .../gov/va/vro/metricslogging/MetricLoggerServiceTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/shared/lib-metrics/src/test/java/gov/va/vro/metricslogging/MetricLoggerServiceTest.java b/shared/lib-metrics/src/test/java/gov/va/vro/metricslogging/MetricLoggerServiceTest.java index c78467a67c..8c3bcee109 100644 --- a/shared/lib-metrics/src/test/java/gov/va/vro/metricslogging/MetricLoggerServiceTest.java +++ b/shared/lib-metrics/src/test/java/gov/va/vro/metricslogging/MetricLoggerServiceTest.java @@ -136,10 +136,8 @@ void testGetTimestamp() { } // TODO: This test is commented out because it is flaky and causing CI pipeline failures. - // It intermittently fails due to depracated gradle version as well as due to a mismatch in the - // test assertions,selikely caused by unexpected values in the generated - // DistributionPointsPayload. - // The gradle version has been upgraded at this time and this test requires further investigation. + // It intermittently fails due to deprecated gradle version as well as due to a mismatch + // in the test assertions. This test requires further investigation. // @Test // void testCreateDistributionPointsPayload() { From 95d68b4023518fa4521ba922eb4dd349335db430 Mon Sep 17 00:00:00 2001 From: Ponnia Muyen Date: Mon, 9 Dec 2024 19:52:22 -0500 Subject: [PATCH 4/4] Fix formatting issues in MetricLoggerServiceTest.java --- .../java/gov/va/vro/metricslogging/MetricLoggerServiceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/lib-metrics/src/test/java/gov/va/vro/metricslogging/MetricLoggerServiceTest.java b/shared/lib-metrics/src/test/java/gov/va/vro/metricslogging/MetricLoggerServiceTest.java index 8c3bcee109..9e318b2e79 100644 --- a/shared/lib-metrics/src/test/java/gov/va/vro/metricslogging/MetricLoggerServiceTest.java +++ b/shared/lib-metrics/src/test/java/gov/va/vro/metricslogging/MetricLoggerServiceTest.java @@ -136,7 +136,7 @@ void testGetTimestamp() { } // TODO: This test is commented out because it is flaky and causing CI pipeline failures. - // It intermittently fails due to deprecated gradle version as well as due to a mismatch + // It intermittently fails due to deprecated gradle version as well as due to a mismatch // in the test assertions. This test requires further investigation. // @Test