Merge branch '2.2.x' into 2.3.x

Author: philwebb

ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/command/DistributeProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 the original author or authors.
+ * Copyright 2020-2020 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.

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java

@@ -116,12 +116,8 @@ private Set<ResolvableType> getOrDeduceTypes(AnnotatedElement element, Class<?>[
 		}
 		if (types.isEmpty() && element instanceof Field) {
 			Field field = (Field) element;
-			if (field.getGenericType() instanceof TypeVariable) {
-				types.add(ResolvableType.forField(field, source));
-			}
-			else {
-				types.add(ResolvableType.forField(field));
-			}
+			types.add((field.getGenericType() instanceof TypeVariable) ? ResolvableType.forField(field, source)
+					: ResolvableType.forField(field));
 		}
 		return types;
 	}

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java

@@ -199,12 +199,11 @@ private static List<URL> resolveCoordinates(String[] coordinates) {
 		RepositorySystem repositorySystem = serviceLocator.getService(RepositorySystem.class);
 		DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession();
 		LocalRepository localRepository = new LocalRepository(System.getProperty("user.home") + "/.m2/repository");
+		RemoteRepository remoteRepository = new RemoteRepository.Builder("central", "default",
+				"https://repo.maven.apache.org/maven2").build();
 		session.setLocalRepositoryManager(repositorySystem.newLocalRepositoryManager(session, localRepository));
 		for (int i = 0; i < MAX_RESOLUTION_ATTEMPTS; i++) {
-			CollectRequest collectRequest = new CollectRequest(null,
-					Arrays.asList(
-							new RemoteRepository.Builder("central", "default", "https://repo.maven.apache.org/maven2")
-									.build()));
+			CollectRequest collectRequest = new CollectRequest(null, Arrays.asList(remoteRepository));
 			collectRequest.setDependencies(createDependencies(coordinates));
 			DependencyRequest dependencyRequest = new DependencyRequest(collectRequest, null);
 			try {