Skip to content

Commit

Permalink
Dep updates and spring-boot-servlet-example dep overhaul
Browse files Browse the repository at this point in the history
  • Loading branch information
@bakennedy
bakennedy committed Oct 30, 2024
1 parent 15ad2f1 commit 5c60bb2
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 106 deletions.
4 changes: 2 additions & 2 deletions moesif-servlet-jakarta/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions moesif-servlet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions moesif-springrequest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions servlet-example/src/main/webapp/WEB-INF/web.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion spark-servlet-example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
96 changes: 19 additions & 77 deletions spring-boot-servlet-example/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -131,7 +70,10 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
17 changes: 9 additions & 8 deletions spring-boot-servlet-example/src/main/java/com/moesif/servlet/spring/Application.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
27 changes: 15 additions & 12 deletions springrequest-example/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down

0 comments on commit 5c60bb2

Please sign in to comment.