mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Align productionRuntimeClasspath with runtimeClasspath
Fixes gh-25798
This commit is contained in:
parent
deca737b01
commit
b3275c5647
@ -205,6 +205,8 @@ final class JavaPluginAction implements PluginApplicationAction {
|
|||||||
objectFactory.named(LibraryElements.class, LibraryElements.JAR));
|
objectFactory.named(LibraryElements.class, LibraryElements.JAR));
|
||||||
productionRuntimeClasspath.setVisible(false);
|
productionRuntimeClasspath.setVisible(false);
|
||||||
productionRuntimeClasspath.setExtendsFrom(runtimeClasspath.getExtendsFrom());
|
productionRuntimeClasspath.setExtendsFrom(runtimeClasspath.getExtendsFrom());
|
||||||
|
productionRuntimeClasspath.setCanBeResolved(runtimeClasspath.isCanBeResolved());
|
||||||
|
productionRuntimeClasspath.setCanBeConsumed(runtimeClasspath.isCanBeConsumed());
|
||||||
runtimeClasspath.extendsFrom(developmentOnly);
|
runtimeClasspath.extendsFrom(developmentOnly);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2020 the original author or authors.
|
* Copyright 2012-2021 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.
|
||||||
@ -155,6 +155,18 @@ class JavaPluginActionIntegrationTests {
|
|||||||
.contains("org.gradle.dependency.bundling: external");
|
.contains("org.gradle.dependency.bundling: external");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestTemplate
|
||||||
|
void productionRuntimeClasspathIsConfiguredWithResolvabilityAndConsumabilityThatMatchesRuntimeClasspath() {
|
||||||
|
String productionRuntime = this.gradleBuild.build("configurationResolvabilityAndConsumability",
|
||||||
|
"-PconfigurationName=runtimeClasspath", "-PapplyJavaPlugin").getOutput();
|
||||||
|
assertThat(productionRuntime).contains("canBeResolved: true");
|
||||||
|
assertThat(productionRuntime).contains("canBeConsumed: false");
|
||||||
|
String runtime = this.gradleBuild.build("configurationResolvabilityAndConsumability",
|
||||||
|
"-PconfigurationName=productionRuntimeClasspath", "-PapplyJavaPlugin").getOutput();
|
||||||
|
assertThat(runtime).contains("canBeResolved: true");
|
||||||
|
assertThat(runtime).contains("canBeConsumed: false");
|
||||||
|
}
|
||||||
|
|
||||||
private void createMinimalMainSource() throws IOException {
|
private void createMinimalMainSource() throws IOException {
|
||||||
File examplePackage = new File(this.gradleBuild.getProjectDir(), "src/main/java/com/example");
|
File examplePackage = new File(this.gradleBuild.getProjectDir(), "src/main/java/com/example");
|
||||||
examplePackage.mkdirs();
|
examplePackage.mkdirs();
|
||||||
|
@ -34,4 +34,12 @@ task('configurationAttributes') {
|
|||||||
println " ${attribute}: ${attributes.getAttribute(attribute)}"
|
println " ${attribute}: ${attributes.getAttribute(attribute)}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
task('configurationResolvabilityAndConsumability') {
|
||||||
|
doFirst {
|
||||||
|
def configuration = configurations.findByName(configurationName)
|
||||||
|
println "canBeResolved: ${configuration.canBeResolved}"
|
||||||
|
println "canBeConsumed: ${configuration.canBeConsumed}"
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user