Skip to content
This repository was archived by the owner on Feb 5, 2022. It is now read-only.

Commit a30e404

Browse files
rstoyanchevrstoyanchev
committed
Update dependencies
1 parent f7a2e9d commit a30e404

File tree

9 files changed

+99
-176
lines changed

9 files changed

+99
-176
lines changed

Diff for: ‎pom.xml

+69-89
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,33 @@
77
<name>spring-mvc-showcase</name>
88
<packaging>war</packaging>
99
<version>1.0.0-BUILD-SNAPSHOT</version>
10+
1011
<properties>
11-
<java-version>1.7</java-version>
12-
<org.springframework-version>4.2.2.RELEASE</org.springframework-version>
13-
<org.springframework.security-version>4.0.1.RELEASE</org.springframework.security-version>
12+
<java-version>1.8</java-version>
13+
<org.springframework-version>5.0.3.RELEASE</org.springframework-version>
1414
<org.aspectj-version>1.8.1</org.aspectj-version>
15-
<org.slf4j-version>1.7.12</org.slf4j-version>
1615
</properties>
16+
1717
<dependencies>
1818
<!-- Spring -->
1919
<dependency>
2020
<groupId>org.springframework</groupId>
2121
<artifactId>spring-context</artifactId>
2222
<version>${org.springframework-version}</version>
23-
<exclusions>
24-
<!-- Exclude Commons Logging in favor of SLF4j -->
25-
<exclusion>
26-
<groupId>commons-logging</groupId>
27-
<artifactId>commons-logging</artifactId>
28-
</exclusion>
29-
</exclusions>
3023
</dependency>
3124
<dependency>
3225
<groupId>org.springframework</groupId>
3326
<artifactId>spring-webmvc</artifactId>
3427
<version>${org.springframework-version}</version>
3528
</dependency>
29+
30+
<!-- Spring Security (used for CSRF protection only) -->
31+
<dependency>
32+
<groupId>org.springframework.security</groupId>
33+
<artifactId>spring-security-web</artifactId>
34+
<version>5.0.0.RELEASE</version>
35+
</dependency>
36+
3637
<!-- AspectJ -->
3738
<dependency>
3839
<groupId>org.aspectj</groupId>
@@ -42,27 +43,14 @@
4243

4344
<!-- Logging -->
4445
<dependency>
45-
<groupId>org.slf4j</groupId>
46-
<artifactId>slf4j-api</artifactId>
47-
<version>${org.slf4j-version}</version>
48-
</dependency>
49-
<dependency>
50-
<groupId>org.slf4j</groupId>
51-
<artifactId>jcl-over-slf4j</artifactId>
52-
<version>${org.slf4j-version}</version>
53-
<scope>runtime</scope>
46+
<groupId>org.apache.logging.log4j</groupId>
47+
<artifactId>log4j-core</artifactId>
48+
<version>LATEST</version>
5449
</dependency>
5550
<dependency>
56-
<groupId>org.slf4j</groupId>
57-
<artifactId>slf4j-log4j12</artifactId>
58-
<version>${org.slf4j-version}</version>
59-
<scope>runtime</scope>
60-
</dependency>
61-
<dependency>
62-
<groupId>log4j</groupId>
63-
<artifactId>log4j</artifactId>
64-
<version>1.2.16</version>
65-
<scope>runtime</scope>
51+
<groupId>org.apache.logging.log4j</groupId>
52+
<artifactId>log4j-slf4j-impl</artifactId>
53+
<version>LATEST</version>
6654
</dependency>
6755

6856
<!-- @Inject -->
@@ -72,93 +60,80 @@
7260
<version>1</version>
7361
</dependency>
7462

75-
<!-- Servlet -->
63+
<!-- Servlet API -->
7664
<dependency>
77-
<groupId>org.apache.tomcat</groupId>
78-
<artifactId>tomcat-servlet-api</artifactId>
79-
<version>7.0.30</version>
65+
<groupId>javax.servlet</groupId>
66+
<artifactId>javax.servlet-api</artifactId>
67+
<version>3.1.0</version>
8068
<scope>provided</scope>
8169
</dependency>
8270
<dependency>
8371
<groupId>javax.servlet.jsp</groupId>
84-
<artifactId>jsp-api</artifactId>
85-
<version>2.1</version>
72+
<artifactId>javax.servlet.jsp-api</artifactId>
73+
<version>2.3.2-b02</version>
8674
<scope>provided</scope>
8775
</dependency>
8876
<dependency>
8977
<groupId>javax.servlet.jsp.jstl</groupId>
90-
<artifactId>jstl-api</artifactId>
91-
<version>1.2</version>
92-
<exclusions>
93-
<exclusion>
94-
<groupId>javax.servlet</groupId>
95-
<artifactId>servlet-api</artifactId>
96-
</exclusion>
97-
</exclusions>
98-
</dependency>
99-
<dependency>
100-
<groupId>org.glassfish.web</groupId>
101-
<artifactId>jstl-impl</artifactId>
102-
<version>1.2</version>
103-
<exclusions>
104-
<exclusion>
105-
<groupId>javax.servlet</groupId>
106-
<artifactId>servlet-api</artifactId>
107-
</exclusion>
108-
</exclusions>
78+
<artifactId>javax.servlet.jsp.jstl-api</artifactId>
79+
<version>1.2.1</version>
10980
</dependency>
11081

