Skip to content

Commit f991892

Browse files
edgar-espina-wppedgar-espina-wpp
committed
build: upgrade spring version to 6.x
- servlet api 5.x
1 parent 4931bc5 commit f991892

13 files changed

Lines changed: 49 additions & 82 deletions

File tree

‎handlebars-caffeine/pom.xml‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
12-
<groupId>com.github.jknack</groupId>
1312
<artifactId>handlebars-caffeine</artifactId>
1413

1514
<name>Handlebars Caffeine Cache</name>
@@ -27,13 +26,6 @@
2726
<version>2.9.2</version>
2827
</dependency>
2928

30-
<!-- Servlet API -->
31-
<dependency>
32-
<groupId>javax.servlet</groupId>
33-
<artifactId>servlet-api</artifactId>
34-
<scope>provided</scope>
35-
</dependency>
36-
3729
<!-- Test dependencies -->
3830
<dependency>
3931
<groupId>com.github.jknack</groupId>
@@ -55,12 +47,6 @@
5547
<scope>test</scope>
5648
</dependency>
5749

58-
<dependency>
59-
<groupId>org.mockito</groupId>
60-
<artifactId>mockito-core</artifactId>
61-
<scope>test</scope>
62-
</dependency>
63-
6450
<dependency>
6551
<groupId>org.apache.commons</groupId>
6652
<artifactId>commons-lang3</artifactId>
@@ -85,6 +71,12 @@
8571
<artifactId>commons-text</artifactId>
8672
<scope>test</scope>
8773
</dependency>
74+
75+
<dependency>
76+
<groupId>org.mockito</groupId>
77+
<artifactId>mockito-core</artifactId>
78+
<scope>test</scope>
79+
</dependency>
8880
</dependencies>
8981

9082
</project>

‎handlebars-guava-cache/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
12-
<groupId>com.github.jknack</groupId>
1312
<artifactId>handlebars-guava-cache</artifactId>
1413

1514
<name>Handlebars Guava Cache</name>
@@ -28,13 +27,6 @@
2827
<version>31.0.1-jre</version>
2928
</dependency>
3029

31-
<!-- Servlet API -->
32-
<dependency>
33-
<groupId>javax.servlet</groupId>
34-
<artifactId>servlet-api</artifactId>
35-
<scope>provided</scope>
36-
</dependency>
37-
3830
<!-- Test dependencies -->
3931
<dependency>
4032
<groupId>com.github.jknack</groupId>

‎handlebars-helpers/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
</parent>
99

1010
<modelVersion>4.0.0</modelVersion>
11-
<groupId>com.github.jknack</groupId>
1211
<artifactId>handlebars-helpers</artifactId>
1312

1413
<name>Handlebars Helpers</name>
@@ -34,13 +33,6 @@
3433
<optional>true</optional>
3534
</dependency>
3635

37-
<!-- Servlet API -->
38-
<dependency>
39-
<groupId>javax.servlet</groupId>
40-
<artifactId>servlet-api</artifactId>
41-
<scope>provided</scope>
42-
</dependency>
43-
4436
<dependency>
4537
<groupId>com.github.jknack</groupId>
4638
<artifactId>handlebars</artifactId>

‎handlebars-jackson2/pom.xml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,6 @@
2626
<artifactId>jackson-databind</artifactId>
2727
</dependency>
2828

29-
<!-- Servlet API -->
30-
<dependency>
31-
<groupId>javax.servlet</groupId>
32-
<artifactId>servlet-api</artifactId>
33-
<scope>provided</scope>
34-
</dependency>
35-
3629
<!-- Test dependencies -->
3730
<dependency>
3831
<groupId>com.github.jknack</groupId>
@@ -55,15 +48,14 @@
5548
</dependency>
5649

5750
<dependency>
58-
<groupId>org.mockito</groupId>
59-
<artifactId>mockito-core</artifactId>
51+
<groupId>org.hamcrest</groupId>
52+
<artifactId>hamcrest</artifactId>
6053
<scope>test</scope>
6154
</dependency>
6255

6356
<dependency>
64-
<groupId>org.hamcrest</groupId>
65-
<artifactId>hamcrest</artifactId>
66-
<version>2.2</version>
57+
<groupId>org.mockito</groupId>
58+
<artifactId>mockito-core</artifactId>
6759
<scope>test</scope>
6860
</dependency>
6961
</dependencies>

‎handlebars-maven-plugin/pom.xml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
</parent>
99

1010
<modelVersion>4.0.0</modelVersion>
11-
<groupId>com.github.jknack</groupId>
1211
<artifactId>handlebars-maven-plugin</artifactId>
1312
<packaging>maven-plugin</packaging>
1413

@@ -28,10 +27,9 @@
2827
<scope>compile</scope>
2928
</dependency>
3029

