Skip to content

Commit b1314b2

Browse files
odrotbohmodrotbohm
committed
Upgraded to Spring Boot.
1 parent 1816139 commit b1314b2

File tree

27 files changed

+213
-244
lines changed

27 files changed

+213
-244
lines changed

‎pom.xml

Lines changed: 16 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
<version>1.1.0.RELEASE</version>
88
<packaging>pom</packaging>
99

10+
<parent>
11+
<groupId>org.springframework.boot</groupId>
12+
<artifactId>spring-boot-starter-parent</artifactId>
13+
<version>0.5.0.M5</version>
14+
</parent>
15+
1016
<name>Spring Data JPA sample projects</name>
1117
<description>Sample projects for Spring Data JPA</description>
1218
<url>http://www.springframework.org/spring-data</url>
@@ -28,13 +34,7 @@
2834
</developers>
2935

3036
<properties>
31-
<spring.version>3.2.4.RELEASE</spring.version>
32-
<jpa.version>2.0.0</jpa.version>
33-
<junit.version>4.11</junit.version>
34-
<hibernate.version>4.2.6.Final</hibernate.version>
35-
<slf4j.version>1.7.5</slf4j.version>
36-
<aspectj.version>1.6.12</aspectj.version>
37-
<jodatime.version>2.3</jodatime.version>
37+
<spring.version>4.0.0.RC1</spring.version>
3838
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3939
<spring.data.jpa.version>1.4.2.RELEASE</spring.data.jpa.version>
4040
</properties>
@@ -44,10 +44,9 @@
4444
<plugin>
4545
<groupId>org.apache.maven.plugins</groupId>
4646
<artifactId>maven-compiler-plugin</artifactId>
47-
<version>3.1</version>
4847
<configuration>
49-
<source>1.6</source>
50-
<target>1.6</target>
48+
<source>1.7</source>
49+
<target>1.7</target>
5150
</configuration>
5251
</plugin>
5352
<plugin>
@@ -73,105 +72,31 @@
7372
<dependencies>
7473

7574
<dependency>
76-
<groupId>org.springframework</groupId>
77-
<artifactId>spring-orm</artifactId>
78-
<version>${spring.version}</version>
79-
</dependency>
80-
81-
<dependency>
82-
<groupId>org.springframework</groupId>
83-
<artifactId>spring-tx</artifactId>
84-
<version>${spring.version}</version>
85-
</dependency>
86-
87-
<dependency>
88-
<groupId>org.springframework</groupId>
89-
<artifactId>spring-context</artifactId>
90-
<version>${spring.version}</version>
75+
<groupId>org.springframework.boot</groupId>
76+
<artifactId>spring-boot-starter-data-jpa</artifactId>
9177
</dependency>
9278

9379
<dependency>
94-
<groupId>org.springframework</groupId>
95-
<artifactId>spring-core</artifactId>
96-
<version>${spring.version}</version>
80+
<groupId>joda-time</groupId>
81+
<artifactId>joda-time</artifactId>
9782
</dependency>
9883

9984
<dependency>
100-
<groupId>org.springframework.data</groupId>
101-
<artifactId>spring-data-jpa</artifactId>
102-
<version>${spring.data.jpa.version}</version>
103-
</dependency>
104-
105-
<dependency>
106-
<groupId>junit</groupId>
107-
<artifactId>junit</artifactId>
108-
<version>${junit.version}</version>
109-
<scope>test</scope>
85+
<groupId>org.hsqldb</groupId>
86+
<artifactId>hsqldb</artifactId>
11087
</dependency>
11188

