From 5c60bb26ad83d9c2461359d96b1fac6701e99e75 Mon Sep 17 00:00:00 2001
From: Brian Kennedy <brian@moesif.com>
Date: Tue, 29 Oct 2024 18:41:06 -0700
Subject: [PATCH] Dep updates and spring-boot-servlet-example dep overhaul

---
 moesif-servlet-jakarta/pom.xml                |  4 +-
 moesif-servlet/pom.xml                        |  4 +-
 moesif-springrequest/pom.xml                  |  4 +-
 .../src/main/webapp/WEB-INF/web.xml           |  4 +-
 spark-servlet-example/pom.xml                 |  2 +-
 spring-boot-servlet-example/pom.xml           | 96 ++++---------------
 .../moesif/servlet/spring/Application.java    | 17 ++--
 springrequest-example/pom.xml                 | 27 +++---
 8 files changed, 52 insertions(+), 106 deletions(-)

diff --git a/moesif-servlet-jakarta/pom.xml b/moesif-servlet-jakarta/pom.xml
index 54c1c87..555b611 100644
--- a/moesif-servlet-jakarta/pom.xml
+++ b/moesif-servlet-jakarta/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>com.moesif.api</groupId>
       <artifactId>moesifapi</artifactId>
-      <version>1.8.0</version>
+      <version>1.8.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.14.0</version>
+      <version>2.17.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
diff --git a/moesif-servlet/pom.xml b/moesif-servlet/pom.xml
index 422abbe..62da792 100644
--- a/moesif-servlet/pom.xml
+++ b/moesif-servlet/pom.xml
@@ -41,7 +41,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <commons-io.version>2.14.0</commons-io.version>
+    <commons-io.version>2.17.0</commons-io.version>
     <commons-lang3.version>3.4</commons-lang3.version>
     <logback.version>1.1.3</logback.version>
     <java.version>1.8</java.version>
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>com.moesif.api</groupId>
       <artifactId>moesifapi</artifactId>
-      <version>1.8.0</version>
+      <version>1.8.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
diff --git a/moesif-springrequest/pom.xml b/moesif-springrequest/pom.xml
index bfd9d43..37bfa18 100644
--- a/moesif-springrequest/pom.xml
+++ b/moesif-springrequest/pom.xml
@@ -42,7 +42,7 @@
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <assertj-core.version>3.1.0</assertj-core.version>
-    <commons-io.version>2.4</commons-io.version>
+    <commons-io.version>2.17.0</commons-io.version>
     <commons-lang3.version>3.4</commons-lang3.version>
     <junit.version>4.13.2</junit.version>
     <logback.version>1.1.3</logback.version>
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>com.moesif.api</groupId>
       <artifactId>moesifapi</artifactId>
-      <version>1.8.0</version>
+      <version>1.8.1</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
diff --git a/servlet-example/src/main/webapp/WEB-INF/web.xml b/servlet-example/src/main/webapp/WEB-INF/web.xml
index 354060d..4f0d1ce 100644
--- a/servlet-example/src/main/webapp/WEB-INF/web.xml
+++ b/servlet-example/src/main/webapp/WEB-INF/web.xml
@@ -42,7 +42,7 @@ http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
     <servlet-class>com.moesif.servlet.example.UsersServlet</servlet-class>
     <init-param>
       <param-name>application-id</param-name>
-      <param-value>Your Moesif Application Id</param-value>
+      <param-value>eyJhcHAiOiIxOTg6NzQ0IiwidmVyIjoiMi4xIiwib3JnIjoiNjQwOjEyOCIsImlhdCI6MTcyNzc0MDgwMH0.ckqMfkn4o0zgfLokgP_WvMIXAOYm77PV6ACbMAlzYC0</param-value>
     </init-param>
   </servlet>
 
@@ -56,7 +56,7 @@ http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
     <servlet-class>com.moesif.servlet.example.CompaniesServlet</servlet-class>
     <init-param>
       <param-name>application-id</param-name>
-      <param-value>Your Moesif Application Id</param-value>
+      <param-value>eyJhcHAiOiIxOTg6NzQ0IiwidmVyIjoiMi4xIiwib3JnIjoiNjQwOjEyOCIsImlhdCI6MTcyNzc0MDgwMH0.ckqMfkn4o0zgfLokgP_WvMIXAOYm77PV6ACbMAlzYC0</param-value>
     </init-param>
   </servlet>
 
