diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1a1d70f..0112c46 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,4 +33,4 @@ jobs:
       env:
         MODULE: ${{ matrix.module }}
       run: |
-        chmod 755 build-all.sh && ./build-all.sh
+        chmod 755 build-all.sh && ./build-all.sh $MODULE
diff --git a/build-all.sh b/build-all.sh
index 8444bfa..2932ac2 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+MODULE=$1
 MAIN_DIR=$PWD
 
 build_gradle_module() {
@@ -125,8 +126,8 @@ then
   build_gradle_module "spring-cloud/feign-with-spring-data-rest"
   build_gradle_module "spring-cloud/sleuth-downstream-service"
   build_gradle_module "spring-cloud/sleuth-upstream-service"
+  build_gradle_module "spring-cloud/spring-cloud-contract-provider" # has to run before consumer
   build_gradle_module "spring-cloud/spring-cloud-contract-consumer"
-  build_gradle_module "spring-cloud/spring-cloud-contract-provider"
   build_gradle_module "spring-data/spring-data-rest-associations"
   build_gradle_module "spring-data/spring-data-rest-springfox"
   build_gradle_module "tools/jacoco"
diff --git a/logging/gradlew b/logging/gradlew
old mode 100644
new mode 100755
diff --git a/pact/pact-feign-consumer/gradlew b/pact/pact-feign-consumer/gradlew
old mode 100644
new mode 100755
diff --git a/pact/pact-spring-provider/gradlew b/pact/pact-spring-provider/gradlew
old mode 100644
new mode 100755
diff --git a/spring-boot/cache/gradle/wrapper/gradle-wrapper.jar b/spring-boot/cache/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 62d4c05..0000000
Binary files a/spring-boot/cache/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/spring-boot/cache/gradle/wrapper/gradle-wrapper.properties b/spring-boot/cache/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index a004df5..0000000
--- a/spring-boot/cache/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Mon Jun 15 21:48:44 CEST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
diff --git a/spring-boot/cache/gradlew b/spring-boot/cache/gradlew
old mode 100644
new mode 100755
index 5de2196..4453cce
--- a/spring-boot/cache/gradlew
+++ b/spring-boot/cache/gradlew
@@ -1 +1,172 @@
-#!/usr/bin/env sh

#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#      https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

##############################################################################
##
##  Gradle start up script for UN*X
##
##############################################################################

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ]; do
  ls=$(ls -ld "$PRG")
  link=$(expr "$ls" : '.*-> \(.*\)$')
  if expr "$link" : '/.*' >/dev/null; then
    PRG="$link"
  else
    PRG=$(dirname "$PRG")"/$link"
  fi
done
SAVED="$(pwd)"
cd "$(dirname \"$PRG\")/" >/dev/null
APP_HOME="$(pwd -P)"
cd "$SAVED" >/dev/null

APP_NAME="Gradle"
APP_BASE_NAME=$(basename "$0")

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn() {
  echo "$*"
}

die() {
  echo
  echo "$*"
  echo
  exit 1
}

# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "$(uname)" in
CYGWIN*)
  cygwin=true
  ;;
Darwin*)
  darwin=true
  ;;
MINGW*)
  msys=true
  ;;
NONSTOP*)
  nonstop=true
  ;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ]; then
  if [ -x "$JAVA_HOME/jre/sh/java" ]; then
    # IBM's JDK on AIX uses strange locations for the executables
    JAVACMD="$JAVA_HOME/jre/sh/java"
  else
    JAVACMD="$JAVA_HOME/bin/java"
  fi
  if [ ! -x "$JAVACMD" ]; then
    die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME

Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
  fi
else
  JAVACMD="java"
  which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ]; then
  MAX_FD_LIMIT=$(ulimit -H -n)
  if [ $? -eq 0 ]; then
    if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
      MAX_FD="$MAX_FD_LIMIT"
    fi
    ulimit -n $MAX_FD
    if [ $? -ne 0 ]; then
      warn "Could not set maximum file descriptor limit: $MAX_FD"
    fi
  else
    warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
  fi
fi

# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
  GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ]; then
  APP_HOME=$(cygpath --path --mixed "$APP_HOME")
  CLASSPATH=$(cygpath --path --mixed "$CLASSPATH")

  JAVACMD=$(cygpath --unix "$JAVACMD")

  # We build the pattern for arguments to be converted via cygpath
  ROOTDIRSRAW=$(find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null)
  SEP=""
  for dir in $ROOTDIRSRAW; do
    ROOTDIRS="$ROOTDIRS$SEP$dir"
    SEP="|"
  done
  OURCYGPATTERN="(^($ROOTDIRS))"
  # Add a user-defined pattern to the cygpath arguments
  if [ "$GRADLE_CYGPATTERN" != "" ]; then
    OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
  fi
  # Now convert the arguments - kludge to limit ourselves to /bin/sh
  i=0
  for arg in "$@"; do
    CHECK=$(echo "$arg" | egrep -c "$OURCYGPATTERN" -)
    CHECK2=$(echo "$arg" | egrep -c "^-") ### Determine if an option

    if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ]; then ### Added a condition
      eval $(echo args$i)=$(cygpath --path --ignore --mixed "$arg")
    else
      eval $(echo args$i)="\"$arg\""
    fi
    i=$(expr $i + 1)
  done
  case $i in
  0) set -- ;;
  1) set -- "$args0" ;;
  2) set -- "$args0" "$args1" ;;
  3) set -- "$args0" "$args1" "$args2" ;;
  4) set -- "$args0" "$args1" "$args2" "$args3" ;;
  5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
  6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
  7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
  8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
  9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
  esac
fi

# Escape application args
save() {
  for i; do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/"; done
  echo " "
}
APP_ARGS=$(save "$@")

# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

