Skip to content

Commit 556b7ca

Browse files
author
eugenp
committed
maven work
1 parent 10cceaa commit 556b7ca

File tree

42 files changed

+177
-166
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+177
-166
lines changed

‎spring-all/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -210,21 +210,21 @@
210210

211211
<properties>
212212
<!-- Spring -->
213-
<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
214-
<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
215-
<javassist.version>3.19.0-GA</javassist.version>
213+
<org.springframework.version>4.2.0.RELEASE</org.springframework.version>
214+
<org.springframework.security.version>4.0.2.RELEASE</org.springframework.security.version>
215+
<javassist.version>3.20.0-GA</javassist.version>
216216
<jstl.version>1.2</jstl.version>
217217

218218
<!-- persistence -->
219-
<hibernate.version>4.3.10.Final</hibernate.version>
220-
<mysql-connector-java.version>5.1.35</mysql-connector-java.version>
219+
<hibernate.version>4.3.11.Final</hibernate.version>
220+
<mysql-connector-java.version>5.1.36</mysql-connector-java.version>
221221

222222
<!-- logging -->
223223
<org.slf4j.version>1.7.12</org.slf4j.version>
224224
<logback.version>1.1.3</logback.version>
225225

226226
<!-- various -->
227-
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
227+
<hibernate-validator.version>5.2.1.Final</hibernate-validator.version>
228228

229229
<!-- util -->
230230
<guava.version>18.0</guava.version>
@@ -245,7 +245,7 @@
245245
<maven-war-plugin.version>2.6</maven-war-plugin.version>
246246
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
247247
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
248-
<cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
248+
<cargo-maven2-plugin.version>1.4.15</cargo-maven2-plugin.version>
249249

250250
</properties>
251251

‎spring-data-mongodb/.project‎

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,29 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>spring-data-mongodb</name>
4-
<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
5-
<projects/>
6-
<buildSpec>
7-
<buildCommand>
8-
<name>org.eclipse.jdt.core.javabuilder</name>
9-
</buildCommand>
10-
<buildCommand>
11-
<name>org.eclipse.m2e.core.maven2Builder</name>
12-
</buildCommand>
13-
</buildSpec>
14-
<natures>
15-
<nature>org.eclipse.jdt.core.javanature</nature>
16-
<nature>org.eclipse.m2e.core.maven2Nature</nature>
17-
</natures>
18-
</projectDescription>
3+
<name>spring-data-mongodb</name>
4+
<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.springframework.ide.eclipse.core.springbuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
</buildSpec>
24+
<natures>
25+
<nature>org.springframework.ide.eclipse.core.springnature</nature>
26+
<nature>org.eclipse.jdt.core.javanature</nature>
27+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
28+
</natures>
29+
</projectDescription>

‎spring-data-mongodb/src/test/java/org/baeldung/mongotemplate/DocumentQueryIntegrationTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void givenUsersExist_whenFindingUserWithNameStartWithA_thenUsersAreFound(
102102
query.addCriteria(Criteria.where("name").regex("^A"));
103103

104104
List<User> users = mongoTemplate.find(query, User.class);
105-
105+
106106
assertThat(users.size(), is(2));
107107
}
108108

@@ -127,7 +127,7 @@ public void givenUsersExist_whenFindingUserWithNameEndWithC_thenUsersAreFound()
127127
query.addCriteria(Criteria.where("name").regex("c$"));
128128

129129
List<User> users = mongoTemplate.find(query, User.class);
130-
130+
131131
assertThat(users.size(), is(1));
132132
}
133133

@@ -153,7 +153,7 @@ public void givenUsersExist_whenFindingByPage_thenUsersAreFoundByPage() {
153153
query.with(pageableRequest);
154154

155155
List<User> users = mongoTemplate.find(query, User.class);
156-
156+
157157
assertThat(users.size(), is(2));
158158
}
159159

@@ -178,11 +178,11 @@ public void givenUsersExist_whenFindingUsersAndSortThem_thenUsersAreFoundAndSort
178178
query.with(new Sort(Sort.Direction.ASC, "age"));
179179

