From 19799d10c8332da58ed7a25994486766e121e445 Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 14 Apr 2022 16:57:37 -0700 Subject: [PATCH] Disable overridden and custom dependency management for Eclipse Jetty. Apache Geode 1.14.4 is based on Eclipse Jetty 9; However, Spring Boot 3 upgraded the declared and managed Eclipse Jetty dependency to 11 in order to align with the Jakarta EE 9 migration and baseline. Rolling back the Eclipse Jetty version override and dependency management to again align with Spring Boot 3. Resolves #116. --- gradle.properties | 2 +- gradle/dependency-management.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index d20f9b09..493bc7f4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 antlrVersion=2.7.7 apacheGeodeVersion=1.14.4 awaitilityVersion=4.2.0 -eclipseJettyVersion=9.4.39.v20210325 +#eclipseJettyVersion=9.4.39.v20210325 findbugsVersion=3.0.2 #micrometerVersion=1.9.0-SNAPSHOT multithreadedtcVersion=1.01 diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index aea43a37..614ecb2f 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -1,4 +1,4 @@ -ext['jetty.version'] = "$eclipseJettyVersion" +//ext['jetty.version'] = "$eclipseJettyVersion" //ext['micrometer.version'] = "$micrometerVersion" dependencyManagement { @@ -21,7 +21,7 @@ dependencyManagement { // Declared and managed Eclipse Jetty (BOM) version based on Apache Geode 1.14.3's declared, required Jetty // version (9.x)! This Jetty version is incompatible with Jakarta EE 9 and Spring Boot 3. Spring Boot 3 // declares and uses Jetty 11. - mavenBom "org.eclipse.jetty:jetty-bom:$eclipseJettyVersion" + //mavenBom "org.eclipse.jetty:jetty-bom:$eclipseJettyVersion" // Declared and managed Testcontainers libraries version. mavenBom "org.testcontainers:testcontainers-bom:$testcontainersVersion"