From 80cdd1924951fd188b502dde99e05a07edeb30da Mon Sep 17 00:00:00 2001 From: dotasek Date: Thu, 7 Dec 2023 09:07:02 -0500 Subject: [PATCH] Bump netty and logback --- build.gradle.kts | 9 ++++++--- gradle.properties | 5 +++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 96bc094..73f2878 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -51,7 +51,7 @@ dependencies { implementation("ca.uhn.hapi.fhir", "org.hl7.fhir.convertors", property("fhirCoreVersion").toString()) implementation("ca.uhn.hapi.fhir", "org.hl7.fhir.validation", property("fhirCoreVersion").toString()) implementation("org.eclipse.jgit", "org.eclipse.jgit", "6.7.0.202309050840-r") - implementation("ch.qos.logback", "logback-classic", "1.2.3") + implementation("ch.qos.logback", "logback-classic", property("logbackVersion").toString()) implementation("com.google.code.gson", "gson", "2.8.9") implementation("commons-beanutils","commons-beanutils") @@ -175,10 +175,13 @@ dependencies { implementation("org.eclipse.jetty.http2:http2-http-client-transport:11.0.17") { because("previous versions have a bug impacting this application") } - implementation("io.netty:netty-handler:4.1.100.Final") { + implementation("io.netty:netty-handler:" + property("nettyConstrainedVersion").toString()) { + because("previous versions have a bug impacting this application") + } + implementation("io.netty:netty-transport-classes-epoll:" + property("nettyConstrainedVersion").toString()) { because("previous versions have a bug impacting this application") } - implementation("io.netty:netty-transport-classes-epoll:4.1.100.Final") { + implementation("io.netty:netty-transport-native-epoll:" + property("nettyConstrainedVersion").toString()) { because("previous versions have a bug impacting this application") } } diff --git a/gradle.properties b/gradle.properties index fdc2fa5..60d658b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ fhirCoreVersion = 6.2.6-SNAPSHOT apachePoiVersion = 5.2.1 -jacksonVersion = 2.14.0 +jacksonVersion = 2.16.0 apacheHttpcomponentsVersion = 4.5.13 apacheHttpcomponents5Version = 5.0.4 apacheJenaVersion = 4.2.0 @@ -8,6 +8,7 @@ log4jVersion = 2.17.1 slf4jVersion = 1.7.36 jettyVersion = 11.0.17 -logbackVersion = 1.2.9 +logbackVersion = 1.2.13 +nettyConstrainedVersion = 4.1.101.Final ## Leave the subsequent line blank for additional properties appended by azure builds