exec "$JAVACMD" "$@"
\ No newline at end of file
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/spring-boot/cache/gradlew.bat b/spring-boot/cache/gradlew.bat
index 5093609..f955316 100644
--- a/spring-boot/cache/gradlew.bat
+++ b/spring-boot/cache/gradlew.bat
@@ -1,19 +1,3 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -29,11 +13,8 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@@ -84,7 +65,6 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
-
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
diff --git a/spring-boot/conditionals/gradlew b/spring-boot/conditionals/gradlew
old mode 100644
new mode 100755
diff --git a/spring-boot/hazelcast/hazelcast-client-server/gradlew b/spring-boot/hazelcast/hazelcast-client-server/gradlew
old mode 100644
new mode 100755
diff --git a/spring-boot/hazelcast/hazelcast-embedded-cache/gradlew b/spring-boot/hazelcast/hazelcast-embedded-cache/gradlew
old mode 100644
new mode 100755
diff --git a/spring-boot/mocking/gradlew b/spring-boot/mocking/gradlew
old mode 100644
new mode 100755
diff --git a/spring-boot/modular/gradlew b/spring-boot/modular/gradlew
old mode 100644
new mode 100755
diff --git a/spring-boot/paging/gradlew b/spring-boot/paging/gradlew
old mode 100644
new mode 100755
diff --git a/spring-boot/password-encoding/gradlew b/spring-boot/password-encoding/gradlew
old mode 100644
new mode 100755
diff --git a/spring-boot/profiles/gradlew b/spring-boot/profiles/gradlew
old mode 100644
new mode 100755
diff --git a/spring-boot/rabbitmq-event-brokering/gradlew b/spring-boot/rabbitmq-event-brokering/gradlew
old mode 100644
new mode 100755
diff --git a/spring-boot/spring-boot-kafka/mvnw b/spring-boot/spring-boot-kafka/mvnw
old mode 100644
new mode 100755
diff --git a/spring-boot/spring-boot-logging/gradlew b/spring-boot/spring-boot-logging/gradlew
old mode 100644
new mode 100755
diff --git a/spring-boot/testcontainers/gradlew b/spring-boot/testcontainers/gradlew
old mode 100644
new mode 100755
diff --git a/spring-boot/validation/build.gradle b/spring-boot/validation/build.gradle
index 8e081b7..ed9da0c 100644
--- a/spring-boot/validation/build.gradle
+++ b/spring-boot/validation/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.0.5.RELEASE'
+		springBootVersion = '2.3.1.RELEASE'
 	}
 	repositories {
 		mavenCentral()
diff --git a/spring-boot/validation/gradlew b/spring-boot/validation/gradlew
old mode 100644
new mode 100755
diff --git a/spring-cloud/feign-with-spring-data-rest/gradlew b/spring-cloud/feign-with-spring-data-rest/gradlew
old mode 100644
new mode 100755
diff --git a/spring-cloud/sleuth-downstream-service/build.gradle b/spring-cloud/sleuth-downstream-service/build.gradle
index 772760f..108c7c5 100644
--- a/spring-cloud/sleuth-downstream-service/build.gradle
+++ b/spring-cloud/sleuth-downstream-service/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '1.5.4.RELEASE'
+		springBootVersion = '1.5.11.RELEASE'
 	}
 	repositories {
 		mavenCentral()
diff --git a/spring-cloud/sleuth-downstream-service/gradlew b/spring-cloud/sleuth-downstream-service/gradlew
old mode 100644
new mode 100755
diff --git a/spring-cloud/sleuth-upstream-service/build.gradle b/spring-cloud/sleuth-upstream-service/build.gradle
index 014e619..c3ce694 100644
--- a/spring-cloud/sleuth-upstream-service/build.gradle
+++ b/spring-cloud/sleuth-upstream-service/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '1.5.4.RELEASE'
+		springBootVersion = '1.5.11.RELEASE'
 	}
 	repositories {
 		mavenCentral()
diff --git a/spring-cloud/sleuth-upstream-service/gradlew b/spring-cloud/sleuth-upstream-service/gradlew
old mode 100644
new mode 100755
diff --git a/spring-cloud/spring-cloud-contract-consumer/gradlew b/spring-cloud/spring-cloud-contract-consumer/gradlew
old mode 100644
new mode 100755
diff --git a/spring-cloud/spring-cloud-contract-provider/build.gradle b/spring-cloud/spring-cloud-contract-provider/build.gradle
index b7d8223..10529c7 100644
--- a/spring-cloud/spring-cloud-contract-provider/build.gradle
+++ b/spring-cloud/spring-cloud-contract-provider/build.gradle
@@ -58,7 +58,5 @@ contracts {
 
 // a hack to locally publish the contract stubs when executing the build task
 // so that it works in the CI build without a Nexus or Artifactory server
-build.doLast {
-    tasks.generatePomFileForStubsPublication.execute()
-    tasks.publishStubsPublicationToMavenLocal.execute()
-}
+build.dependsOn('generatePomFileForStubsPublication')
+build.dependsOn('publishStubsPublicationToMavenLocal')
diff --git a/spring-cloud/spring-cloud-contract-provider/gradlew b/spring-cloud/spring-cloud-contract-provider/gradlew
old mode 100644
new mode 100755
diff --git a/spring-cloud/spring-cloud-contract-provider/src/test/java/io/reflectoring/UserServiceBase.java b/spring-cloud/spring-cloud-contract-provider/src/test/java/io/reflectoring/UserServiceBase.java
index 493f387..bdb5b10 100644
--- a/spring-cloud/spring-cloud-contract-provider/src/test/java/io/reflectoring/UserServiceBase.java
+++ b/spring-cloud/spring-cloud-contract-provider/src/test/java/io/reflectoring/UserServiceBase.java
@@ -1,43 +1,40 @@
 package io.reflectoring;
 
-import java.util.Optional;
-
 import io.restassured.module.mockmvc.RestAssuredMockMvc;
 import org.junit.Before;
 import org.junit.runner.RunWith;
-import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.context.WebApplicationContext;
+
+import java.util.Optional;
+
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.when;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = DemoApplication.class)
 public abstract class UserServiceBase {
 
-  @Autowired
-  WebApplicationContext webApplicationContext;
+    @Autowired
+    WebApplicationContext webApplicationContext;
 
-  @MockBean
-  private UserRepository userRepository;
+    @MockBean
+    private UserRepository userRepository;
 
-  @Before
-  public void setup() {
-    User savedUser = new User();
-    savedUser.setFirstName("Arthur");
-    savedUser.setLastName("Dent");
-    savedUser.setId(42L);
-    when(userRepository.save(any(User.class))).thenReturn(savedUser);
-    RestAssuredMockMvc.webAppContextSetup(webApplicationContext);
+    @Before
+    public void setup() {
+        User savedUser = new User();
+        savedUser.setFirstName("Arthur");
+        savedUser.setLastName("Dent");
+        savedUser.setId(42L);
+        when(userRepository.save(any(User.class))).thenReturn(savedUser);
+        RestAssuredMockMvc.webAppContextSetup(webApplicationContext);
 
-    when(userRepository.findById(eq(42L))).thenReturn(Optional.of(savedUser));
-  }
+        when(userRepository.findById(eq(42L))).thenReturn(Optional.of(savedUser));
+    }
 
 }
\ No newline at end of file
diff --git a/spring-data/spring-data-rest-associations/build.gradle b/spring-data/spring-data-rest-associations/build.gradle
index 3812da5..f5679c7 100644
--- a/spring-data/spring-data-rest-associations/build.gradle
+++ b/spring-data/spring-data-rest-associations/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '1.5.4.RELEASE'
+		springBootVersion = '1.5.22.RELEASE'
 	}
 	repositories {
 		mavenCentral()
diff --git a/spring-data/spring-data-rest-associations/gradlew b/spring-data/spring-data-rest-associations/gradlew
old mode 100644
new mode 100755
diff --git a/spring-data/spring-data-rest-springfox/build.gradle b/spring-data/spring-data-rest-springfox/build.gradle
index 8b00e2a..7b098b8 100644
--- a/spring-data/spring-data-rest-springfox/build.gradle
+++ b/spring-data/spring-data-rest-springfox/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '1.5.4.RELEASE'
+		springBootVersion = '1.5.22.RELEASE'
 	}
 	repositories {
 		mavenCentral()
diff --git a/spring-data/spring-data-rest-springfox/gradlew b/spring-data/spring-data-rest-springfox/gradlew
old mode 100644
new mode 100755