Update to latest versions.

Spring 3.1.0 -> 3.1.1 Spring Data JPA 1.0.3 -> 1.1.0 Maven Surefire Plugin 2.4.3 -> 2.10 Maven Compiler Plugin 2.3 -> 2.5.1 Hsqldb 1.8.0.10 -> 2.2.8 Querydsl APT Plugin 1.0 -> 1.0.3 Querydsl 2.2.5 -> 2.6.0 Hibernate 3.5.6 -> 4.1.4 SLF4j 1.6.1 -> 1.6.6 AspectJ 1.6.8 -> 1.6.12 Joda Time 1.5.2 -> 2.1 Project version 1.1.0
li73 · Jun 26, 2012 · 83417cf · 83417cf
1 parent db66530
commit 83417cf
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.springframework.data.jpa.examples</groupId>
 	<artifactId>spring-data-jpa-examples-parent</artifactId>
-	<version>1.0.3.RELEASE</version>
+	<version>1.1.0.RELEASE</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data JPA sample projects</name>
@@ -27,13 +27,13 @@
 	</developers>
 
 	<properties>
-		<spring.version>3.1.0.RELEASE</spring.version>
+		<spring.version>3.1.1.RELEASE</spring.version>
 		<jpa.version>2.0.0</jpa.version>
 		<junit.version>4.8</junit.version>
-		<hibernate.version>3.5.6-Final</hibernate.version>
-		<slf4j.version>1.6.1</slf4j.version>
-		<aspectj.version>1.6.8</aspectj.version>
-		<jodatime.version>1.5.2</jodatime.version>
+		<hibernate.version>4.1.4.Final</hibernate.version>
+		<slf4j.version>1.6.6</slf4j.version>
+		<aspectj.version>1.6.12</aspectj.version>
+		<jodatime.version>2.1</jodatime.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
@@ -42,7 +42,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3</version>
+				<version>2.5.1</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
@@ -73,7 +73,7 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-jpa</artifactId>
-			<version>1.0.3.RELEASE</version>
+			<version>1.1.0.RELEASE</version>
 		</dependency>
 
 		<dependency>
@@ -136,7 +136,7 @@
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.8.0.10</version>
+			<version>2.2.8</version>
 			<scope>runtime</scope>
 		</dependency>
 

diff --git a/spring-data-jpa-example/pom.xml b/spring-data-jpa-example/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.data.jpa.examples</groupId>
 		<artifactId>spring-data-jpa-examples-parent</artifactId>
-		<version>1.0.3.RELEASE</version>
+		<version>1.1.0.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -29,7 +29,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.4.3</version>
+				<version>2.10</version>
 				<configuration>
 					<includes>
 						<include>**/*.java</include>

diff --git a/spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/domain/User.java b/spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/domain/User.java
@@ -12,7 +12,7 @@
  * @author Oliver Gierke
  */
 @Entity
-@NamedQuery(name = "User.findByTheUsersName", query = "from User u where u.username = ?")
+@NamedQuery(name = "User.findByTheUsersName", query = "from User u where u.username = ?1")
 public class User extends AbstractPersistable<Long> {
 
 	private static final long serialVersionUID = -2952735933715107252L;

diff --git a/...example/src/main/java/org/springframework/data/jpa/example/repository/UserRepository.java b/...example/src/main/java/org/springframework/data/jpa/example/repository/UserRepository.java
@@ -40,6 +40,6 @@ public interface UserRepository extends CrudRepository<User, Long>, UserReposito
 	 * @param firstname
 	 * @return
 	 */
-	@Query("select u from User u where u.firstname = ?")
+	@Query("select u from User u where u.firstname = ?1")
 	List<User> findByFirstname(String firstname);
 }
diff --git a/spring-data-jpa-showcase/pom.xml b/spring-data-jpa-showcase/pom.xml
@@ -7,15 +7,15 @@
 	<parent>
 		<groupId>org.springframework.data.jpa.examples</groupId>
 		<artifactId>spring-data-jpa-examples-parent</artifactId>
-		<version>1.0.3.RELEASE</version>
+		<version>1.1.0.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<name>Spring Data JPA showcase</name>
 	<description>Sample project showing how Spring Data JPA eases implementing repositories over a plain JPA/Spring approach</description>
 
 	<properties>
-		<querydsl.version>2.2.5</querydsl.version>
+		<querydsl.version>2.6.0</querydsl.version>
 	</properties>
 
 	<build>
@@ -83,20 +83,13 @@
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			<dependencies>
-
-				<!-- QueryDsl -->
-				<dependency>
-					<groupId>com.mysema.querydsl</groupId>
-					<artifactId>querydsl-apt</artifactId>
-					<version>${querydsl.version}</version>
-					<scope>provided</scope>
-				</dependency>
 
 				<dependency>
 					<groupId>com.mysema.querydsl</groupId>
 					<artifactId>querydsl-jpa</artifactId>
 					<version>${querydsl.version}</version>
 				</dependency>
+
 			</dependencies>
 
 			<repositories>
@@ -112,7 +105,14 @@
 					<plugin>
 						<groupId>com.mysema.maven</groupId>
 						<artifactId>maven-apt-plugin</artifactId>
-						<version>1.0</version>
+						<version>1.0.3</version>
+						<dependencies>
+							<dependency>
+								<groupId>com.mysema.querydsl</groupId>
+								<artifactId>querydsl-apt</artifactId>
+								<version>${querydsl.version}</version>
+							</dependency>
+						</dependencies>
 						<executions>
 							<execution>
 								<phase>generate-sources</phase>