11182
<!-- Jackson JSON Processor -->
11283
<dependency>
11384
<groupId>com.fasterxml.jackson.core</groupId>
11485
<artifactId>jackson-databind</artifactId>
115-
<version>2.5.3</version>
86+
<version>2.9.3</version>
11687
</dependency>
11788

11889
<!-- Rome Atom+RSS -->
11990
<dependency>
12091
<groupId>com.rometools</groupId>
12192
<artifactId>rome</artifactId>
122-
<version>1.5.0</version>
93+
<version>1.9.0</version>
12394
</dependency>
12495

12596
<!-- JSR 303 with Hibernate Validator -->
12697
<dependency>
12798
<groupId>javax.validation</groupId>
12899
<artifactId>validation-api</artifactId>
129-
<version>1.0.0.GA</version>
100+
<version>2.0.1.Final</version>
130101
</dependency>
131102
<dependency>
132103
<groupId>org.hibernate</groupId>
133104
<artifactId>hibernate-validator</artifactId>
134-
<version>4.1.0.Final</version>
105+
<version>6.0.7.Final</version>
135106
</dependency>
136-
107+
<dependency>
108+
<groupId>javax.el</groupId>
109+
<artifactId>javax.el-api</artifactId>
110+
<version>3.0.1-b04</version>
111+
</dependency>
112+
<dependency>
113+
<groupId>org.glassfish</groupId>
114+
<artifactId>javax.el</artifactId>
115+
<version>3.0.1-b08</version>
116+
</dependency>
117+
137118
<!-- Joda Time Library -->
138119
<dependency>
139120
<groupId>joda-time</groupId>
140121
<artifactId>joda-time</artifactId>
141-
<version>2.3</version>
122+
<version>2.9.9</version>
142123
</dependency>
143124

144125
<!-- File Upload -->
145126
<dependency>
146127
<groupId>commons-fileupload</groupId>
147128
<artifactId>commons-fileupload</artifactId>
148-
<version>1.2.2</version>
129+
<version>1.3.3</version>
149130
</dependency>
150131
<dependency>
151132
<groupId>commons-io</groupId>
152133
<artifactId>commons-io</artifactId>
153-
<version>2.0.1</version>
134+
<version>2.5</version>
154135
</dependency>
155136

156-
<!-- Security (used for CSRF protection only) -->
157-
<dependency>
158-
<groupId>org.springframework.security</groupId>
159-
<artifactId>spring-security-web</artifactId>
160-
<version>${org.springframework.security-version}</version>
161-
</dependency>
162137

