Skip to content

Commit 77faa01

Browse files
updated Spring Framework
1 parent f6f5625 commit 77faa01

File tree

3 files changed

+7
-59
lines changed

3 files changed

+7
-59
lines changed

pom.xml

Lines changed: 3 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<url>http://www.thomas-woehlke.de/p/beachbox</url>
1010
<properties>
1111
<java-version>1.8</java-version>
12-
<org.springframework-version>4.0.7.RELEASE</org.springframework-version>
12+
<org.springframework-version>4.1.4.RELEASE</org.springframework-version>
1313
<spring-data-jpa.version>1.5.2.RELEASE</spring-data-jpa.version>
1414
<org.aspectj-version>1.6.12</org.aspectj-version>
1515
<org.slf4j-version>1.5.10</org.slf4j-version>
@@ -18,6 +18,7 @@
1818
<encoding>UTF-8</encoding>
1919
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2020
<webjars-bootstrap.version>3.1.1</webjars-bootstrap.version>
21+
<webjars-jquery.version>2.1.0-2</webjars-jquery.version>
2122
</properties>
2223
<repositories>
2324
<repository>
@@ -187,14 +188,6 @@
187188
<version>${spring-data-jpa.version}</version>
188189
</dependency>
189190

190-
<!-- Mail -->
191-
192-
<dependency>
193-
<groupId>javax.mail</groupId>
194-
<artifactId>mail</artifactId>
195-
<version>1.4</version>
196-
</dependency>
197-
198191
<!-- Test -->
199192
<dependency>
200193
<groupId>junit</groupId>
@@ -214,25 +207,6 @@
214207
<version>1.3</version>
215208
</dependency>
216209

217-
<!-- Joda Time Library -->
218-
<dependency>
219-
<groupId>joda-time</groupId>
220-
<artifactId>joda-time</artifactId>
221-
<version>1.6.2</version>
222-
</dependency>
223-
224-
<!-- Apache Tiles -->
225-
<dependency>
226-
<groupId>org.apache.tiles</groupId>
227-
<artifactId>tiles-jsp</artifactId>
228-
<version>2.2.2</version>
229-
</dependency>
230-
<dependency>
231-
<groupId>org.apache.tiles</groupId>
232-
<artifactId>tiles-el</artifactId>
233-
<version>2.2.2</version>
234-
</dependency>
235-
236210
<!-- Servlet -->
237211

238212
<dependency>
@@ -271,36 +245,6 @@
271245
</exclusion>
272246
</exclusions>
273247
</dependency>
274-
<!--
275-
<dependency>
276-
<groupId>javax.servlet</groupId>
277-
<artifactId>servlet-api</artifactId>
278-
<version>2.5</version>
279-
<scope>provided</scope>
280-
</dependency>
281-
<dependency>
282-
<groupId>javax.servlet.jsp</groupId>
283-
<artifactId>jsp-api</artifactId>
284-
<version>2.1</version>
285-
<scope>provided</scope>
286-
</dependency>
287-
<dependency>
288-
<groupId>javax.servlet.jsp</groupId>
289-
<artifactId>javax.servlet.jsp-api</artifactId>
290-
<version>2.2.1</version>
291-
<scope>provided</scope>
292-
</dependency>
293-
<dependency>
294-
<groupId>javax.servlet.jsp.jstl</groupId>
295-
<artifactId>jstl-api</artifactId>
296-
<version>1.2</version>
297-
</dependency>
298-
<dependency>
299-
<groupId>org.glassfish.web</groupId>
300-
<artifactId>jstl-impl</artifactId>
301-
<version>1.2</version>
302-
</dependency>
303-
-->
304248
<dependency>
305249
<!-- jsoup HTML parser library @ http://jsoup.org/ -->
306250
<groupId>org.jsoup</groupId>
@@ -317,7 +261,7 @@
317261
<dependency>
318262
<groupId>org.webjars</groupId>
319263
<artifactId>jquery</artifactId>
320-
<version>2.1.0-2</version>
264+
<version>${webjars-jquery.version}</version>
321265
</dependency>
322266

323267
</dependencies>

src/main/java/org/woehlke/beachbox/entities/Vinyl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
@Table(name="vinyl")
1111
public class Vinyl implements Serializable {
1212

13+
private final static long serialVersionUID = 0L;
14+
1315
@Id
1416
@GeneratedValue(strategy = GenerationType.AUTO)
1517
private Long id;

src/main/java/org/woehlke/beachbox/web/SessionBean.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
*/
1010
public class SessionBean implements Serializable {
1111

12+
private final static long serialVersionUID = 0L;
13+
1214
@SafeHtml
1315
private String searchString;
1416

0 commit comments

Comments
 (0)