From f56714e5fe6f40791076d96ca20924c5637b1967 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Mon, 17 Jun 2024 11:52:57 -0700 Subject: [PATCH] Test Tomcat 10.1.25 --- build.gradle | 6 +++--- gradle.properties | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index c6227051ec..c1dba23059 100644 --- a/build.gradle +++ b/build.gradle @@ -159,9 +159,9 @@ allprojects { // Temporarily uncomment the block below and update the four-digit number to allow building with Tomcat versions that // haven't been released yet. The "VOTE" emails sent to the Tomcat dev email list include a staging repo URL. In // addition to updating the url to match, you'll also need to update apacheTomcatVersion in gradle.properties. -// maven { -// url "https://repository.apache.org/content/repositories/orgapachetomcat-1322/" -// } + maven { + url "https://repository.apache.org/content/repositories/orgapachetomcat-1498/" + } maven { // Mondrian dependencies are available via this repository. It's a direct dependency of the Query // module but is declared here as many modules depend on Query and therefore need it as well. diff --git a/gradle.properties b/gradle.properties index ca9b8d35f1..52c5ea19c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -103,7 +103,7 @@ apacheDirectoryVersion=2.1.3 apacheMinaVersion=2.2.1 # Keep in sync with springBootTomcatVersion below -apacheTomcatVersion=10.1.24 +apacheTomcatVersion=10.1.25 # (mothership) -> json-path -> json-smart -> accessor-smart # (core) -> graalvm @@ -289,7 +289,7 @@ snappyJavaVersion=1.1.10.5 springBootVersion=3.2.6 # This usually matches the Tomcat version dictated by springBootVersion # Also, keep this in sync with apacheTomcatVersion above -springBootTomcatVersion=10.1.24 +springBootTomcatVersion=10.1.25 springVersion=6.1.8