maven work

Georgieva777 · Aug 15, 2015 · 556b7ca · 556b7ca
1 parent 10cceaa
commit 556b7ca
Show file tree

Hide file tree

Showing 42 changed files with 177 additions and 166 deletions.
diff --git a/spring-all/pom.xml b/spring-all/pom.xml
@@ -210,21 +210,21 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>4.1.6.RELEASE</org.springframework.version>
-        <org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
-        <javassist.version>3.19.0-GA</javassist.version>
+        <org.springframework.version>4.2.0.RELEASE</org.springframework.version>
+        <org.springframework.security.version>4.0.2.RELEASE</org.springframework.security.version>
+        <javassist.version>3.20.0-GA</javassist.version>
         <jstl.version>1.2</jstl.version>
 
         <!-- persistence -->
-        <hibernate.version>4.3.10.Final</hibernate.version>
-        <mysql-connector-java.version>5.1.35</mysql-connector-java.version>
+        <hibernate.version>4.3.11.Final</hibernate.version>
+        <mysql-connector-java.version>5.1.36</mysql-connector-java.version>
 
         <!-- logging -->
         <org.slf4j.version>1.7.12</org.slf4j.version>
         <logback.version>1.1.3</logback.version>
 
         <!-- various -->
-        <hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
+        <hibernate-validator.version>5.2.1.Final</hibernate-validator.version>
 
         <!-- util -->
         <guava.version>18.0</guava.version>
@@ -245,7 +245,7 @@
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
-        <cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
+        <cargo-maven2-plugin.version>1.4.15</cargo-maven2-plugin.version>
 
     </properties>
 

diff --git a/spring-data-mongodb/.project b/spring-data-mongodb/.project
@@ -1,18 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>spring-data-mongodb</name>
-  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.m2e.core.maven2Builder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-    <nature>org.eclipse.m2e.core.maven2Nature</nature>
-  </natures>
-</projectDescription>
+	<name>spring-data-mongodb</name>
+	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.springframework.ide.eclipse.core.springnature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/...g-data-mongodb/src/test/java/org/baeldung/mongotemplate/DocumentQueryIntegrationTest.java b/...g-data-mongodb/src/test/java/org/baeldung/mongotemplate/DocumentQueryIntegrationTest.java
@@ -102,7 +102,7 @@ public void givenUsersExist_whenFindingUserWithNameStartWithA_thenUsersAreFound(
         query.addCriteria(Criteria.where("name").regex("^A"));
 
         List<User> users = mongoTemplate.find(query, User.class);
-        
+
         assertThat(users.size(), is(2));
     }
 
@@ -127,7 +127,7 @@ public void givenUsersExist_whenFindingUserWithNameEndWithC_thenUsersAreFound()
         query.addCriteria(Criteria.where("name").regex("c$"));
 
         List<User> users = mongoTemplate.find(query, User.class);
-        
+
         assertThat(users.size(), is(1));
     }
 
@@ -153,7 +153,7 @@ public void givenUsersExist_whenFindingByPage_thenUsersAreFoundByPage() {
         query.with(pageableRequest);
 
         List<User> users = mongoTemplate.find(query, User.class);
-        
+
         assertThat(users.size(), is(2));
     }
 
@@ -178,11 +178,11 @@ public void givenUsersExist_whenFindingUsersAndSortThem_thenUsersAreFoundAndSort
         query.with(new Sort(Sort.Direction.ASC, "age"));
 
         List<User> users = mongoTemplate.find(query, User.class);
-        
+
         Iterator<User> iter = users.iterator();
-        assertThat(users.size(), is(3)); 
+        assertThat(users.size(), is(3));
         assertThat(iter.next().getName(), is("Antony"));
         assertThat(iter.next().getName(), is("Alice"));
-        assertThat(iter.next().getName(), is("Eric"));  
+        assertThat(iter.next().getName(), is("Eric"));
     }
 }
diff --git a/spring-data-mongodb/src/test/java/org/baeldung/repository/QueryMethodsIntegrationTest.java b/spring-data-mongodb/src/test/java/org/baeldung/repository/QueryMethodsIntegrationTest.java
@@ -3,7 +3,6 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
-
 import java.util.List;
 
 import org.baeldung.config.MongoConfig;
