Skip to content

Commit c97abeb

Browse files
authored
[Feat][SDK-483] Update dependencies (#359)
* build: update struts2 and javax.servlet-api * build: update logback
1 parent 9a2e6a5 commit c97abeb

File tree

6 files changed

+16
-19
lines changed

6 files changed

+16
-19
lines changed

examples/rollbar-struts2-spring/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ apply plugin: 'com.bmuschko.tomcat'
1414
dependencies {
1515
implementation project(":rollbar-struts2")
1616

17-
implementation 'javax.servlet:javax.servlet-api:3.1.0'
18-
implementation 'org.apache.struts:struts2-core:2.5.25'
19-
implementation 'org.apache.struts:struts2-spring-plugin:2.5.25'
17+
implementation 'javax.servlet:javax.servlet-api:4.0.1'
18+
//We can't update struts to version 7+ because it uses caffeine version 3+ which remove Java 8
19+
implementation 'org.apache.struts:struts2-core:6.8.0'
20+
implementation 'org.apache.struts:struts2-spring-plugin:6.8.0'
2021

2122
def tomcatVersion = '7.0.57'
2223

examples/rollbar-struts2/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ apply plugin: 'com.bmuschko.tomcat'
1313

1414
dependencies {
1515
implementation project(":rollbar-struts2")
16-
17-
implementation 'org.apache.struts:struts2-core:2.5.25'
18-
implementation 'javax.servlet:javax.servlet-api:3.1.0'
16+
//We can't update struts to version 7+ because it uses caffeine version 3+ which remove Java 8
17+
implementation 'org.apache.struts:struts2-core:6.8.0'
18+
implementation 'javax.servlet:javax.servlet-api:4.0.1'
1919

2020
def tomcatVersion = '7.0.57'
2121

examples/rollbar-web/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ apply plugin: 'com.bmuschko.tomcat'
1414
dependencies {
1515
implementation project(":rollbar-web")
1616

17-
implementation 'javax.servlet:javax.servlet-api:3.1.0'
17+
implementation 'javax.servlet:javax.servlet-api:4.0.1'
1818

1919
def tomcatVersion = '7.0.57'
2020

rollbar-logback/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
22
api project(':rollbar-java')
33

4-
api group: 'ch.qos.logback', name: 'logback-classic', version: '1.3.14'
5-
api group: 'ch.qos.logback', name: 'logback-core', version: '1.3.14'
4+
api 'ch.qos.logback:logback-classic:1.5.21'
5+
api 'ch.qos.logback:logback-core:1.5.21'
66
}

rollbar-struts2/build.gradle

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
ext {
2-
struts2Version = '2.5.25'
3-
}
4-
51
dependencies {
62
api project(":rollbar-web")
7-
implementation 'org.apache.struts:struts2-core:' + struts2Version
8-
}
3+
//We can't update struts to version 7+ because it uses caffeine version 3+ which remove Java 8
4+
implementation 'org.apache.struts:struts2-core:6.8.0'
5+
}

rollbar-web/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
dependencies {
22
api project(':rollbar-java')
33

4-
compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
5-
6-
testImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
7-
}
4+
compileOnly 'javax.servlet:javax.servlet-api:4.0.1'
5+
testImplementation 'javax.servlet:javax.servlet-api:4.0.1'
6+
}

0 commit comments

Comments
 (0)