Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix secrel issues #3847

Merged
merged 4 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion domain-cc/cc-app/src/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
2 changes: 1 addition & 1 deletion domain-ee/ee-ep-merge-app/src/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
2 changes: 1 addition & 1 deletion domain-ee/ee-max-cfi-app/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
requires = ["setuptools >= 70.0.0"]
requires = ["setuptools >= 75.6.0"]
# pyproject.toml
[tool.pytest.ini_options]
minversion = "6.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion shared/lib-hoppy/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools >= 70.0.0"]
requires = ["setuptools >= 75.6.0"]
build-backend = "setuptools.build_meta"

[project]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
// likely 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() {
Expand Down
Loading