112-
<dependency>
113-
<groupId>log4j</groupId>
114-
<artifactId>log4j</artifactId>
115-
<version>1.2.17</version>
116-
<scope>test</scope>
117-
</dependency>
11889
<dependency>
11990
<groupId>org.springframework</groupId>
12091
<artifactId>spring-test</artifactId>
121-
<version>${spring.version}</version>
12292
<scope>test</scope>
12393
</dependency>
124-
<dependency>
125-
<groupId>org.hamcrest</groupId>
126-
<artifactId>hamcrest-all</artifactId>
127-
<version>1.3</version>
128-
<scope>test</scope>
129-
</dependency>
130-
131-
<dependency>
132-
<groupId>org.hibernate.javax.persistence</groupId>
133-
<artifactId>hibernate-jpa-2.0-api</artifactId>
134-
<version>1.0.0.Final</version>
135-
</dependency>
136-
<dependency>
137-
<groupId>org.hibernate</groupId>
138-
<artifactId>hibernate-entitymanager</artifactId>
139-
<version>${hibernate.version}</version>
140-
<scope>runtime</scope>
141-
</dependency>
142-
<dependency>
143-
<groupId>org.slf4j</groupId>
144-
<artifactId>slf4j-log4j12</artifactId>
145-
<version>${slf4j.version}</version>
146-
<scope>runtime</scope>
147-
</dependency>
148-
149-
<!-- HSQL -->
150-
<dependency>
151-
<groupId>org.hsqldb</groupId>
152-
<artifactId>hsqldb</artifactId>
153-
<version>2.2.8</version>
154-
<scope>runtime</scope>
155-
</dependency>
156-
157-
<dependency>
158-
<groupId>joda-time</groupId>
159-
<artifactId>joda-time</artifactId>
160-
<version>${jodatime.version}</version>
161-
</dependency>
162-
163-
<dependency>
164-
<groupId>org.aspectj</groupId>
165-
<artifactId>aspectjweaver</artifactId>
166-
<version>${aspectj.version}</version>
167-
<scope>runtime</scope>
168-
</dependency>
16994

17095
</dependencies>
17196

17297
<repositories>
17398
<repository>
174-
<id>spring-libs-milestone</id>
99+
<id>spring-milestones</id>
175100
<name>Spring Framework Maven Release Repository</name>
176101
<url>http://repo.springsource.org/libs-milestone</url>
177102
</repository>

‎spring-data-jpa-example/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<plugin>
3030
<groupId>org.apache.maven.plugins</groupId>
3131
<artifactId>maven-surefire-plugin</artifactId>
32-
<version>2.10</version>
3332
<configuration>
3433
<includes>
3534
<include>**/*.java</include>

‎spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/auditing/AuditableUserRepository.java

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/*
2+
* Copyright 2013 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.springframework.data.jpa.example.auditing;
17+
18+
import org.springframework.data.repository.CrudRepository;
19+
20+
/**
21+
* @author Oliver Gierke
22+
*/
23+
public interface AuditableUserRepository extends CrudRepository<AuditableUser, Long> {
24+
25+
}

‎spring-data-jpa-example/src/main/resources/auditing-repository-context.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717

1818
<bean id="auditorAware" class="org.springframework.data.jpa.example.auditing.AuditorAwareImpl" />
1919

20-
<jpa:repositories base-package="org.springframework.data.jpa.example.repository.simple" />
20+
<jpa:repositories base-package="org.springframework.data.jpa.example.auditing" />
2121

2222
</beans>

‎spring-data-jpa-example/src/main/resources/log4j.properties

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎spring-data-jpa-example/src/main/resources/logback.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<configuration>
3+
4+
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
5+
<encoder>
6+
<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
7+
</encoder>
8+
</appender>
9+
10+
<logger name="org.springframework" level="error" />
11+
12+
<root level="error">
13+
<appender-ref ref="console" />
14+
</root>
15+
16+
</configuration>

