Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.2.x' into 3.3.x

Browse Source
This commit is contained in:
Phillip Webb
2024-09-30 11:44:42 -07:00
parent b4fc218aaa f7d7d16ecd
commit fa92b96bfd
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MoveToSnapshots.java
View File

@@ -43,7 +43,7 @@ import org.springframework.boot.build.properties.BuildProperties;
*/ */
public abstract class MoveToSnapshots extends UpgradeDependencies { public abstract class MoveToSnapshots extends UpgradeDependencies {
private static final Logger log = LoggerFactory.getLogger(MoveToSnapshots.class); private static final Logger logger = LoggerFactory.getLogger(MoveToSnapshots.class);
@Inject @Inject
public MoveToSnapshots(BomExtension bom) { public MoveToSnapshots(BomExtension bom) {
@@ -100,8 +100,8 @@ public abstract class MoveToSnapshots extends UpgradeDependencies {
List<Release> releases = scheduledReleases.get(library.getCalendarName()); List<Release> releases = scheduledReleases.get(library.getCalendarName());
boolean match = (releases != null) boolean match = (releases != null)
&& releases.stream().anyMatch((release) -> candidate.isSnapshotFor(release.getVersion())); && releases.stream().anyMatch((release) -> candidate.isSnapshotFor(release.getVersion()));
if (log.isInfoEnabled() && !match) { if (logger.isInfoEnabled() && !match) {
log.info("Ignoring {}. No release of {} scheduled before {}", candidate, library.getName(), logger.info("Ignoring {}. No release of {} scheduled before {}", candidate, library.getName(),
milestone.getDueOn()); milestone.getDueOn());
} }
return match; return match;

4
buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MultithreadedLibraryUpdateResolver.java
View File

@@ -41,7 +41,7 @@ import org.springframework.boot.build.bom.Library;
*/ */
class MultithreadedLibraryUpdateResolver implements LibraryUpdateResolver { class MultithreadedLibraryUpdateResolver implements LibraryUpdateResolver {
private static final Logger LOGGER = LoggerFactory.getLogger(MultithreadedLibraryUpdateResolver.class); private static final Logger logger = LoggerFactory.getLogger(MultithreadedLibraryUpdateResolver.class);
private final int threads; private final int threads;
@@ -55,7 +55,7 @@ class MultithreadedLibraryUpdateResolver implements LibraryUpdateResolver {
@Override @Override
public List<LibraryWithVersionOptions> findLibraryUpdates(Collection<Library> librariesToUpgrade, public List<LibraryWithVersionOptions> findLibraryUpdates(Collection<Library> librariesToUpgrade,
Map<String, Library> librariesByName) { Map<String, Library> librariesByName) {
LOGGER.info("Looking for updates using {} threads", this.threads); logger.info("Looking for updates using {} threads", this.threads);
ExecutorService executorService = Executors.newFixedThreadPool(this.threads); ExecutorService executorService = Executors.newFixedThreadPool(this.threads);
try { try {
return librariesToUpgrade.stream().map((library) -> { return librariesToUpgrade.stream().map((library) -> {

6
buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/StandardLibraryUpdateResolver.java
View File

@@ -42,7 +42,7 @@ import org.springframework.boot.build.bom.bomr.version.DependencyVersion;
*/ */
class StandardLibraryUpdateResolver implements LibraryUpdateResolver { class StandardLibraryUpdateResolver implements LibraryUpdateResolver {
private static final Logger LOGGER = LoggerFactory.getLogger(StandardLibraryUpdateResolver.class); private static final Logger logger = LoggerFactory.getLogger(StandardLibraryUpdateResolver.class);
private final VersionResolver versionResolver; private final VersionResolver versionResolver;
@@ -63,11 +63,11 @@ class StandardLibraryUpdateResolver implements LibraryUpdateResolver {
if (isLibraryExcluded(library)) { if (isLibraryExcluded(library)) {
continue; continue;
} }
LOGGER.info("Looking for updates for {}", library.getName()); logger.info("Looking for updates for {}", library.getName());
long start = System.nanoTime(); long start = System.nanoTime();
List<VersionOption> versionOptions = getVersionOptions(library); List<VersionOption> versionOptions = getVersionOptions(library);
result.add(new LibraryWithVersionOptions(library, versionOptions)); result.add(new LibraryWithVersionOptions(library, versionOptions));
LOGGER.info("Found {} updates for {}, took {}", versionOptions.size(), library.getName(), logger.info("Found {} updates for {}, took {}", versionOptions.size(), library.getName(),
Duration.ofNanos(System.nanoTime() - start)); Duration.ofNanos(System.nanoTime() - start));
} }
return result; return result;

6
buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenExec.java
View File

@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
*/ */
public abstract class MavenExec extends JavaExec { public abstract class MavenExec extends JavaExec {
private final Logger log = LoggerFactory.getLogger(MavenExec.class); private final Logger logger = LoggerFactory.getLogger(MavenExec.class);
public MavenExec() { public MavenExec() {
setClasspath(mavenConfiguration(getProject())); setClasspath(mavenConfiguration(getProject()));
@@ -69,8 +69,8 @@ public abstract class MavenExec extends JavaExec {
try { try {
args("--log-file", logFile.toFile().getAbsolutePath()); args("--log-file", logFile.toFile().getAbsolutePath());
super.exec(); super.exec();
if (this.log.isInfoEnabled()) { if (this.logger.isInfoEnabled()) {
Files.readAllLines(logFile).forEach(this.log::info); Files.readAllLines(logFile).forEach(this.logger::info);
} }
} }
catch (ExecException ex) { catch (ExecException ex) {