root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Remove workaround that should now be redundant 

See gh-41980
This commit is contained in:
Andy Wilkinson 2024-08-23 16:29:20 +01:00
parent 4b0b5c263d
commit 162c929a80
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleProjectBuilder.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2022 the original author or authors. * Copyright 2012-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -18,23 +18,17 @@ package org.springframework.boot.gradle.junit;
import java.io.File; import java.io.File;
import org.gradle.api.JavaVersion;
import org.gradle.api.Project; import org.gradle.api.Project;
import org.gradle.internal.nativeintegration.services.NativeServices;
import org.gradle.internal.nativeintegration.services.NativeServices.NativeServicesMode;
import org.gradle.testfixtures.ProjectBuilder; import org.gradle.testfixtures.ProjectBuilder;
import org.gradle.testfixtures.internal.ProjectBuilderImpl;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
/** /**
* Helper class to build Gradle {@link Project Projects} for test fixtures. Wraps * Helper class to build Gradle {@link Project Projects} for test fixtures. Wraps
* functionality of Gradle's own {@link ProjectBuilder} in order to work around an issue * functionality of Gradle's own {@link ProjectBuilder}.
* on JDK 17 and 18.
* *
* @author Christoph Dreis * @author Christoph Dreis
* @see <a href="https://github.com/gradle/gradle/issues/16857">Gradle Support JDK 17</a>
*/ */
public final class GradleProjectBuilder { public final class GradleProjectBuilder {
@ -68,14 +62,6 @@ public final class GradleProjectBuilder {
if (StringUtils.hasText(this.name)) { if (StringUtils.hasText(this.name)) {
builder.withName(this.name); builder.withName(this.name);
} }
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
NativeServices.initializeOnClient(userHome, NativeServicesMode.ENABLED);
try {
ProjectBuilderImpl.getGlobalServices();
}
catch (Throwable ignore) {
}
}
return builder.build(); return builder.build();
} }