diff --git a/spark-servlet-example/pom.xml b/spark-servlet-example/pom.xml
index 4e82fc8..7c8b5e8 100644
--- a/spark-servlet-example/pom.xml
+++ b/spark-servlet-example/pom.xml
@@ -99,7 +99,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.14.0</version>
+            <version>2.17.0</version>
         </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>
diff --git a/spring-boot-servlet-example/pom.xml b/spring-boot-servlet-example/pom.xml
index be72904..6647331 100644
--- a/spring-boot-servlet-example/pom.xml
+++ b/spring-boot-servlet-example/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.moesif.servlet.spring</groupId>
@@ -8,98 +8,37 @@
   <packaging>war</packaging>
   <version>2.0.3</version>
 
-  <properties>
-    <springframework.version>5.3.27</springframework.version>
-    <springconfiguration.version>2.7.12</springconfiguration.version>
-  </properties>
+  <parent>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.7.14</version>
+  </parent>
 
   <dependencies>
-
-    <!-- Spring -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>${springframework.version}</version>
-    </dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>${springframework.version}</version>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-webmvc</artifactId>
-      <version>${springframework.version}</version>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jstl</artifactId>
+      <version>1.2</version>
     </dependency>
-
-    <!-- Moesif -->
     <dependency>
-      <groupId>com.moesif.springrequest</groupId>
-      <artifactId>moesif-springrequest</artifactId>
-      <version>1.1.0</version>
+      <groupId>org.apache.tomcat.embed</groupId>
+      <artifactId>tomcat-embed-jasper</artifactId>
+      <scope>default</scope>
     </dependency>
-
     <dependency>
       <groupId>com.moesif.servlet</groupId>
       <artifactId>moesif-servlet</artifactId>
       <version>1.8.1</version>
     </dependency>
-
-
-    <!-- Common Validator -->
-    <dependency>
-      <groupId>commons-validator</groupId>
-      <artifactId>commons-validator</artifactId>
-      <version>1.7</version>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-autoconfigure</artifactId>
-      <version>${springconfiguration.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-configuration-processor</artifactId>
-      <version>${springconfiguration.version}</version>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-      <version>1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-core</artifactId>
-      <version>8.5.99</version>
-    </dependency>
   </dependencies>
 
-
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.10.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-
-      <plugin>
+            <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
         <version>3.3.2</version>
@@ -131,7 +70,10 @@
           </execution>
         </executions>
       </plugin>
-
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/spring-boot-servlet-example/src/main/java/com/moesif/servlet/spring/Application.java b/spring-boot-servlet-example/src/main/java/com/moesif/servlet/spring/Application.java
index 20eb0f2..4d249ba 100644
--- a/spring-boot-servlet-example/src/main/java/com/moesif/servlet/spring/Application.java
+++ b/spring-boot-servlet-example/src/main/java/com/moesif/servlet/spring/Application.java
@@ -6,12 +6,13 @@
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication(scanBasePackages = {"com.moesif.servlet.spring"})
-public class Application  extends SpringBootServletInitializer {
-  @Override
-  protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-    return application.sources(Application.class);
-  }
-  public static void main(String[] args) {
-    SpringApplication.run(Application.class, args);
-  }
+public class Application extends SpringBootServletInitializer {
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(Application.class);
+    }
 }
\ No newline at end of file
diff --git a/springrequest-example/pom.xml b/springrequest-example/pom.xml
index 189c6df..acc9eeb 100644
--- a/springrequest-example/pom.xml
+++ b/springrequest-example/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.springframework.boot</groupId>
@@ -16,10 +16,12 @@
     <maven.deploy.skip>true</maven.deploy.skip>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <assertj-core.version>3.23.1</assertj-core.version>
-    <commons-io.version>2.11.0</commons-io.version>
+    <commons-io.version>2.17.0</commons-io.version>
     <commons-lang3.version>3.12.0</commons-lang3.version>
     <junit.version>4.13.2</junit.version>
     <mockito-core.version>1.10.19</mockito-core.version>
+    <springframework.version>5.3.27</springframework.version>
+    <springconfiguration.version>2.7.12</springconfiguration.version>
   </properties>
 
   <dependencies>
@@ -35,19 +37,20 @@
     <dependency>
       <groupId>com.jayway.jsonpath</groupId>
       <artifactId>json-path</artifactId>
+      <version>2.9.0</version>
       <scope>test</scope>
     </dependency>
 
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.13.4.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.13.4</version>
-        </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.13.4.2</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>2.13.4</version>
+    </dependency>
 
     <dependency>
       <groupId>com.moesif.springrequest</groupId>