163138
<!-- Test -->
164139
<dependency>
@@ -170,19 +145,19 @@
170145
<dependency>
171146
<groupId>junit</groupId>
172147
<artifactId>junit</artifactId>
173-
<version>4.11</version>
148+
<version>4.12</version>
174149
<scope>test</scope>
175150
</dependency>
176151
<dependency>
177-
<groupId>xmlunit</groupId>
178-
<artifactId>xmlunit</artifactId>
179-
<version>1.2</version>
152+
<groupId>org.xmlunit</groupId>
153+
<artifactId>xmlunit-matchers</artifactId>
154+
<version>2.5.1</version>
180155
<scope>test</scope>
181156
</dependency>
182157
<dependency>
183158
<groupId>com.jayway.jsonpath</groupId>
184159
<artifactId>json-path</artifactId>
185-
<version>0.8.1</version>
160+
<version>2.4.0</version>
186161
<scope>test</scope>
187162
</dependency>
188163
<dependency>
@@ -192,30 +167,36 @@
192167
<scope>test</scope>
193168
</dependency>
194169
</dependencies>
170+
195171
<repositories>
196-
<!-- For testing against latest Spring snapshots -->
197172
<repository>
198-
<id>org.springframework.maven.snapshot</id>
173+
<id>Spring snapshot</id>
199174
<name>Spring Maven Snapshot Repository</name>
200175
<url>http://repo.spring.io/snapshot</url>
201-
<releases><enabled>false</enabled></releases>
202-
<snapshots><enabled>true</enabled></snapshots>
176+
<releases>
177+
<enabled>false</enabled>
178+
</releases>
179+
<snapshots>
180+
<enabled>true</enabled>
181+
</snapshots>
203182
</repository>
204-
<!-- For developing against latest Spring milestones -->
205183
<repository>
206-
<id>org.springframework.maven.milestone</id>
184+
<id>Spring milestone</id>
207185
<name>Spring Maven Milestone Repository</name>
208186
<url>http://repo.spring.io/milestone</url>
209-
<snapshots><enabled>false</enabled></snapshots>
187+
<snapshots>
188+
<enabled>false</enabled>
189+
</snapshots>
210190
</repository>
211191
</repositories>
192+
212193
<build>
213194
<finalName>${project.artifactId}</finalName>
214195
<plugins>
215196
<plugin>
216197
<groupId>org.apache.maven.plugins</groupId>
217198
<artifactId>maven-compiler-plugin</artifactId>
218-
<version>2.3.2</version>
199+
<version>3.7.0</version>
219200
<configuration>
220201
<source>${java-version}</source>
221202
<target>${java-version}</target>
@@ -224,7 +205,7 @@
224205
<plugin>
225206
<groupId>org.apache.maven.plugins</groupId>
226207
<artifactId>maven-surefire-plugin</artifactId>
227-
<version>2.12</version>
208+
<version>2.20.1</version>
228209
<configuration>
229210
<includes>
230211
<include>**/*Tests.java</include>
@@ -252,10 +233,8 @@
252233
<plugin>
253234
<groupId>org.codehaus.mojo</groupId>
254235
<artifactId>aspectj-maven-plugin</artifactId>
255-
<!-- Have to use version 1.2 since version 1.3 does not appear to work with ITDs -->
256-
<version>1.2</version>
236+
<version>1.11</version>
257237
<dependencies>
258-
<!-- You must use Maven 2.0.9 or above or these are ignored (see MNG-2972) -->
259238
<dependency>
260239
<groupId>org.aspectj</groupId>
261240
<artifactId>aspectjrt</artifactId>
@@ -270,13 +249,14 @@
270249
<executions>
271250
<execution>
272251
<goals>
273-
<goal>compile</goal>
274-
<goal>test-compile</goal>
252+
<goal>compile</goal> <!-- weave all main classes -->
253+
<goal>test-compile</goal> <!-- weave all test classes -->
275254
</goals>
276255
</execution>
277256
</executions>
278257
<configuration>
279258
<outxml>true</outxml>
259+
<complianceLevel>${java-version}</complianceLevel>
280260
<source>${java-version}</source>
281261
<target>${java-version}</target>
282262
</configuration>
@@ -289,7 +269,7 @@
289269
<plugin>
290270
<groupId>org.eclipse.jetty</groupId>
291271
<artifactId>jetty-maven-plugin</artifactId>
292-
<version>9.0.6.v20130930</version>
272+
<version>9.4.8.v20171121</version>
293273
<configuration>
294274
<webApp>
295275
<contextPath>/${project.artifactId}</contextPath>

Diff for: ‎src/main/resources/log4j.xml

-42
This file was deleted.

Diff for: ‎src/main/resources/log4j2.xml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Configuration status="WARN">
3+
<Appenders>
4+
<Console name="Console" target="SYSTEM_OUT">
5+
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
6+
</Console>
7+
</Appenders>
8+
<Loggers>
9+
<Logger name="org.springframework.web" level="debug" />
10+
<Root level="info">
11+
<AppenderRef ref="Console" />
12+
</Root>
13+
</Loggers>
14+
</Configuration>

Diff for: ‎src/test/java/org/springframework/samples/mvc/data/DataControllerTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void pathVar() throws Exception {
4747

4848
@Test
4949
public void matrixVar() throws Exception {
50-
this.mockMvc.perform(get("/data/matrixvars;foo=bar/simple")).andDo(print())
50+
this.mockMvc.perform(get("/data/matrixvars;foo=bar/simple"))
5151
.andExpect(content().string("Obtained matrix variable 'foo=bar' from path segment 'matrixvars'"));
5252
}
5353

Diff for: ‎src/test/java/org/springframework/samples/mvc/form/FormControllerTests.java

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public void submitSuccess() throws Exception {
5151
.param("additionalInfo[java]", "true")
5252
.param("_additionalInfo[java]", "on")
5353
.param("subscribeNewsletter", "false"))
54-
.andDo(print())
5554
.andExpect(status().isMovedTemporarily())
5655
.andExpect(redirectedUrl("/form"))
5756
.andExpect(flash().attribute("message",

Diff for: ‎src/test/java/org/springframework/samples/mvc/messageconverters/MessageConvertersControllerTests.java

-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ public void writeJson() throws Exception {
9595
@Test
9696
public void writeJson2() throws Exception {
9797
this.mockMvc.perform(get(URI, "json").accept(MediaType.APPLICATION_JSON))
98-
.andDo(print())
9998
.andExpect(jsonPath("$.foo").value("bar"))
10099
.andExpect(jsonPath("$.fruit").value("apple"));
101100
}

0 commit comments

Comments
 (0)