Upgrade

Author: lopenchi

.github/workflows/gradle.yml

@@ -20,10 +20,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 11.0
+        java-version: 17.0
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle

build.gradle

@@ -6,16 +6,14 @@ plugins {
     id 'groovy'
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-ext['springBootVer'] = '2.2.6.RELEASE'
+ext['springBootVer'] = '2.7.18'
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 gretty {
-    springBootVersion = '2.2.6.RELEASE'
+    springBootVersion = '2.7.18'
     springBoot = true
     servletContainer = 'jetty11'
     contextPath = ''
@@ -26,16 +24,17 @@ configurations {
 }
 
 dependencies {
-    implementation(group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1')
-    implementation(group: 'javax.el', name:'javax.el-api', version:'3.0.0')
+    implementation(group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '4.0.2')
+    implementation(group: 'jakarta.servlet', name:'jakarta.servlet-api', version:'6.1.0')
 
     // Spring
     implementation(group:'org.springframework.boot', name:'spring-boot-starter-data-jpa', version:"${springBootVer}")
     implementation(group:'org.springframework.boot', name:'spring-boot-starter-security', version:"${springBootVer}")
+    implementation(group:'org.springframework.boot', name:'spring-boot-starter-validation', version:"${springBootVer}")
     implementation(group:'net.rakugakibox.spring.boot', name:'logback-access-spring-boot-starter', version:'2.11.0')
 
     implementation(group:'com.authy', name:'authy-java', version:'1.5.1')
-    implementation(group:'com.twilio.sdk', name:'twilio', version:'8.31.1')
+    implementation(group:'com.twilio.sdk', name:'twilio', version:'10.6.8')
     implementation(group:'org.xerial', name:'sqlite-jdbc', version:'3.41.2.2')
 
     testImplementation(group: 'junit', name:'junit', version:'4.13.2')
@@ -65,4 +64,4 @@ test {
     testLogging {
         exceptionFormat = "full"
     }
-}
+}

src/main/java/com/twilio/accountsecurity/controllers/LoginController.java

@@ -11,9 +11,9 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
 

src/main/java/com/twilio/accountsecurity/controllers/PhoneVerificationController.java

@@ -11,7 +11,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 import javax.validation.Valid;
 
 @RestController

src/main/java/com/twilio/accountsecurity/controllers/RegisterController.java

@@ -15,8 +15,8 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
 @RestController

src/main/java/com/twilio/accountsecurity/controllers/TokenController.java

@@ -12,8 +12,8 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 import javax.validation.Valid;
 
 @RestController

src/main/java/com/twilio/accountsecurity/filters/TwoFAFilter.java

@@ -3,10 +3,10 @@
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public class TwoFAFilter extends OncePerRequestFilter {

src/main/java/com/twilio/accountsecurity/services/PhoneVerificationService.java

@@ -35,7 +35,7 @@ public void start(String phoneNumber, String via) {
     }
 
     public VerificationCheckCreator getVerificationCheckCreator(String verificationSid, String phoneNumber, String token) {
-        return VerificationCheck.creator(verificationSid, token).setTo(phoneNumber);
+        return VerificationCheck.creator(verificationSid).setTo(phoneNumber);
     }
 
     public void verify(String phoneNumber, String token) {

src/test/groovy/com/twilio/accountsecurity/controllers/RegisterControllerSpec.groovy

@@ -7,8 +7,8 @@ import org.springframework.test.web.servlet.MockMvc
 import spock.lang.Specification
 import spock.lang.Subject
 
-import javax.servlet.ServletException
-import javax.servlet.http.HttpServletRequest
+import jakarta.servlet.ServletException
+import jakarta.servlet.http.HttpServletRequest
 
 import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup
 

src/test/groovy/com/twilio/accountsecurity/controllers/TokenControllerSpec.groovy

@@ -7,8 +7,8 @@ import org.springframework.test.web.servlet.MockMvc
 import spock.lang.Specification
 import spock.lang.Subject
 
-import javax.servlet.http.HttpServletRequest
-import javax.servlet.http.HttpSession
+import jakarta.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpSession
 import java.security.Principal
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post