Skip to content

Commit e238854

Browse files
odrotbohmodrotbohm
committed
#2, #1 - Changed project versions to 1.0.2.BUILD-SNAPSHOT.
Use 1.0.2.BUILD-SNAPSHOT as build version. Polished pom.xml formatting. Removed obsolete repository declaration. Upgraded to Querydsl 2.2.5, Spring 3.0.6.
1 parent 94c77ea commit e238854

File tree

3 files changed

+93
-102
lines changed

3 files changed

+93
-102
lines changed

‎pom.xml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.springframework.data.jpa.examples</groupId>
66
<artifactId>spring-data-jpa-examples-parent</artifactId>
7-
<version>1.0.1.RELEASE</version>
7+
<version>1.0.2.BUILD-SNAPSHOT</version>
88
<packaging>pom</packaging>
99

1010
<name>Spring Data JPA sample projects</name>
@@ -27,7 +27,7 @@
2727
</developers>
2828

2929
<properties>
30-
<spring.version>3.0.5.RELEASE</spring.version>
30+
<spring.version>3.0.6.RELEASE</spring.version>
3131
<jpa.version>2.0.0</jpa.version>
3232
<junit.version>4.8</junit.version>
3333
<hibernate.version>3.5.6-Final</hibernate.version>
@@ -147,17 +147,7 @@
147147
<repository>
148148
<id>repository.springframework.maven.release</id>
149149
<name>Spring Framework Maven Release Repository</name>
150-
<url>http://maven.springframework.org/release</url>
151-
</repository>
152-
<repository>
153-
<id>repository.springframework.maven.milestone</id>
154-
<name>Spring Framework Maven Milestone Repository</name>
155-
<url>http://maven.springframework.org/milestone</url>
156-
</repository>
157-
<repository>
158-
<id>repository.springframework.maven.snapshot</id>
159-
<name>Spring Framework Maven Snapshot Repository</name>
160-
<url>http://maven.springframework.org/snapshot</url>
150+
<url>http://repo.springsource.org/release</url>
161151
</repository>
162152
<repository>
163153
<id>jboss</id>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<artifactId>spring-data-jpa-example</artifactId>
6-
6+
77
<parent>
88
<groupId>org.springframework.data.jpa.examples</groupId>
99
<artifactId>spring-data-jpa-examples-parent</artifactId>
10-
<version>1.0.0.BUILD-SNAPSHOT</version>
10+
<version>1.0.2.BUILD-SNAPSHOT</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313

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

Lines changed: 88 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,69 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
5-
<artifactId>spring-data-jpa-showcase</artifactId>
6-
7-
<parent>
8-
<groupId>org.springframework.data.jpa.examples</groupId>
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<artifactId>spring-data-jpa-showcase</artifactId>
6+
7+
<parent>
8+
<groupId>org.springframework.data.jpa.examples</groupId>
99
<artifactId>spring-data-jpa-examples-parent</artifactId>
10-
<version>1.0.0.BUILD-SNAPSHOT</version>
10+
<version>1.0.2.BUILD-SNAPSHOT</version>
1111
<relativePath>../pom.xml</relativePath>
12-
</parent>
13-
14-
<name>Spring Data JPA showcase</name>
15-
<description>Sample project showing how Spring Data JPA eases implementing repositories over a plain JPA/Spring approach</description>
16-
17-
<properties>
18-
<querydsl.version>2.1.1</querydsl.version>
19-
</properties>
12+
</parent>
13+
14+
<name>Spring Data JPA showcase</name>
15+
<description>Sample project showing how Spring Data JPA eases implementing repositories over a plain JPA/Spring approach</description>
16+
17+
<properties>
18+
<querydsl.version>2.2.5</querydsl.version>
19+
</properties>
20+
21+
<build>
22+
23+
<resources>
24+
<resource>
25+
<directory>src/main/resources</directory>
26+
</resource>
27+
<resource>
28+
<directory>src/snippets/resources</directory>
29+
</resource>
30+
</resources>
31+
32+
<plugins>
2033