@@ -13,7 +12,6 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = MongoConfig.class)
 public class QueryMethodsIntegrationTest extends BaseQueryIntegrationTest {
@@ -32,7 +30,7 @@ public void givenUsersExist_whenFindingUsersByName_thenUsersAreFound() {
         List<User> users = userRepository.findByName("Eric");
         assertThat(users.size(), is(1));
     }
-    
+
     @Test
     public void givenUsersExist_whenFindingUsersWithAgeCreaterThanAndLessThan_thenUsersAreFound() {
         User user = new User();
@@ -53,7 +51,7 @@ public void givenUsersExist_whenFindingUsersWithAgeCreaterThanAndLessThan_thenUs
         List<User> users = userRepository.findByAgeBetween(26, 40);
         assertThat(users.size(), is(1));
     }
-    
+
     @Test
     public void givenUsersExist_whenFindingUserWithNameStartWithA_thenUsersAreFound() {
         User user = new User();
@@ -74,7 +72,7 @@ public void givenUsersExist_whenFindingUserWithNameStartWithA_thenUsersAreFound(
         List<User> users = userRepository.findByNameStartingWith("A");
         assertThat(users.size(), is(2));
     }
-    
+
     @Test
     public void givenUsersExist_whenFindingUserWithNameEndWithC_thenUsersAreFound() {
         User user = new User();
@@ -93,10 +91,10 @@ public void givenUsersExist_whenFindingUserWithNameEndWithC_thenUsersAreFound()
         mongoOps.insert(user);
 
         List<User> users = userRepository.findByNameEndingWith("c");
-        
+
         assertThat(users.size(), is(1));
     }
-    
+
     @Test
     public void givenUsersExist_whenFindingUsersAndSortThem_thenUsersAreFoundAndSorted() {
         User user = new User();
@@ -115,8 +113,7 @@ public void givenUsersExist_whenFindingUsersAndSortThem_thenUsersAreFoundAndSort
         mongoOps.insert(user);
 
         List<User> users = userRepository.findByNameLikeOrderByAgeAsc("A");
-        
+
         assertThat(users.size(), is(2));
     }
 }
-
diff --git a/spring-exceptions/.classpath b/spring-exceptions/.classpath
@@ -30,7 +30,7 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/spring-exceptions/pom.xml b/spring-exceptions/pom.xml
@@ -203,22 +203,22 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>4.1.6.RELEASE</org.springframework.version>
-        <org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
-        <javassist.version>3.19.0-GA</javassist.version>
+        <org.springframework.version>4.2.0.RELEASE</org.springframework.version>
+        <org.springframework.security.version>4.0.2.RELEASE</org.springframework.security.version>
+        <javassist.version>3.20.0-GA</javassist.version>
         <jstl.version>1.2</jstl.version>
 
         <!-- persistence -->
-        <hibernate.version>4.3.10.Final</hibernate.version>
-        <mysql-connector-java.version>5.1.35</mysql-connector-java.version>
+        <hibernate.version>4.3.11.Final</hibernate.version>
+        <mysql-connector-java.version>5.1.36</mysql-connector-java.version>
         <tomcat-dbcp.version>7.0.42</tomcat-dbcp.version>
 
         <!-- logging -->
         <org.slf4j.version>1.7.12</org.slf4j.version>
         <logback.version>1.1.3</logback.version>
 
         <!-- various -->
-        <hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
+        <hibernate-validator.version>5.2.1.Final</hibernate-validator.version>
 
         <!-- util -->
         <guava.version>18.0</guava.version>
@@ -240,7 +240,7 @@
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
-        <cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
+        <cargo-maven2-plugin.version>1.4.15</cargo-maven2-plugin.version>
 
     </properties>
 

diff --git a/spring-hibernate3/.classpath b/spring-hibernate3/.classpath
@@ -29,7 +29,7 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/spring-hibernate3/pom.xml b/spring-hibernate3/pom.xml
@@ -162,21 +162,21 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>4.1.6.RELEASE</org.springframework.version>
-        <org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
-        <javassist.version>3.19.0-GA</javassist.version>
+        <org.springframework.version>4.2.0.RELEASE</org.springframework.version>
+        <org.springframework.security.version>4.0.2.RELEASE</org.springframework.security.version>
+        <javassist.version>3.20.0-GA</javassist.version>
 
         <!-- persistence -->
         <hibernate.version>3.6.10.Final</hibernate.version>
-        <mysql-connector-java.version>5.1.35</mysql-connector-java.version>
+        <mysql-connector-java.version>5.1.36</mysql-connector-java.version>
         <tomcat-dbcp.version>7.0.47</tomcat-dbcp.version>
 
         <!-- logging -->
         <org.slf4j.version>1.7.12</org.slf4j.version>
         <logback.version>1.1.3</logback.version>
 
         <!-- various -->
-        <hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
+        <hibernate-validator.version>5.2.1.Final</hibernate-validator.version>
 
         <!-- util -->
         <guava.version>18.0</guava.version>
@@ -196,7 +196,7 @@
         <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
-        <cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
+        <cargo-maven2-plugin.version>1.4.15</cargo-maven2-plugin.version>
 
     </properties>
 

diff --git a/spring-hibernate4/.classpath b/spring-hibernate4/.classpath
@@ -29,7 +29,7 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/spring-hibernate4/pom.xml b/spring-hibernate4/pom.xml
@@ -169,21 +169,21 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>4.1.6.RELEASE</org.springframework.version>
-        <org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
-        <javassist.version>3.19.0-GA</javassist.version>
+        <org.springframework.version>4.2.0.RELEASE</org.springframework.version>
+        <org.springframework.security.version>4.0.2.RELEASE</org.springframework.security.version>
+        <javassist.version>3.20.0-GA</javassist.version>
 
         <!-- persistence -->
-        <hibernate.version>4.3.10.Final</hibernate.version>
-        <mysql-connector-java.version>5.1.35</mysql-connector-java.version>
+        <hibernate.version>4.3.11.Final</hibernate.version>
+        <mysql-connector-java.version>5.1.36</mysql-connector-java.version>
         <tomcat-dbcp.version>7.0.42</tomcat-dbcp.version>
 
         <!-- logging -->
         <org.slf4j.version>1.7.12</org.slf4j.version>
         <logback.version>1.1.3</logback.version>
 
         <!-- various -->
-        <hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
+        <hibernate-validator.version>5.2.1.Final</hibernate-validator.version>
 
         <!-- util -->
         <guava.version>18.0</guava.version>
@@ -203,7 +203,7 @@
         <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
-        <cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
+        <cargo-maven2-plugin.version>1.4.15</cargo-maven2-plugin.version>
 
     </properties>
 

diff --git a/spring-jpa/pom.xml b/spring-jpa/pom.xml
@@ -174,21 +174,21 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>4.1.6.RELEASE</org.springframework.version>
-        <org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
-        <javassist.version>3.19.0-GA</javassist.version>
+        <org.springframework.version>4.2.0.RELEASE</org.springframework.version>
+        <org.springframework.version>4.0.2.RELEASE</org.springframework.version>
+        <javassist.version>3.20.0-GA</javassist.version>
 
         <!-- persistence -->
-        <hibernate.version>4.3.10.Final</hibernate.version>
-        <mysql-connector-java.version>5.1.35</mysql-connector-java.version>
+        <hibernate.version>4.3.11.Final</hibernate.version>
+        <mysql-connector-java.version>5.1.36</mysql-connector-java.version>
         <spring-data-jpa.version>1.7.2.RELEASE</spring-data-jpa.version>
 
         <!-- logging -->
         <org.slf4j.version>1.7.12</org.slf4j.version>
         <logback.version>1.1.3</logback.version>
 
         <!-- various -->
-        <hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
+        <hibernate-validator.version>5.2.1.Final</hibernate-validator.version>
 
         <!-- util -->
         <guava.version>18.0</guava.version>
@@ -208,7 +208,7 @@
         <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
-        <cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
+        <cargo-maven2-plugin.version>1.4.15</cargo-maven2-plugin.version>
         <!-- <maven-war-plugin.version>2.6</maven-war-plugin.version> -->
 
     </properties>

diff --git a/spring-mvc-java/.classpath b/spring-mvc-java/.classpath
@@ -30,7 +30,7 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>