update several dependencies for builds to work

.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

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"

spring-boot/cache/gradle/wrapper/gradle-wrapper.properties

@@ -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

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%
 

spring-boot/validation/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.0.5.RELEASE'
+		springBootVersion = '2.3.1.RELEASE'
 	}
 	repositories {
 		mavenCentral()

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()

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()

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 {
+build.dependsOn('generatePomFileForStubsPublication')
-    tasks.generatePomFileForStubsPublication.execute()
+build.dependsOn('publishStubsPublicationToMavenLocal')
-    tasks.publishStubsPublicationToMavenLocal.execute()
-}

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
+    @Autowired
-  WebApplicationContext webApplicationContext;
+    WebApplicationContext webApplicationContext;
 
-  @MockBean
+    @MockBean
-  private UserRepository userRepository;
+    private UserRepository userRepository;
 
-  @Before
+    @Before
-  public void setup() {
+    public void setup() {
-    User savedUser = new User();
+        User savedUser = new User();
-    savedUser.setFirstName("Arthur");
+        savedUser.setFirstName("Arthur");
-    savedUser.setLastName("Dent");
+        savedUser.setLastName("Dent");
-    savedUser.setId(42L);
+        savedUser.setId(42L);
-    when(userRepository.save(any(User.class))).thenReturn(savedUser);
+        when(userRepository.save(any(User.class))).thenReturn(savedUser);
-    RestAssuredMockMvc.webAppContextSetup(webApplicationContext);
+        RestAssuredMockMvc.webAppContextSetup(webApplicationContext);
 
-    when(userRepository.findById(eq(42L))).thenReturn(Optional.of(savedUser));
+        when(userRepository.findById(eq(42L))).thenReturn(Optional.of(savedUser));
-  }
+    }
 
 }

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()

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()