You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by sh...@apache.org on 2024/04/30 09:26:14 UTC

(pulsar-manager) branch master updated: fix: spring boot 2.5 requires tomcat 9 (#559)

This is an automated email from the ASF dual-hosted git repository.

shoothzj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar-manager.git


The following commit(s) were added to refs/heads/master by this push:
     new 92124ea  fix: spring boot 2.5 requires tomcat 9 (#559)
92124ea is described below

commit 92124ea1ae00d24e55b7b49e49210494465b4b2c
Author: Bäm <de...@sandchaschte.ch>
AuthorDate: Tue Apr 30 11:26:09 2024 +0200

    fix: spring boot 2.5 requires tomcat 9 (#559)
    
    
    ### Motivation
    
    Running the master branch currently fails as there is a depdendency mismatch, spring boot 2.5 requires tomcat 9.
    
    ### Modifications
    
    - Update the gradle dependencies to use tomcat 9
    - TldParser is required, adding tomcat-embed-core as dependency
    
    ### Verifying this change
    
    - [X] Make sure that the change passes the `./gradlew build` checks.
---
 build.gradle      | 1 +
 gradle.properties | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2a65e8f..5560d01 100644
--- a/build.gradle
+++ b/build.gradle
@@ -142,6 +142,7 @@ dependencies {
         exclude group: 'org.slf4j', module: 'slf4j-jdk14'
         exclude group: 'org.herddb', module: '*'
     }
+    implementation (group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: tomcatVersion)
     implementation (group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: tomcatVersion)
     implementation group: 'org.glassfish.jersey.containers', name: 'jersey-container-servlet', version: jerseyVersion
     implementation group: 'org.glassfish.jersey.core', name: 'jersey-client', version: jerseyVersion
diff --git a/gradle.properties b/gradle.properties
index ede35b6..822925a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,6 +19,6 @@ postgresqlVersion=42.2.5
 herddbVersion=0.28.0
 commonsValidatorVersion=1.6
 bkvmVersion=3.1.1
-tomcatVersion=8.5.31
+tomcatVersion=9.0.52
 jerseyVersion=2.26
 bouncycastleVersion=1.68