31-
<!-- Servlet API -->
3230
<dependency>
33-
<groupId>javax.servlet</groupId>
34-
<artifactId>servlet-api</artifactId>
31+
<groupId>jakarta.servlet</groupId>
32+
<artifactId>jakarta.servlet-api</artifactId>
3533
<scope>provided</scope>
3634
</dependency>
3735

@@ -79,19 +77,19 @@
7977
<scope>test</scope>
8078
</dependency>
8179

82-
<dependency>
83-
<groupId>org.mockito</groupId>
84-
<artifactId>mockito-core</artifactId>
85-
<scope>test</scope>
86-
</dependency>
87-
8880
<dependency>
8981
<groupId>com.github.jknack</groupId>
9082
<artifactId>handlebars</artifactId>
9183
<version>${project.version}</version>
9284
<scope>test</scope>
9385
<classifier>tests</classifier>
9486
</dependency>
87+
88+
<dependency>
89+
<groupId>org.mockito</groupId>
90+
<artifactId>mockito-core</artifactId>
91+
<scope>test</scope>
92+
</dependency>
9593
</dependencies>
9694

9795
<build>

‎handlebars-springmvc/pom.xml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
</parent>
99

1010
<modelVersion>4.0.0</modelVersion>
11-
<groupId>com.github.jknack</groupId>
1211
<artifactId>handlebars-springmvc</artifactId>
1312

1413
<name>Handlebars Spring MVC</name>
@@ -28,8 +27,8 @@
2827

2928
<!-- Servlet API -->
3029
<dependency>
31-
<groupId>javax.servlet</groupId>
32-
<artifactId>servlet-api</artifactId>
30+
<groupId>jakarta.servlet</groupId>
31+
<artifactId>jakarta.servlet-api</artifactId>
3332
<scope>provided</scope>
3433
</dependency>
3534

@@ -52,12 +51,6 @@
5251
<scope>test</scope>
5352
</dependency>
5453

55-
<dependency>
56-
<groupId>org.mockito</groupId>
57-
<artifactId>mockito-core</artifactId>
58-
<scope>test</scope>
59-
</dependency>
60-
6154
<dependency>
6255
<groupId>org.apache.commons</groupId>
6356
<artifactId>commons-lang3</artifactId>
@@ -83,6 +76,11 @@
8376
<scope>test</scope>
8477
</dependency>
8578

79+
<dependency>
80+
<groupId>org.mockito</groupId>
81+
<artifactId>mockito-core</artifactId>
82+
<scope>test</scope>
83+
</dependency>
8684
</dependencies>
8785

8886
</project>

‎handlebars-springmvc/src/main/java/com/github/jknack/handlebars/springmvc/HandlebarsView.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import java.util.Locale;
1212
import java.util.Map;
1313

14-
import javax.servlet.http.HttpServletRequest;
15-
import javax.servlet.http.HttpServletResponse;
14+
import jakarta.servlet.http.HttpServletRequest;
15+
import jakarta.servlet.http.HttpServletResponse;
1616

1717
import org.springframework.web.servlet.view.AbstractTemplateView;
1818

‎handlebars-springmvc/src/test/java/com/github/jknack/handlebars/springmvc/HandlebarsViewTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import java.io.PrintWriter;
1515
import java.util.Map;
1616

17-
import javax.servlet.http.HttpServletRequest;
18-
import javax.servlet.http.HttpServletResponse;
17+
import jakarta.servlet.http.HttpServletRequest;
18+
import jakarta.servlet.http.HttpServletResponse;
1919

2020
import org.junit.jupiter.api.Test;
2121
import org.mockito.ArgumentCaptor;

‎handlebars/pom.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,9 @@
173173
<version>${nashorn.version}</version>
174174
</dependency>
175175

176-
<!-- Servlet API -->
177176
<dependency>
178-
<groupId>javax.servlet</groupId>
179-
<artifactId>servlet-api</artifactId>
177+
<groupId>jakarta.servlet</groupId>
178+
<artifactId>jakarta.servlet-api</artifactId>
180179
<scope>provided</scope>
181180
</dependency>
182181

@@ -217,7 +216,6 @@
217216
<dependency>
218217
<groupId>org.hamcrest</groupId>
219218
<artifactId>hamcrest</artifactId>
220-
<version>2.2</version>
221219
<scope>test</scope>
222220
</dependency>
223221

‎handlebars/src/main/java/com/github/jknack/handlebars/io/ServletContextTemplateLoader.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import java.io.IOException;
1111
import java.net.URL;
1212

13-
import javax.servlet.ServletContext;
13+
import jakarta.servlet.ServletContext;
1414

1515
/**
1616
* Load templates from the {@link ServletContext}.

0 commit comments

Comments
 (0)