180180
List<User> users = mongoTemplate.find(query, User.class);
181-
181+
182182
Iterator<User> iter = users.iterator();
183-
assertThat(users.size(), is(3));
183+
assertThat(users.size(), is(3));
184184
assertThat(iter.next().getName(), is("Antony"));
185185
assertThat(iter.next().getName(), is("Alice"));
186-
assertThat(iter.next().getName(), is("Eric"));
186+
assertThat(iter.next().getName(), is("Eric"));
187187
}
188188
}

‎spring-data-mongodb/src/test/java/org/baeldung/repository/QueryMethodsIntegrationTest.java‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import static org.hamcrest.CoreMatchers.is;
44
import static org.junit.Assert.assertThat;
55

6-
76
import java.util.List;
87

98
import org.baeldung.config.MongoConfig;
@@ -13,7 +12,6 @@
1312
import org.springframework.test.context.ContextConfiguration;
1413
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
1514

16-
1715
@RunWith(SpringJUnit4ClassRunner.class)
1816
@ContextConfiguration(classes = MongoConfig.class)
1917
public class QueryMethodsIntegrationTest extends BaseQueryIntegrationTest {
@@ -32,7 +30,7 @@ public void givenUsersExist_whenFindingUsersByName_thenUsersAreFound() {
3230
List<User> users = userRepository.findByName("Eric");
3331
assertThat(users.size(), is(1));
3432
}
35-
33+
3634
@Test
3735
public void givenUsersExist_whenFindingUsersWithAgeCreaterThanAndLessThan_thenUsersAreFound() {
3836
User user = new User();
@@ -53,7 +51,7 @@ public void givenUsersExist_whenFindingUsersWithAgeCreaterThanAndLessThan_thenUs
5351
List<User> users = userRepository.findByAgeBetween(26, 40);
5452
assertThat(users.size(), is(1));
5553
}
56-
54+
5755
@Test
5856
public void givenUsersExist_whenFindingUserWithNameStartWithA_thenUsersAreFound() {
5957
User user = new User();
@@ -74,7 +72,7 @@ public void givenUsersExist_whenFindingUserWithNameStartWithA_thenUsersAreFound(
7472
List<User> users = userRepository.findByNameStartingWith("A");
7573
assertThat(users.size(), is(2));
7674
}
77-
75+
7876
@Test
7977
public void givenUsersExist_whenFindingUserWithNameEndWithC_thenUsersAreFound() {
8078
User user = new User();
@@ -93,10 +91,10 @@ public void givenUsersExist_whenFindingUserWithNameEndWithC_thenUsersAreFound()
9391
mongoOps.insert(user);
9492

9593
List<User> users = userRepository.findByNameEndingWith("c");
96-
94+
9795
assertThat(users.size(), is(1));
9896
}
99-
97+
10098
@Test
10199
public void givenUsersExist_whenFindingUsersAndSortThem_thenUsersAreFoundAndSorted() {
102100
User user = new User();
@@ -115,8 +113,7 @@ public void givenUsersExist_whenFindingUsersAndSortThem_thenUsersAreFoundAndSort
115113
mongoOps.insert(user);
116114

117115
List<User> users = userRepository.findByNameLikeOrderByAgeAsc("A");
118-
116+
119117
assertThat(users.size(), is(2));
120118
}
121119
}
122-

‎spring-exceptions/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</classpathentry>
3131
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
3232
<attributes>
33-
<attribute name="owner.project.facets" value="java"/>
33+
<attribute name="maven.pomderived" value="true"/>
3434
</attributes>
3535
</classpathentry>
3636
<classpathentry kind="output" path="target/classes"/>

‎spring-exceptions/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -203,22 +203,22 @@
203203

204204
<properties>
205205
<!-- Spring -->
206-
<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
207-
<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
208-
<javassist.version>3.19.0-GA</javassist.version>
206+
<org.springframework.version>4.2.0.RELEASE</org.springframework.version>
207+
<org.springframework.security.version>4.0.2.RELEASE</org.springframework.security.version>
208+
<javassist.version>3.20.0-GA</javassist.version>
209209
<jstl.version>1.2</jstl.version>
210210

211211
<!-- persistence -->
212-
<hibernate.version>4.3.10.Final</hibernate.version>
213-
<mysql-connector-java.version>5.1.35</mysql-connector-java.version>
212+
<hibernate.version>4.3.11.Final</hibernate.version>
213+
<mysql-connector-java.version>5.1.36</mysql-connector-java.version>
214214
<tomcat-dbcp.version>7.0.42</tomcat-dbcp.version>
215215

216216
<!-- logging -->
217217
<org.slf4j.version>1.7.12</org.slf4j.version>
218218
<logback.version>1.1.3</logback.version>
219219

220220
<!-- various -->
221-
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
221+
<hibernate-validator.version>5.2.1.Final</hibernate-validator.version>
222222

223223
<!-- util -->
224224
<guava.version>18.0</guava.version>
@@ -240,7 +240,7 @@
240240
<maven-war-plugin.version>2.6</maven-war-plugin.version>
241241
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
242242
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
243-
<cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
243+
<cargo-maven2-plugin.version>1.4.15</cargo-maven2-plugin.version>
244244

245245
</properties>
246246

‎spring-hibernate3/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</classpathentry>
3030
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
3131
<attributes>
32-
<attribute name="owner.project.facets" value="java"/>
32+
<attribute name="maven.pomderived" value="true"/>
3333
</attributes>
3434
</classpathentry>
3535
<classpathentry kind="output" path="target/classes"/>

‎spring-hibernate3/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,21 +162,21 @@
162162

163163
<properties>
164164
<!-- Spring -->
165-
<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
166-
<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
167-
<javassist.version>3.19.0-GA</javassist.version>
165+
<org.springframework.version>4.2.0.RELEASE</org.springframework.version>
166+
<org.springframework.security.version>4.0.2.RELEASE</org.springframework.security.version>
167+
<javassist.version>3.20.0-GA</javassist.version>
168168

169169
<!-- persistence -->
170170
<hibernate.version>3.6.10.Final</hibernate.version>
171-
<mysql-connector-java.version>5.1.35</mysql-connector-java.version>
171+
<mysql-connector-java.version>5.1.36</mysql-connector-java.version>
172172
<tomcat-dbcp.version>7.0.47</tomcat-dbcp.version>
173173

174174
<!-- logging -->
175175
<org.slf4j.version>1.7.12</org.slf4j.version>
176176
<logback.version>1.1.3</logback.version>
177177

178178
<!-- various -->
179-
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
179+
<hibernate-validator.version>5.2.1.Final</hibernate-validator.version>
180180

181181
<!-- util -->
182182
<guava.version>18.0</guava.version>
@@ -196,7 +196,7 @@
196196
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
197197
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
198198
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
199-
<cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
199+
<cargo-maven2-plugin.version>1.4.15</cargo-maven2-plugin.version>
200200

201201
</properties>
202202

‎spring-hibernate4/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</classpathentry>
3030
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
3131
<attributes>
32-
<attribute name="owner.project.facets" value="java"/>
32+
<attribute name="maven.pomderived" value="true"/>
3333
</attributes>
3434
</classpathentry>
3535
<classpathentry kind="output" path="target/classes"/>

‎spring-hibernate4/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -169,21 +169,21 @@
169169

170170
<properties>
171171
<!-- Spring -->
172-
<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
173-
<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
174-
<javassist.version>3.19.0-GA</javassist.version>
172+
<org.springframework.version>4.2.0.RELEASE</org.springframework.version>
173+
<org.springframework.security.version>4.0.2.RELEASE</org.springframework.security.version>
174+
<javassist.version>3.20.0-GA</javassist.version>
175175

176176
<!-- persistence -->
177-
<hibernate.version>4.3.10.Final</hibernate.version>
178-
<mysql-connector-java.version>5.1.35</mysql-connector-java.version>
177+
<hibernate.version>4.3.11.Final</hibernate.version>
178+
<mysql-connector-java.version>5.1.36</mysql-connector-java.version>
179179
<tomcat-dbcp.version>7.0.42</tomcat-dbcp.version>
180180

181181
<!-- logging -->
182182
<org.slf4j.version>1.7.12</org.slf4j.version>
183183
<logback.version>1.1.3</logback.version>
184184

185185
<!-- various -->
186-
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
186+
<hibernate-validator.version>5.2.1.Final</hibernate-validator.version>
187187

188188
<!-- util -->
189189
<guava.version>18.0</guava.version>
@@ -203,7 +203,7 @@
203203
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
204204
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
205205
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
206-
<cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
206+
<cargo-maven2-plugin.version>1.4.15</cargo-maven2-plugin.version>
207207

208208
</properties>
209209

0 commit comments

Comments
 (0)