From 9ebb10eebf902c155dfc902187398f1a16131cd5 Mon Sep 17 00:00:00 2001 From: chris Date: Sun, 14 Dec 2025 19:26:22 -0300 Subject: [PATCH 1/2] build: update struts2 and javax.servlet-api --- examples/rollbar-struts2-spring/build.gradle | 7 ++++--- examples/rollbar-struts2/build.gradle | 6 +++--- examples/rollbar-web/build.gradle | 2 +- rollbar-struts2/build.gradle | 9 +++------ rollbar-web/build.gradle | 7 +++---- 5 files changed, 14 insertions(+), 17 deletions(-) diff --git a/examples/rollbar-struts2-spring/build.gradle b/examples/rollbar-struts2-spring/build.gradle index f324e8b8..8dd5f26c 100755 --- a/examples/rollbar-struts2-spring/build.gradle +++ b/examples/rollbar-struts2-spring/build.gradle @@ -14,9 +14,10 @@ apply plugin: 'com.bmuschko.tomcat' dependencies { implementation project(":rollbar-struts2") - implementation 'javax.servlet:javax.servlet-api:3.1.0' - implementation 'org.apache.struts:struts2-core:2.5.25' - implementation 'org.apache.struts:struts2-spring-plugin:2.5.25' + implementation 'javax.servlet:javax.servlet-api:4.0.1' + //We can't update struts to version 7+ because it uses caffeine version 3+ which remove Java 8 + implementation 'org.apache.struts:struts2-core:6.8.0' + implementation 'org.apache.struts:struts2-spring-plugin:6.8.0' def tomcatVersion = '7.0.57' diff --git a/examples/rollbar-struts2/build.gradle b/examples/rollbar-struts2/build.gradle index caa90366..d2280401 100755 --- a/examples/rollbar-struts2/build.gradle +++ b/examples/rollbar-struts2/build.gradle @@ -13,9 +13,9 @@ apply plugin: 'com.bmuschko.tomcat' dependencies { implementation project(":rollbar-struts2") - - implementation 'org.apache.struts:struts2-core:2.5.25' - implementation 'javax.servlet:javax.servlet-api:3.1.0' + //We can't update struts to version 7+ because it uses caffeine version 3+ which remove Java 8 + implementation 'org.apache.struts:struts2-core:6.8.0' + implementation 'javax.servlet:javax.servlet-api:4.0.1' def tomcatVersion = '7.0.57' diff --git a/examples/rollbar-web/build.gradle b/examples/rollbar-web/build.gradle index ea6e8263..a9cc0c4d 100755 --- a/examples/rollbar-web/build.gradle +++ b/examples/rollbar-web/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'com.bmuschko.tomcat' dependencies { implementation project(":rollbar-web") - implementation 'javax.servlet:javax.servlet-api:3.1.0' + implementation 'javax.servlet:javax.servlet-api:4.0.1' def tomcatVersion = '7.0.57' diff --git a/rollbar-struts2/build.gradle b/rollbar-struts2/build.gradle index a384708c..f0dd4512 100644 --- a/rollbar-struts2/build.gradle +++ b/rollbar-struts2/build.gradle @@ -1,8 +1,5 @@ -ext { - struts2Version = '2.5.25' -} - dependencies { api project(":rollbar-web") - implementation 'org.apache.struts:struts2-core:' + struts2Version -} \ No newline at end of file + //We can't update struts to version 7+ because it uses caffeine version 3+ which remove Java 8 + implementation 'org.apache.struts:struts2-core:6.8.0' +} diff --git a/rollbar-web/build.gradle b/rollbar-web/build.gradle index 895e381b..be1e7250 100644 --- a/rollbar-web/build.gradle +++ b/rollbar-web/build.gradle @@ -1,7 +1,6 @@ dependencies { api project(':rollbar-java') - compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0' - - testImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0' -} \ No newline at end of file + compileOnly 'javax.servlet:javax.servlet-api:4.0.1' + testImplementation 'javax.servlet:javax.servlet-api:4.0.1' +} From 819afb51fc4fbde00df568ced703e5da33f265b9 Mon Sep 17 00:00:00 2001 From: chris Date: Sun, 14 Dec 2025 19:26:38 -0300 Subject: [PATCH 2/2] build: update logback --- rollbar-logback/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rollbar-logback/build.gradle b/rollbar-logback/build.gradle index e0a9b24c..3ff24e91 100644 --- a/rollbar-logback/build.gradle +++ b/rollbar-logback/build.gradle @@ -1,6 +1,6 @@ dependencies { api project(':rollbar-java') - api group: 'ch.qos.logback', name: 'logback-classic', version: '1.3.14' - api group: 'ch.qos.logback', name: 'logback-core', version: '1.3.14' + api 'ch.qos.logback:logback-classic:1.5.21' + api 'ch.qos.logback:logback-core:1.5.21' }