Merge pull request #506 from okta/fix_samples

Fix samples
okta · Oct 11, 2024 · 56df739 · 56df739
2 parents f694df6 + 6928ee3
commit 56df739
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 47 deletions.
diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,6 @@
         <snakeyaml.version>2.2</snakeyaml.version>
         <okta.commons.version>1.3.5</okta.commons.version>
         <okta.sdk.previousVersion>4.0.0</okta.sdk.previousVersion>
-        <org.apache.tomcat.embed.version>9.0.90</org.apache.tomcat.embed.version>
         <org.jetbrains.kotlin.version>1.9.0-RC</org.jetbrains.kotlin.version>
         <github.slug>okta/okta-idx-java</github.slug>
     </properties>
@@ -104,16 +103,6 @@
                 <artifactId>javax.annotation-api</artifactId>
                 <version>1.3.2</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.tomcat.embed</groupId>
-                <artifactId>tomcat-embed-core</artifactId>
-                <version>${org.apache.tomcat.embed.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.tomcat.embed</groupId>
-                <artifactId>tomcat-embed-websocket</artifactId>
-                <version>${org.apache.tomcat.embed.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-stdlib</artifactId>
@@ -137,12 +126,12 @@
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.4.14</version>
+                <version>1.5.8</version>
             </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-core</artifactId>
-                <version>1.4.14</version>
+                <version>1.5.8</version>
             </dependency>
 
             <!-- ITs -->

diff --git a/samples/embedded-auth-with-sdk/pom.xml b/samples/embedded-auth-with-sdk/pom.xml
@@ -59,25 +59,15 @@
             <version>${spring.boot.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-core</artifactId>
-            <version>${org.apache.tomcat.embed.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-websocket</artifactId>
-            <version>${org.apache.tomcat.embed.version}</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <version>${spring.boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
             <version>${spring.boot.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>6.1.12</version>
-        </dependency>
         <dependency>
             <groupId>org.thymeleaf</groupId>
             <artifactId>thymeleaf</artifactId>
@@ -229,7 +219,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.7.8</version>
+                <version>3.3.4</version>
             </plugin>
             <!-- Force not to run Cucumber tests without cucumber-it profile -->
             <plugin>

diff --git a/...edded-auth-with-sdk/src/main/java/com/okta/spring/example/controllers/HomeController.java b/...edded-auth-with-sdk/src/main/java/com/okta/spring/example/controllers/HomeController.java
@@ -36,7 +36,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;

diff --git a/...dded-auth-with-sdk/src/main/java/com/okta/spring/example/controllers/LoginController.java b/...dded-auth-with-sdk/src/main/java/com/okta/spring/example/controllers/LoginController.java
@@ -46,7 +46,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;

diff --git a/...ded-auth-with-sdk/src/main/java/com/okta/spring/example/controllers/LogoutController.java b/...ded-auth-with-sdk/src/main/java/com/okta/spring/example/controllers/LogoutController.java
@@ -24,7 +24,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 @Controller
 public class LogoutController {

diff --git a/samples/embedded-auth-with-sdk/src/main/java/com/okta/spring/example/helpers/HomeHelper.java b/samples/embedded-auth-with-sdk/src/main/java/com/okta/spring/example/helpers/HomeHelper.java
@@ -30,7 +30,7 @@
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 import java.util.LinkedHashMap;
 import java.util.Map;
 

diff --git a/...embedded-auth-with-sdk/src/main/java/com/okta/spring/example/helpers/ResponseHandler.java b/...embedded-auth-with-sdk/src/main/java/com/okta/spring/example/helpers/ResponseHandler.java
@@ -24,7 +24,7 @@
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;

diff --git a/samples/embedded-auth-with-sdk/src/main/java/com/okta/spring/example/helpers/Util.java b/samples/embedded-auth-with-sdk/src/main/java/com/okta/spring/example/helpers/Util.java
@@ -18,7 +18,7 @@
 import com.okta.idx.sdk.api.client.ProceedContext;
 import com.okta.idx.sdk.api.model.RequestContext;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 import java.util.UUID;
 
 public final class Util {

diff --git a/samples/embedded-sign-in-widget/pom.xml b/samples/embedded-sign-in-widget/pom.xml
@@ -64,14 +64,9 @@
             <version>${spring.boot.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-core</artifactId>
-            <version>${org.apache.tomcat.embed.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-websocket</artifactId>
-            <version>${org.apache.tomcat.embed.version}</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <version>${spring.boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -250,7 +245,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.7.8</version>
+                <version>3.3.4</version>
                 <configuration>
                     <fork>false</fork>
                 </configuration>

diff --git a/...dded-sign-in-widget/src/main/java/com/okta/spring/example/controllers/HomeController.java b/...dded-sign-in-widget/src/main/java/com/okta/spring/example/controllers/HomeController.java
@@ -20,7 +20,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 @Controller
 public class HomeController {

diff --git a/...ded-sign-in-widget/src/main/java/com/okta/spring/example/controllers/LoginController.java b/...ded-sign-in-widget/src/main/java/com/okta/spring/example/controllers/LoginController.java
@@ -28,8 +28,8 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 import java.net.MalformedURLException;
 import java.net.URL;
 

diff --git a/samples/embedded-sign-in-widget/src/main/resources/templates/login.html b/samples/embedded-sign-in-widget/src/main/resources/templates/login.html
@@ -19,8 +19,8 @@
     <title>Login</title>
     <!--/*/ <th:block th:include="head :: head"/> /*/-->
 
-    <script src="https://global.oktacdn.com/okta-signin-widget/6.1.0/js/okta-sign-in.min.js" type="text/javascript"></script>
-    <link href="https://global.oktacdn.com/okta-signin-widget/6.1.0/css/okta-sign-in.min.css" type="text/css" rel="stylesheet"/>
+    <script src="https://global.oktacdn.com/okta-signin-widget/7.24.1/js/okta-sign-in.min.js" type="text/javascript"></script>
+    <link href="https://global.oktacdn.com/okta-signin-widget/7.24.1/css/okta-sign-in.min.css" type="text/css" rel="stylesheet"/>
 
 </head>
 <body class="login">