Skip to content

Commit 3d73129

Browse files
committed
Update to jakarta servlet
1 parent 7aefa90 commit 3d73129

16 files changed

+266
-205
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
### Requirements
2626

27-
Java 8 or above and `javax.servlet` version 3.
27+
**Java 11 or above** and **`jakarta.servlet` version 5 or higher**.
2828

2929
> If you are using Spring, we recommend leveraging Spring's OIDC and OAuth2 support, as demonstrated by the [Spring Boot Quickstart](https://auth0.com/docs/quickstart/webapp/java-spring-boot).
3030

build.gradle

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -86,29 +86,20 @@ ext {
8686

8787
jacocoTestReport {
8888
reports {
89-
xml.enabled = true
90-
html.enabled = true
89+
xml.required = true
90+
html.required = true
9191
}
9292
}
9393

9494
java {
9595
toolchain {
96-
languageVersion = JavaLanguageVersion.of(8)
97-
}
98-
// Needed because of broken gradle metadata, see https://github.com/google/guava/issues/6612#issuecomment-1614992368
99-
sourceSets.all {
100-
configurations.getByName(runtimeClasspathConfigurationName) {
101-
attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm")
102-
}
103-
configurations.getByName(compileClasspathConfigurationName) {
104-
attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm")
105-
}
96+
languageVersion = JavaLanguageVersion.of(17)
10697
}
10798
}
10899

109100
compileJava {
110-
sourceCompatibility '1.8'
111-
targetCompatibility '1.8'
101+
sourceCompatibility '17'
102+
targetCompatibility '17'
112103
}
113104

114105
test {
@@ -120,7 +111,7 @@ test {
120111
}
121112

122113
dependencies {
123-
implementation 'javax.servlet:javax.servlet-api:3.1.0'
114+
implementation 'jakarta.servlet:jakarta.servlet-api:6.0.0'
124115
implementation 'org.apache.commons:commons-lang3:3.12.0'
125116
implementation 'com.google.guava:guava-annotations:r03'
126117
implementation 'commons-codec:commons-codec:1.15'
@@ -132,9 +123,10 @@ dependencies {
132123
testImplementation 'org.bouncycastle:bcprov-jdk15on:1.64'
133124
testImplementation 'org.hamcrest:java-hamcrest:2.0.0.0'
134125
testImplementation 'org.hamcrest:hamcrest-core:1.3'
135-
testImplementation 'org.mockito:mockito-core:2.8.9'
126+
testImplementation 'org.mockito:mockito-core:4.11.0'
136127
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1'
137-
testImplementation 'org.springframework:spring-test:4.3.14.RELEASE'
128+
testImplementation 'org.springframework:spring-test:6.0.14'
129+
testImplementation 'org.springframework:spring-web:6.0.14'
138130
testImplementation 'com.squareup.okhttp3:okhttp:4.11.0'
139131
}
140132

gradle/wrapper/gradle-wrapper.jar

-15.4 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)