Merge pull request #22943 from chali

* gh-22943:
  Polish "Mark bootArchives configuration as unresolvable"
  Mark bootArchives configuration as unresolvable

Closes gh-22943
pull/23127/head
Andy Wilkinson 4 years ago
commit 8ce2058dc7

@ -42,6 +42,8 @@ dependencies {
testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.mockito:mockito-core") testImplementation("org.mockito:mockito-core")
testImplementation("org.testcontainers:testcontainers") testImplementation("org.testcontainers:testcontainers")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
} }
gradlePlugin { gradlePlugin {

@ -111,6 +111,7 @@ public class SpringBootPlugin implements Plugin<Project> {
private Configuration createBootArchivesConfiguration(Project project) { private Configuration createBootArchivesConfiguration(Project project) {
Configuration bootArchives = project.getConfigurations().create(BOOT_ARCHIVES_CONFIGURATION_NAME); Configuration bootArchives = project.getConfigurations().create(BOOT_ARCHIVES_CONFIGURATION_NAME);
bootArchives.setDescription("Configuration for Spring Boot archive artifacts."); bootArchives.setDescription("Configuration for Spring Boot archive artifacts.");
bootArchives.setCanBeResolved(false);
return bootArchives; return bootArchives;
} }

@ -0,0 +1,52 @@
/*
* Copyright 2012-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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.gradle.plugin;
import java.io.File;
import org.gradle.api.Project;
import org.gradle.api.artifacts.Configuration;
import org.gradle.testfixtures.ProjectBuilder;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link SpringBootPlugin}.
*
* @author Martin Chalupa
* @author Andy Wilkinson
*/
@ClassPathExclusions("kotlin-daemon-client-*.jar")
public class SpringBootPluginTests {
@TempDir
File temp;
@Test
void bootArchivesConfigurationsCannotBeResolved() {
Project project = ProjectBuilder.builder().withProjectDir(this.temp).build();
project.getPlugins().apply(SpringBootPlugin.class);
Configuration bootArchives = project.getConfigurations()
.getByName(SpringBootPlugin.BOOT_ARCHIVES_CONFIGURATION_NAME);
assertThat(bootArchives.isCanBeResolved()).isFalse();
}
}
Loading…
Cancel
Save