21-
<build>
22-
23-
<resources>
24-
<resource>
25-
<directory>src/main/resources</directory>
26-
</resource>
27-
<resource>
28-
<directory>src/snippets/resources</directory>
29-
</resource>
30-
</resources>
31-
32-
<plugins>
33-
34-
<plugin>
35-
<groupId>org.codehaus.mojo</groupId>
36-
<artifactId>build-helper-maven-plugin</artifactId>
37-
<version>1.5</version>
38-
<executions>
39-
<execution>
40-
<id>add-source</id>
41-
<phase>generate-sources</phase>
42-
<goals>
43-
<goal>add-source</goal>
44-
</goals>
45-
<configuration>
46-
<sources>
47-
<source>${basedir}/src/snippets/java</source>
48-
</sources>
49-
</configuration>
50-
</execution>
51-
<execution>
52-
<id>add-test-source</id>
53-
<phase>generate-sources</phase>
54-
<goals>
55-
<goal>add-test-source</goal>
56-
</goals>
57-
<configuration>
58-
<sources>
59-
<source>${basedir}/src/test-snippets/java</source>
60-
</sources>
61-
</configuration>
62-
</execution>
63-
</executions>
64-
</plugin>
65-
66-
<plugin>
34+
<plugin>
35+
<groupId>org.codehaus.mojo</groupId>
36+
<artifactId>build-helper-maven-plugin</artifactId>
37+
<version>1.5</version>
38+
<executions>
39+
<execution>
40+
<id>add-source</id>
41+
<phase>generate-sources</phase>
42+
<goals>
43+
<goal>add-source</goal>
44+
</goals>
45+
<configuration>
46+
<sources>
47+
<source>${basedir}/src/snippets/java</source>
48+
</sources>
49+
</configuration>
50+
</execution>
51+
<execution>
52+
<id>add-test-source</id>
53+
<phase>generate-sources</phase>
54+
<goals>
55+
<goal>add-test-source</goal>
56+
</goals>
57+
<configuration>
58+
<sources>
59+
<source>${basedir}/src/test-snippets/java</source>
60+
</sources>
61+
</configuration>
62+
</execution>
63+
</executions>
64+
</plugin>
65+
66+
<plugin>
6767
<groupId>org.apache.maven.plugins</groupId>
6868
<artifactId>maven-surefire-plugin</artifactId>
6969
<version>2.4.3</version>
@@ -73,42 +73,43 @@
7373
</excludes>
7474
</configuration>
7575
</plugin>
76-
</plugins>
77-
</build>
78-
79-
<profiles>
80-
<profile>
81-
<id>querydsl</id>
82-
<activation>
83-
<activeByDefault>true</activeByDefault>
84-
</activation>
85-
<dependencies>
86-
<!-- QueryDsl -->
76+
</plugins>
77+
</build>
78+
79+
<profiles>
80+
<profile>
81+
<id>querydsl</id>
82+
<activation>
83+
<activeByDefault>true</activeByDefault>
84+
</activation>
85+
<dependencies>
86+
87+
<!-- QueryDsl -->
8788
<dependency>
8889
<groupId>com.mysema.querydsl</groupId>
8990
<artifactId>querydsl-apt</artifactId>
9091
<version>${querydsl.version}</version>
9192
<scope>provided</scope>
9293
</dependency>
93-
94+
9495
<dependency>
9596
<groupId>com.mysema.querydsl</groupId>
9697
<artifactId>querydsl-jpa</artifactId>
9798
<version>${querydsl.version}</version>
9899
</dependency>
99-
</dependencies>
100-
101-
<repositories>
102-
<repository>
100+
</dependencies>
101+
102+
<repositories>
103+
<repository>
103104
<id>querydsl</id>
104105
<name>QueryDsl</name>
105106
<url>http://source.mysema.com/maven2/releases</url>
106107
</repository>
107-
</repositories>
108-
109-
<build>
110-
<plugins>
111-
<plugin>
108+
</repositories>
109+
110+
<build>
111+
<plugins>
112+
<plugin>
112113
<groupId>com.mysema.maven</groupId>
113114
<artifactId>maven-apt-plugin</artifactId>
114115
<version>1.0</version>
@@ -125,9 +126,9 @@
125126
</execution>
126127
</executions>
127128
</plugin>
128-
</plugins>
129-
</build>
130-
</profile>
131-
</profiles>
129+
</plugins>
130+
</build>
131+
</profile>
132+
</profiles>
132133

133134
</project>

0 commit comments

Comments
 (0)