From 205a84d8345a51544876be572fc2805b1ada7c4f Mon Sep 17 00:00:00 2001
From: eugenp <hanriseldon@gmail.com>
Date: Fri, 18 Nov 2016 13:26:34 +0200
Subject: [PATCH] major upgrades

---
 spring-mvc-java/pom.xml                       |  4 ++--
 spring-security-rest-full/pom.xml             | 20 +++++++------------
 .../persistence/dao/MyUserPredicate.java      |  8 ++++----
 .../dao/MyUserPredicatesBuilder.java          |  2 +-
 .../persistence/dao/MyUserRepository.java     |  2 +-
 .../web/controller/UserController.java        |  4 ++--
 6 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml
index 011de70ad2..8e2db044a6 100644
--- a/spring-mvc-java/pom.xml
+++ b/spring-mvc-java/pom.xml
@@ -248,8 +248,8 @@
     
     <properties>
         <!-- Spring -->
-        <org.springframework.version>4.2.5.RELEASE</org.springframework.version>
-        <org.springframework.security.version>4.0.4.RELEASE</org.springframework.security.version>
+        <org.springframework.version>4.3.4.RELEASE</org.springframework.version>
+        <org.springframework.security.version>4.2.0.RELEASE</org.springframework.security.version>
         <thymeleaf.version>2.1.4.RELEASE</thymeleaf.version>
         <jackson.version>2.7.8</jackson.version>
 
diff --git a/spring-security-rest-full/pom.xml b/spring-security-rest-full/pom.xml
index 957a349d3c..ab354d51a7 100644
--- a/spring-security-rest-full/pom.xml
+++ b/spring-security-rest-full/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.3.8.RELEASE</version>
+        <version>1.4.2.RELEASE</version>
     </parent>
 
     <dependencies>
@@ -109,14 +109,12 @@
         <!-- Querydsl -->
 
         <dependency>
-            <groupId>com.mysema.querydsl</groupId>
+            <groupId>com.querydsl</groupId>
             <artifactId>querydsl-apt</artifactId>
-            <version>${querydsl.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.mysema.querydsl</groupId>
+            <groupId>com.querydsl</groupId>
             <artifactId>querydsl-jpa</artifactId>
-            <version>${querydsl.version}</version>
         </dependency>
 
         <!-- Rsql -->
@@ -161,7 +159,6 @@
         <dependency>
             <groupId>xml-apis</groupId>
             <artifactId>xml-apis</artifactId>
-            <version>${xml-apis.version}</version>
         </dependency>
         <dependency>
             <groupId>org.javassist</groupId>
@@ -358,7 +355,7 @@
                         </goals>
                         <configuration>
                             <outputDirectory>target/generated-sources/java</outputDirectory>
-                            <processor>com.mysema.query.apt.jpa.JPAAnnotationProcessor</processor>
+                            <processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
                         </configuration>
                     </execution>
                 </executions>
@@ -467,16 +464,13 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>4.2.5.RELEASE</org.springframework.version>
-        <org.springframework.security.version>4.0.4.RELEASE</org.springframework.security.version>
 
         <!-- persistence -->
         <hibernate.version>4.3.11.Final</hibernate.version>
-        <mysql-connector-java.version>5.1.38</mysql-connector-java.version>
-        <spring-data-jpa.version>1.8.2.RELEASE</spring-data-jpa.version>
+        <mysql-connector-java.version>5.1.40</mysql-connector-java.version>
 
         <rsql.version>2.0.0</rsql.version>
-        <querydsl.version>3.6.2</querydsl.version>
+        <querydsl.version>4.1.4</querydsl.version>
 
         <!-- marshalling -->
         <jackson.version>2.7.8</jackson.version>
@@ -505,7 +499,7 @@
         <rest-assured.version>2.9.0</rest-assured.version>
 
         <!-- Maven plugins -->
-        <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
         <cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/MyUserPredicate.java b/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/MyUserPredicate.java
index 7a00e7490c..63ae35ec1f 100644
--- a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/MyUserPredicate.java
+++ b/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/MyUserPredicate.java
@@ -3,10 +3,10 @@ package org.baeldung.persistence.dao;
 import org.baeldung.persistence.model.MyUser;
 import org.baeldung.web.util.SearchCriteria;
 
-import com.mysema.query.types.expr.BooleanExpression;
-import com.mysema.query.types.path.NumberPath;
-import com.mysema.query.types.path.PathBuilder;
-import com.mysema.query.types.path.StringPath;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.PathBuilder;
+import com.querydsl.core.types.dsl.StringPath;
 
 public class MyUserPredicate {
 
diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/MyUserPredicatesBuilder.java b/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/MyUserPredicatesBuilder.java
index 5e08bde273..caee59c1ec 100644
--- a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/MyUserPredicatesBuilder.java
+++ b/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/MyUserPredicatesBuilder.java
@@ -5,7 +5,7 @@ import java.util.List;
 
 import org.baeldung.web.util.SearchCriteria;
 
-import com.mysema.query.types.expr.BooleanExpression;
+import com.querydsl.core.types.dsl.BooleanExpression;
 
 public final class MyUserPredicatesBuilder {
     private final List<SearchCriteria> params;
diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/MyUserRepository.java b/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/MyUserRepository.java
index db3627817a..029b57016b 100644
--- a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/MyUserRepository.java
+++ b/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/MyUserRepository.java
@@ -7,7 +7,7 @@ import org.springframework.data.querydsl.QueryDslPredicateExecutor;
 import org.springframework.data.querydsl.binding.QuerydslBinderCustomizer;
 import org.springframework.data.querydsl.binding.QuerydslBindings;
 
-import com.mysema.query.types.path.StringPath;
+import com.querydsl.core.types.dsl.StringPath;
 
 public interface MyUserRepository extends JpaRepository<MyUser, Long>, QueryDslPredicateExecutor<MyUser>, QuerydslBinderCustomizer<QMyUser> {
     @Override
diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/controller/UserController.java b/spring-security-rest-full/src/main/java/org/baeldung/web/controller/UserController.java
index cf46e35e57..d20423ddc0 100644
--- a/spring-security-rest-full/src/main/java/org/baeldung/web/controller/UserController.java
+++ b/spring-security-rest-full/src/main/java/org/baeldung/web/controller/UserController.java
@@ -29,8 +29,8 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
-import com.mysema.query.types.Predicate;
-import com.mysema.query.types.expr.BooleanExpression;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.core.types.dsl.BooleanExpression;
 
 import cz.jirutka.rsql.parser.RSQLParser;
 import cz.jirutka.rsql.parser.ast.Node;