‎spring-data-jpa-example/src/test/java/org/springframework/data/jpa/example/repository/auditing/AbstractAuditableUserSample.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import org.springframework.beans.factory.annotation.Autowired;
2424
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
2525
import org.springframework.data.jpa.example.auditing.AuditableUser;
26+
import org.springframework.data.jpa.example.auditing.AuditableUserRepository;
2627
import org.springframework.data.jpa.example.auditing.AuditorAwareImpl;
27-
import org.springframework.data.repository.CrudRepository;
2828
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
2929
import org.springframework.test.util.ReflectionTestUtils;
3030
import org.springframework.transaction.annotation.Transactional;
@@ -37,7 +37,7 @@
3737
@Transactional
3838
public abstract class AbstractAuditableUserSample {
3939

40-
@Autowired CrudRepository<AuditableUser, Long> repository;
40+
@Autowired AuditableUserRepository repository;
4141
@Autowired AuditorAwareImpl auditorAware;
4242
@Autowired AuditingEntityListener<?> listener;
4343

‎spring-data-jpa-example/template.mf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Import-Package:
1010
Export-Template:
1111
org.springframework.data.jpa.example.*;version="${project.version}"
1212
Import-Template:
13-
javax.persistence.*;version="${jpa.version:[=.=.=,+1.0.0)}",
13+
javax.persistence.*;version="[2.0.0,3.0.0)",
1414
org.springframework.*;version="${spring.version:[=.=.=.=,+1.0.0)}",
1515
org.springframework.data.*;version="${project.version:[=.=.=.=,+1.0.0)}"
1616
Import-Library:

‎spring-data-jpa-interceptors/src/test/resources/log4j.properties

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎spring-data-jpa-interceptors/src/test/resources/logback.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<configuration>
3+
4+
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
5+
<encoder>
6+
<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
7+
</encoder>
8+
</appender>
9+
10+
<logger name="org.springframework" level="error" />
11+
12+
<root level="error">
13+
<appender-ref ref="console" />
14+
</root>
15+
16+
</configuration>

‎spring-data-jpa-interceptors/template.mf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Import-Package:
1010
Export-Template:
1111
org.springframework.data.jpa.sample.*;version="${project.version}"
1212
Import-Template:
13-
javax.persistence.*;version="${jpa.version:[=.=.=,+1.0.0)}",
13+
javax.persistence.*;version="[2.0.0,3.0.0)",
1414
org.aopalliance.aop;version="[1.0,2.0)",
1515
org.springframework.*;version="${spring.version:[=.=.=.=,+1.0.0)}",
1616
org.springframework.data.*;version="${project.version:[=.=.=.=,+1.0.0)}"

‎spring-data-jpa-showcase/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
<properties>
1818
<querydsl.version>3.2.4</querydsl.version>
19+
<spring.version>4.0.0.RC1</spring.version>
1920
</properties>
2021

2122
<build>
@@ -34,7 +35,6 @@
3435
<plugin>
3536
<groupId>org.codehaus.mojo</groupId>
3637
<artifactId>build-helper-maven-plugin</artifactId>
37-
<version>1.5</version>
3838
<executions>
3939
<execution>
4040
<id>add-source</id>
@@ -66,7 +66,6 @@
6666
<plugin>
6767
<groupId>org.apache.maven.plugins</groupId>
6868
<artifactId>maven-surefire-plugin</artifactId>
69-
<version>2.4.3</version>
7069
<configuration>
7170
<excludes>
7271
<exclude>**/snippets/**/*.java</exclude>
@@ -105,7 +104,7 @@
105104
<plugin>
106105
<groupId>com.mysema.maven</groupId>
107106
<artifactId>apt-maven-plugin</artifactId>
108-
<version>1.0.8</version>
107+
<version>1.1.0</version>
109108
<dependencies>
110109
<dependency>
111110
<groupId>com.mysema.querydsl</groupId>

‎spring-data-jpa-showcase/src/main/resources/META-INF/persistence.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎spring-data-jpa-showcase/src/main/resources/application-context-after.xml

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎spring-data-jpa-showcase/src/main/resources/application-context-before.xml

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎spring-data-jpa-showcase/src/main/resources/data.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ INSERT INTO Customer (id, firstname, lastname) VALUES (1, 'Dave', 'Matthews');
22
INSERT INTO Customer (id, firstname, lastname) VALUES (2, 'Carter', 'Beauford');
33
INSERT INTO Customer (id, firstname, lastname) VALUES (3, 'Stephan', 'Lassard');
44

5-
INSERT INTO Account (id, customer_id, expiryDate) VALUES (1, 1, '2010-12-31');
6-
INSERT INTO Account (id, customer_id, expiryDate) VALUES (2, 1, '2011-03-31');
5+
INSERT INTO Account (id, customer, expiry_date) VALUES (1, 1, '2010-12-31');
6+
INSERT INTO Account (id, customer, expiry_date) VALUES (2, 1, '2011-03-31');
77

88
INSERT INTO Customer (id, firstname, lastname) VALUES (4, 'Charly', 'Matthews');
99
INSERT INTO Customer (id, firstname, lastname) VALUES (5, 'Chris', 'Matthews');

0 commit comments

Comments
 (0)