SONAR-22447 Moved from javax.servlet-api to jakarta.servlet-api plus patch version...

diff --git a/build.gradle b/build.gradle
index dabe6659b099373a726eceeedf6a463b656420b0..d209625b471d09c58844079d5f6cf4cafd8e9cd9 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -367,8 +367,8 @@ subprojects {
       dependency 'com.sun.mail:jakarta.mail:1.6.7'
       dependency 'javax.annotation:javax.annotation-api:1.3.2'
       dependency 'javax.inject:javax.inject:1'
-      dependency 'javax.servlet:javax.servlet-api:4.0.1'
       dependency 'javax.xml.bind:jaxb-api:2.3.1'
+      dependency 'jakarta.servlet:jakarta.servlet-api:4.0.4'
       dependency 'junit:junit:4.13.2'
       // JUnit 5
       dependencySet(group: 'org.junit.jupiter', version: '5.10.2') {

diff --git a/server/sonar-auth-bitbucket/build.gradle b/server/sonar-auth-bitbucket/build.gradle
index f4a24eb53bf6764312f5a3d3e3cf013e666ca1ec..d49f5c84e65797d946984d209c2cbfa4819e87d5 100644 (file)
--- a/server/sonar-auth-bitbucket/build.gradle
+++ b/server/sonar-auth-bitbucket/build.gradle
@@ -14,7 +14,7 @@ dependencies {
 
     compileOnlyApi 'com.github.spotbugs:spotbugs-annotations'
     compileOnlyApi 'com.squareup.okhttp3:okhttp'
-    compileOnlyApi 'javax.servlet:javax.servlet-api'
+    compileOnlyApi 'jakarta.servlet:jakarta.servlet-api'
     compileOnlyApi project(':sonar-core')
 
     testImplementation 'com.squareup.okhttp3:mockwebserver'

diff --git a/server/sonar-auth-github/build.gradle b/server/sonar-auth-github/build.gradle
index 506b127cd92a270d95cbff14c3e5922c4ee7d0ba..9b0736ee09c19d174199234c4b14b5e880821dcf 100644 (file)
--- a/server/sonar-auth-github/build.gradle
+++ b/server/sonar-auth-github/build.gradle
@@ -15,7 +15,7 @@ dependencies {
 
     compileOnlyApi 'com.github.spotbugs:spotbugs-annotations'
     compileOnlyApi 'com.squareup.okhttp3:okhttp'
-    compileOnlyApi 'javax.servlet:javax.servlet-api'
+    compileOnlyApi 'jakarta.servlet:jakarta.servlet-api'
     compileOnlyApi project(':sonar-core')
 
     testImplementation 'com.squareup.okhttp3:mockwebserver'

diff --git a/server/sonar-auth-gitlab/build.gradle b/server/sonar-auth-gitlab/build.gradle
index b2922a4b638f452ed80ddb150e6567ace087f371..09f78a36d8be358d7196f0bf39061f490a42e3a3 100644 (file)
--- a/server/sonar-auth-gitlab/build.gradle
+++ b/server/sonar-auth-gitlab/build.gradle
@@ -15,7 +15,7 @@ dependencies {
 
     compileOnlyApi 'com.github.spotbugs:spotbugs-annotations'
     compileOnlyApi 'com.squareup.okhttp3:okhttp'
-    compileOnlyApi 'javax.servlet:javax.servlet-api'
+    compileOnlyApi 'jakarta.servlet:jakarta.servlet-api'
     compileOnlyApi project(':sonar-core')
 
     testImplementation 'com.squareup.okhttp3:mockwebserver'

diff --git a/server/sonar-auth-ldap/build.gradle b/server/sonar-auth-ldap/build.gradle
index e0c91dc532efa17b853f9aabe2b8307cbdddabad..cce816c745407e4a2c886918e40c4d29f93d8cfc 100644 (file)
--- a/server/sonar-auth-ldap/build.gradle
+++ b/server/sonar-auth-ldap/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     api 'org.apache.commons:commons-lang3'
 
     compileOnlyApi 'com.github.spotbugs:spotbugs-annotations'
-    compileOnlyApi 'javax.servlet:javax.servlet-api'
+    compileOnlyApi 'jakarta.servlet:jakarta.servlet-api'
     compileOnlyApi project(':server:sonar-process')
     compileOnlyApi project(':sonar-core')
 

diff --git a/server/sonar-auth-saml/build.gradle b/server/sonar-auth-saml/build.gradle
index 9a5db10e781c50fac10a581baa8450f1b2fc466b..a44287d3885999212e9adade2cc3ca58a4ab93ef 100644 (file)
--- a/server/sonar-auth-saml/build.gradle
+++ b/server/sonar-auth-saml/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     compileOnlyApi 'com.github.spotbugs:spotbugs-annotations'
     compileOnlyApi 'com.squareup.okhttp3:okhttp'
-    compileOnlyApi 'javax.servlet:javax.servlet-api'
+    compileOnlyApi 'jakarta.servlet:jakarta.servlet-api'
     compileOnlyApi 'org.json:json'
     compileOnlyApi project(':server:sonar-db-dao')
     compileOnlyApi project(':server:sonar-webserver-api')

diff --git a/server/sonar-webserver-api/build.gradle b/server/sonar-webserver-api/build.gradle
index 15a4d2e782d6684a598c63d0bd836cdc7b21c658..adae50c4454ef77009e1b989921af5febcf28833 100644 (file)
--- a/server/sonar-webserver-api/build.gradle
+++ b/server/sonar-webserver-api/build.gradle
@@ -28,12 +28,12 @@ dependencies {
   api 'org.mindrot:jbcrypt'
 
   compileOnlyApi 'com.github.spotbugs:spotbugs-annotations'
-  compileOnlyApi 'javax.servlet:javax.servlet-api'
+  compileOnlyApi 'jakarta.servlet:jakarta.servlet-api'
 
   testImplementation 'org.assertj:assertj-guava'
   testImplementation 'com.github.spotbugs:spotbugs-annotations'
   testImplementation 'com.tngtech.java:junit-dataprovider'
-  testImplementation 'javax.servlet:javax.servlet-api'
+  testImplementation 'jakarta.servlet:jakarta.servlet-api'
   testImplementation 'org.junit.jupiter:junit-jupiter-api'
   testImplementation 'org.mockito:mockito-core'
   testImplementation 'org.sonarsource.api.plugin:sonar-plugin-api-test-fixtures'

diff --git a/server/sonar-webserver-auth/build.gradle b/server/sonar-webserver-auth/build.gradle
index 6a4d5091c05180bf9ff3bf2ed3028c36c3388db3..121114d1d8a70ead8d0acf6f7568c045ddb04fc4 100644 (file)
--- a/server/sonar-webserver-auth/build.gradle
+++ b/server/sonar-webserver-auth/build.gradle
@@ -21,10 +21,10 @@ dependencies {
   api 'org.mindrot:jbcrypt'
 
   compileOnlyApi 'com.github.spotbugs:spotbugs-annotations'
-  compileOnlyApi 'javax.servlet:javax.servlet-api'
+  compileOnlyApi 'jakarta.servlet:jakarta.servlet-api'
 
   testImplementation 'com.tngtech.java:junit-dataprovider'
-  testImplementation 'javax.servlet:javax.servlet-api'
+  testImplementation 'jakarta.servlet:jakarta.servlet-api'
   testImplementation 'org.apache.logging.log4j:log4j-api'
   testImplementation 'org.apache.logging.log4j:log4j-core'
   testImplementation 'org.assertj:assertj-guava'

diff --git a/server/sonar-webserver-common/build.gradle b/server/sonar-webserver-common/build.gradle
index ab17221b87713b8ec6ad9f7f55953c90ded53c13..4764b249bc05f8a4f065cdb3bfbadb6033cb591f 100644 (file)
--- a/server/sonar-webserver-common/build.gradle
+++ b/server/sonar-webserver-common/build.gradle
@@ -15,7 +15,7 @@ dependencies {
   implementation project(path: ':server:sonar-alm-client')
 
   compileOnlyApi 'com.github.spotbugs:spotbugs-annotations'
-  compileOnlyApi 'javax.servlet:javax.servlet-api'
+  compileOnlyApi 'jakarta.servlet:jakarta.servlet-api'
 
   testImplementation 'org.apache.logging.log4j:log4j-api'
   testImplementation 'org.apache.logging.log4j:log4j-core'

diff --git a/server/sonar-webserver-es/build.gradle b/server/sonar-webserver-es/build.gradle
index 01c88349af094bc0eac51c0c6f7c9273c97046fd..d59d52be5206e6b354889ae31a72e4e29baff07b 100644 (file)
--- a/server/sonar-webserver-es/build.gradle
+++ b/server/sonar-webserver-es/build.gradle
@@ -13,7 +13,7 @@ dependencies {
   api project(':server:sonar-webserver-auth')
 
   compileOnlyApi 'com.github.spotbugs:spotbugs-annotations'
-  compileOnlyApi 'javax.servlet:javax.servlet-api'
+  compileOnlyApi 'jakarta.servlet:jakarta.servlet-api'
 
   testImplementation 'org.apache.logging.log4j:log4j-api'
   testImplementation 'org.apache.logging.log4j:log4j-core'

diff --git a/server/sonar-webserver-pushapi/build.gradle b/server/sonar-webserver-pushapi/build.gradle
index b9bfa53d5db2b0ae46ffb3eda0ede837b6cc945d..b21b754052d002c48cb4b28e4a98ec9f61453a30 100644 (file)
--- a/server/sonar-webserver-pushapi/build.gradle
+++ b/server/sonar-webserver-pushapi/build.gradle
@@ -5,7 +5,7 @@ sonar {
 }
 dependencies {
 
-    api 'javax.servlet:javax.servlet-api'
+    api 'jakarta.servlet:jakarta.servlet-api'
     api 'org.json:json'
 
     api project(':server:sonar-webserver-ws')

diff --git a/server/sonar-webserver-webapi-v2/build.gradle b/server/sonar-webserver-webapi-v2/build.gradle
index 674aaa172414e7982846f722cd57b2b1dd76051a..fb6f1207368069ced3e0f2bc98c4ab920111bbd0 100644 (file)
--- a/server/sonar-webserver-webapi-v2/build.gradle
+++ b/server/sonar-webserver-webapi-v2/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     api project(':server:sonar-db-dao')
     api project(':server:sonar-webserver-common')
 
-    testImplementation 'javax.servlet:javax.servlet-api'
+    testImplementation 'jakarta.servlet:jakarta.servlet-api'
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
     testImplementation 'org.junit.jupiter:junit-jupiter-params'
     testImplementation 'org.mockito:mockito-core'

diff --git a/server/sonar-webserver-webapi/build.gradle b/server/sonar-webserver-webapi/build.gradle
index 12ce4109fbd0dc63580bae41b0695d4be724a894..f8fa9990bbef4a46de563656d748620c7a7974ec 100644 (file)
--- a/server/sonar-webserver-webapi/build.gradle
+++ b/server/sonar-webserver-webapi/build.gradle
@@ -29,7 +29,7 @@ dependencies {
   api project(':sonar-scanner-protocol')
 
   compileOnlyApi 'com.github.spotbugs:spotbugs-annotations'
-  compileOnlyApi 'javax.servlet:javax.servlet-api'
+  compileOnlyApi 'jakarta.servlet:jakarta.servlet-api'
 
   testImplementation 'org.apache.logging.log4j:log4j-api'
   testImplementation 'org.apache.logging.log4j:log4j-core'
@@ -37,7 +37,7 @@ dependencies {
   testImplementation 'com.github.spotbugs:spotbugs-annotations'
   testImplementation 'com.tngtech.java:junit-dataprovider'
   testImplementation 'com.squareup.okhttp3:mockwebserver'
-  testImplementation 'javax.servlet:javax.servlet-api'
+  testImplementation 'jakarta.servlet:jakarta.servlet-api'
   testImplementation 'org.junit.jupiter:junit-jupiter-api'
   testImplementation 'org.mockito:mockito-core'
   testImplementation 'org.mockito:mockito-junit-jupiter'

diff --git a/server/sonar-webserver-ws/build.gradle b/server/sonar-webserver-ws/build.gradle
index f6f5c198f0da8578474de4c178cb447260fc55ac..5deefcd60b6f88ea3b20ab06be085558ce522893 100644 (file)
--- a/server/sonar-webserver-ws/build.gradle
+++ b/server/sonar-webserver-ws/build.gradle
@@ -17,13 +17,13 @@ dependencies {
   api project(':sonar-ws')
 
   compileOnlyApi 'com.github.spotbugs:spotbugs-annotations'
-  compileOnlyApi 'javax.servlet:javax.servlet-api'
+  compileOnlyApi 'jakarta.servlet:jakarta.servlet-api'
   compileOnlyApi 'org.apache.tomcat.embed:tomcat-embed-core'
 
   testImplementation 'com.tngtech.java:junit-dataprovider'
   testImplementation 'junit:junit'
   testImplementation 'com.github.spotbugs:spotbugs-annotations'
-  testImplementation 'javax.servlet:javax.servlet-api'
+  testImplementation 'jakarta.servlet:jakarta.servlet-api'
   testImplementation 'org.apache.tomcat.embed:tomcat-embed-core'
   testImplementation 'org.mockito:mockito-core'
   testImplementation 'org.sonarsource.api.plugin:sonar-plugin-api-test-fixtures'