From aefe52e4d0f0b08bd1c4e2824fb37a0e1d65e5ea Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 14 Jan 2020 12:15:53 +0000 Subject: [PATCH] Revert "Rework dep management to avoid consumers picking up strict constraints" This reverts commit b34a311d02fe60ac267493ccc7f2c6b816f3a15c as, having disabled the publishing of Gradle's module metadata (4f75ab5), the changes are no longer needed. See gh-19609 --- buildSrc/build.gradle | 4 -- .../InternalDependencyManagementPlugin.java | 60 ------------------- .../boot/build/bom/BomExtension.java | 2 +- .../boot/build/starters/StarterPlugin.java | 2 - .../build.gradle | 8 +-- .../spring-boot-actuator/build.gradle | 5 +- .../spring-boot-autoconfigure/build.gradle | 8 +-- .../spring-boot-cli/build.gradle | 7 ++- .../spring-boot-devtools/build.gradle | 7 +-- .../build.gradle | 4 +- .../spring-boot-starter-activemq/build.gradle | 2 +- .../spring-boot-starter-actuator/build.gradle | 2 +- .../spring-boot-starter-amqp/build.gradle | 2 +- .../spring-boot-starter-aop/build.gradle | 2 +- .../spring-boot-starter-artemis/build.gradle | 2 +- .../spring-boot-starter-batch/build.gradle | 2 +- .../spring-boot-starter-cache/build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../spring-boot-starter-data-jpa/build.gradle | 4 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../spring-boot-starter-hateoas/build.gradle | 2 +- .../build.gradle | 2 +- .../spring-boot-starter-jdbc/build.gradle | 2 +- .../spring-boot-starter-jersey/build.gradle | 2 +- .../spring-boot-starter-jetty/build.gradle | 2 +- .../spring-boot-starter-jooq/build.gradle | 2 +- .../spring-boot-starter-json/build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../spring-boot-starter-log4j2/build.gradle | 2 +- .../spring-boot-starter-logging/build.gradle | 2 +- .../spring-boot-starter-mail/build.gradle | 2 +- .../spring-boot-starter-mustache/build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../spring-boot-starter-quartz/build.gradle | 2 +- .../build.gradle | 2 +- .../spring-boot-starter-rsocket/build.gradle | 2 +- .../spring-boot-starter-security/build.gradle | 2 +- .../spring-boot-starter-test/build.gradle | 2 +- .../build.gradle | 2 +- .../spring-boot-starter-tomcat/build.gradle | 2 +- .../spring-boot-starter-undertow/build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../spring-boot-starter-web/build.gradle | 2 +- .../spring-boot-starter-webflux/build.gradle | 2 +- .../build.gradle | 2 +- .../spring-boot-starter/build.gradle | 2 +- .../build.gradle | 7 +-- .../spring-boot-test/build.gradle | 6 +- .../spring-boot-antlib/build.gradle | 4 +- .../build.gradle | 4 +- .../spring-boot-gradle-plugin/build.gradle | 7 +-- .../spring-boot-loader-tools/build.gradle | 3 +- .../spring-boot-loader/build.gradle | 5 +- .../spring-boot-maven-plugin/build.gradle | 9 ++- .../spring-boot-test-support/build.gradle | 4 +- spring-boot-project/spring-boot/build.gradle | 9 ++- .../spring-boot-smoke-test-ant/build.gradle | 2 +- .../build.gradle | 1 - .../build.gradle | 10 ++-- .../spring-boot-smoke-test-war/build.gradle | 2 +- 78 files changed, 102 insertions(+), 188 deletions(-) delete mode 100644 buildSrc/src/main/java/org/springframework/boot/build/InternalDependencyManagementPlugin.java diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index aa973307161..b0587d4d33e 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -52,10 +52,6 @@ gradlePlugin { id = "org.springframework.boot.conventions" implementationClass = "org.springframework.boot.build.ConventionsPlugin" } - dependencyManagementPlugin { - id = "org.springframework.boot.internal-dependency-management" - implementationClass = "org.springframework.boot.build.InternalDependencyManagementPlugin" - } deployedPlugin { id = "org.springframework.boot.deployed" implementationClass = "org.springframework.boot.build.DeployedPlugin" diff --git a/buildSrc/src/main/java/org/springframework/boot/build/InternalDependencyManagementPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/InternalDependencyManagementPlugin.java deleted file mode 100644 index 229045e8ae2..00000000000 --- a/buildSrc/src/main/java/org/springframework/boot/build/InternalDependencyManagementPlugin.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * 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. - * 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.build; - -import java.util.Collections; - -import org.gradle.api.Plugin; -import org.gradle.api.Project; -import org.gradle.api.artifacts.Configuration; -import org.gradle.api.artifacts.ConfigurationContainer; -import org.gradle.api.artifacts.Dependency; -import org.gradle.api.plugins.JavaBasePlugin; - -import org.springframework.boot.build.optional.OptionalDependenciesPlugin; - -/** - * Plugin to apply internal dependency management to Spring Boot's projects. Uses a custom - * configuration to enforce a platform for Spring Boot's own build. This prevents the - * enforced (strict) constraints from being visible to external consumers. - * - * @author Andy Wilkinson - */ -public class InternalDependencyManagementPlugin implements Plugin { - - @Override - public void apply(Project project) { - project.getPlugins().withType(JavaBasePlugin.class, (java) -> configureDependencyManagement(project)); - } - - private void configureDependencyManagement(Project project) { - ConfigurationContainer configurations = project.getConfigurations(); - Configuration dependencyManagement = configurations.create("internalDependencyManagement", (configuration) -> { - configuration.setVisible(false); - configuration.setCanBeConsumed(false); - configuration.setCanBeResolved(false); - }); - configurations.matching((configuration) -> configuration.getName().endsWith("Classpath")) - .all((configuration) -> configuration.extendsFrom(dependencyManagement)); - Dependency springBootParent = project.getDependencies().enforcedPlatform(project.getDependencies() - .project(Collections.singletonMap("path", ":spring-boot-project:spring-boot-parent"))); - dependencyManagement.getDependencies().add(springBootParent); - project.getPlugins().withType(OptionalDependenciesPlugin.class, (optionalDependencies) -> configurations - .getByName(OptionalDependenciesPlugin.OPTIONAL_CONFIGURATION_NAME).extendsFrom(dependencyManagement)); - } - -} diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/BomExtension.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/BomExtension.java index c46468e7250..e524749a0da 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/bom/BomExtension.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/bom/BomExtension.java @@ -113,7 +113,7 @@ public class BomExtension { for (String bomImport : group.getBoms()) { this.putArtifactVersionProperty(group.getId(), bomImport, library.getVersionProperty()); this.dependencyHandler.add("api", this.dependencyHandler - .platform(createDependencyNotation(group.getId(), bomImport, library.getVersion()))); + .enforcedPlatform(createDependencyNotation(group.getId(), bomImport, library.getVersion()))); } } } diff --git a/buildSrc/src/main/java/org/springframework/boot/build/starters/StarterPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/starters/StarterPlugin.java index 7e221addee4..76a9867f290 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/starters/StarterPlugin.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/starters/StarterPlugin.java @@ -29,7 +29,6 @@ import org.gradle.api.plugins.PluginContainer; import org.springframework.boot.build.ConventionsPlugin; import org.springframework.boot.build.DeployedPlugin; -import org.springframework.boot.build.InternalDependencyManagementPlugin; import org.springframework.boot.build.classpath.CheckClasspathForConflicts; import org.springframework.boot.build.classpath.CheckClasspathForProhibitedDependencies; import org.springframework.util.StringUtils; @@ -47,7 +46,6 @@ public class StarterPlugin implements Plugin { plugins.apply(DeployedPlugin.class); plugins.apply(JavaLibraryPlugin.class); plugins.apply(ConventionsPlugin.class); - plugins.apply(InternalDependencyManagementPlugin.class); StarterMetadata starterMetadata = project.getTasks().create("starterMetadata", StarterMetadata.class); ConfigurationContainer configurations = project.getConfigurations(); Configuration runtimeClasspath = configurations.getByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle index 316cae89ad3..cb512263ef4 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle @@ -5,7 +5,6 @@ plugins { id 'org.springframework.boot.auto-configuration' id 'org.springframework.boot.conventions' id 'org.springframework.boot.deployed' - id 'org.springframework.boot.internal-dependency-management' id 'org.springframework.boot.optional-dependencies' } @@ -17,13 +16,12 @@ configurations { } dependencies { - asciidoctorExtensions platform(project(':spring-boot-project:spring-boot-dependencies')) + asciidoctorExtensions enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) asciidoctorExtensions 'org.springframework.restdocs:spring-restdocs-asciidoctor' - api platform(project(':spring-boot-project:spring-boot-dependencies')) - api project(':spring-boot-project:spring-boot-actuator') + implementation enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) implementation project(':spring-boot-project:spring-boot') implementation project(':spring-boot-project:spring-boot-autoconfigure') implementation 'com.fasterxml.jackson.core:jackson-databind' @@ -31,7 +29,7 @@ dependencies { implementation 'org.springframework:spring-core' implementation 'org.springframework:spring-context' - optional platform(project(':spring-boot-project:spring-boot-dependencies')) + optional enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) optional 'ch.qos.logback:logback-classic' optional 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' optional 'com.github.ben-manes.caffeine:caffeine' diff --git a/spring-boot-project/spring-boot-actuator/build.gradle b/spring-boot-project/spring-boot-actuator/build.gradle index 07565d3769b..12232107613 100644 --- a/spring-boot-project/spring-boot-actuator/build.gradle +++ b/spring-boot-project/spring-boot-actuator/build.gradle @@ -9,11 +9,10 @@ plugins { description = 'Spring Boot Actuator' dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) - + implementation enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) implementation project(':spring-boot-project:spring-boot') - optional platform(project(':spring-boot-project:spring-boot-dependencies')) + optional enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) optional 'com.fasterxml.jackson.core:jackson-databind' optional 'com.hazelcast:hazelcast' optional 'com.hazelcast:hazelcast-spring' diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle index 1b66008b302..39b8ff72b0f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle @@ -4,7 +4,6 @@ plugins { id 'org.springframework.boot.auto-configuration' id 'org.springframework.boot.conventions' id 'org.springframework.boot.deployed' - id 'org.springframework.boot.internal-dependency-management' id 'org.springframework.boot.optional-dependencies' } @@ -12,9 +11,10 @@ description = 'Spring Boot AutoConfigure' dependencies { api project(':spring-boot-project:spring-boot') - api platform(project(':spring-boot-project:spring-boot-dependencies')) - optional platform(project(':spring-boot-project:spring-boot-dependencies')) + implementation enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) + + optional enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) optional 'com.atomikos:transactions-jdbc' optional 'com.atomikos:transactions-jta' optional 'com.couchbase.client:couchbase-spring-cache' @@ -148,7 +148,7 @@ dependencies { optional 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' optional 'redis.clients:jedis' - testImplementation platform(project(':spring-boot-project:spring-boot-parent')) + testImplementation enforcedPlatform(project(':spring-boot-project:spring-boot-parent')) testImplementation project(':spring-boot-project:spring-boot-tools:spring-boot-test-support') testImplementation project(':spring-boot-project:spring-boot-test') testImplementation 'ch.qos.logback:logback-classic' diff --git a/spring-boot-project/spring-boot-cli/build.gradle b/spring-boot-project/spring-boot-cli/build.gradle index 96171cb6e75..db7ee46c8d5 100644 --- a/spring-boot-project/spring-boot-cli/build.gradle +++ b/spring-boot-project/spring-boot-cli/build.gradle @@ -3,7 +3,6 @@ plugins { id 'org.springframework.boot.deployed' id 'org.springframework.boot.conventions' id 'org.springframework.boot.integration-test' - id 'org.springframework.boot.internal-dependency-management' } description = "Spring Boot CLI" @@ -16,14 +15,16 @@ configurations { dependencies { compileOnly project(':spring-boot-project:spring-boot') + compileOnly 'jakarta.servlet:jakarta.servlet-api' compileOnly 'org.codehaus.groovy:groovy-templates' compileOnly 'org.springframework:spring-web' dependenciesBom project(path: ':spring-boot-project:spring-boot-dependencies', configuration: 'effectiveBom') - implementation platform(project(':spring-boot-project:spring-boot-parent')) + implementation enforcedPlatform(project(':spring-boot-project:spring-boot-parent')) implementation project(':spring-boot-project:spring-boot-tools:spring-boot-loader-tools') + implementation 'com.vaadin.external.google:android-json' implementation 'jline:jline' implementation 'net.sf.jopt-simple:jopt-simple' @@ -50,7 +51,7 @@ dependencies { implementation 'org.springframework:spring-core' implementation 'org.springframework.security:spring-security-crypto' - intTestImplementation platform(project(':spring-boot-project:spring-boot-dependencies')) + intTestImplementation enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) intTestImplementation project(':spring-boot-project:spring-boot-tools:spring-boot-loader-tools') intTestImplementation project(':spring-boot-project:spring-boot-tools:spring-boot-test-support') intTestImplementation 'org.assertj:assertj-core' diff --git a/spring-boot-project/spring-boot-devtools/build.gradle b/spring-boot-project/spring-boot-devtools/build.gradle index 0e050cf7186..4120f22aea6 100644 --- a/spring-boot-project/spring-boot-devtools/build.gradle +++ b/spring-boot-project/spring-boot-devtools/build.gradle @@ -4,7 +4,6 @@ plugins { id 'org.springframework.boot.conventions' id 'org.springframework.boot.deployed' id 'org.springframework.boot.integration-test' - id 'org.springframework.boot.internal-dependency-management' id 'org.springframework.boot.optional-dependencies' } @@ -15,13 +14,13 @@ configurations { } dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) - + implementation enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) implementation project(':spring-boot-project:spring-boot') implementation project(':spring-boot-project:spring-boot-autoconfigure') intTestDependencies project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') + intTestImplementation enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) intTestImplementation project(':spring-boot-project:spring-boot-autoconfigure') intTestImplementation project(':spring-boot-project:spring-boot-test') intTestImplementation project(':spring-boot-project:spring-boot-tools:spring-boot-test-support') @@ -32,7 +31,7 @@ dependencies { intTestImplementation 'net.bytebuddy:byte-buddy' intTestRuntimeOnly 'org.springframework:spring-web' - optional platform(project(':spring-boot-project:spring-boot-dependencies')) + optional enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) optional 'javax.servlet:javax.servlet-api' optional 'org.apache.derby:derby' optional 'org.hibernate:hibernate-core' diff --git a/spring-boot-project/spring-boot-properties-migrator/build.gradle b/spring-boot-project/spring-boot-properties-migrator/build.gradle index e61a4fd00ff..5ef68ecb103 100644 --- a/spring-boot-project/spring-boot-properties-migrator/build.gradle +++ b/spring-boot-project/spring-boot-properties-migrator/build.gradle @@ -2,14 +2,12 @@ plugins { id 'java-library' id 'maven-publish' id 'org.springframework.boot.conventions' - id 'org.springframework.boot.internal-dependency-management' } description = 'Spring Boot Properties Migrator' dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) - + implementation enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) implementation project(':spring-boot-project:spring-boot') implementation project(':spring-boot-project:spring-boot-tools:spring-boot-configuration-metadata') diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/build.gradle index cb3c9e76aba..aac1103f14a 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for JMS messaging using Apache ActiveMQ" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'org.springframework:spring-jms' api ('org.apache.activemq:activemq-broker') { diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-actuator/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-actuator/build.gradle index a147984f27e..96a273b712e 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-actuator/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-actuator/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Spring Boot's Actuator which provides production ready features to help you monitor and manage your application" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api project(':spring-boot-project:spring-boot-actuator-autoconfigure') api 'io.micrometer:micrometer-core' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-amqp/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-amqp/build.gradle index 83b2f1bb3ec..83197a3b188 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-amqp/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-amqp/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Spring AMQP and Rabbit MQ" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'org.springframework:spring-messaging' api 'org.springframework.amqp:spring-rabbit' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-aop/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-aop/build.gradle index 6f06ffd0334..c5959cadb6c 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-aop/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-aop/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for aspect-oriented programming with Spring AOP and AspectJ" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'org.springframework:spring-aop' api 'org.aspectj:aspectjweaver' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-artemis/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-artemis/build.gradle index bfa91fe26e1..033a409c930 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-artemis/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-artemis/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for JMS messaging using Apache Artemis" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'jakarta.jms:jakarta.jms-api' api 'jakarta.json:jakarta.json-api' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-batch/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-batch/build.gradle index af10e29eafa..36eeadbba9c 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-batch/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-batch/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Spring Batch" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-jdbc') api 'org.springframework.batch:spring-batch-core' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-cache/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-cache/build.gradle index 3e18eba14e0..14614a195d2 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-cache/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-cache/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Spring Framework's caching support" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'org.springframework:spring-context-support' } diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-cloud-connectors/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-cloud-connectors/build.gradle index e27fbb12bae..50400b15660 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-cloud-connectors/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-cloud-connectors/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Spring Cloud Connectors which simplifies connecting to services in cloud platforms like Cloud Foundry and Heroku" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'org.springframework.cloud:spring-cloud-spring-service-connector' api 'org.springframework.cloud:spring-cloud-cloudfoundry-connector' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-cassandra-reactive/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-cassandra-reactive/build.gradle index 42c26d83b5e..0f870c33e62 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-cassandra-reactive/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-cassandra-reactive/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Cassandra distributed database and Spring Data Cassandra Reactive" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'org.springframework:spring-tx' api 'org.springframework.data:spring-data-cassandra' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-cassandra/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-cassandra/build.gradle index ac5bba1c6f0..06219aed300 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-cassandra/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-cassandra/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Cassandra distributed database and Spring Data Cassandra" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'org.springframework:spring-tx' api 'org.springframework.data:spring-data-cassandra' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase-reactive/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase-reactive/build.gradle index 674ad03c5a5..b2969f80c3b 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase-reactive/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase-reactive/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Couchbase document-oriented database and Spring Data Couchbase Reactive" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'io.projectreactor:reactor-core' api 'io.reactivex:rxjava-reactive-streams' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase/build.gradle index 0eadf133c6e..b551d588803 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Couchbase document-oriented database and Spring Data Couchbase" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api ('org.springframework.data:spring-data-couchbase') { exclude group: 'com.couchbase.client', module: 'encryption' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-elasticsearch/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-elasticsearch/build.gradle index c49b8031dc3..af84a57e055 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-elasticsearch/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-elasticsearch/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Elasticsearch search and analytics engine and Spring Data Elasticsearch" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api ('org.springframework.data:spring-data-elasticsearch') { exclude group: 'org.elasticsearch.client', module: 'transport' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-jdbc/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-jdbc/build.gradle index 1d75f3d8218..010e9a905ef 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-jdbc/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-jdbc/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Spring Data JDBC" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-jdbc') api 'org.springframework.data:spring-data-jdbc' } diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-jpa/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-jpa/build.gradle index 7e244fdc606..0b74593c60e 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-jpa/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-jpa/build.gradle @@ -5,12 +5,12 @@ plugins { description = "Starter for using Spring Data JPA with Hibernate" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-aop') api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-jdbc') api 'jakarta.transaction:jakarta.transaction-api' api 'jakarta.persistence:jakarta.persistence-api' - api ('org.hibernate:hibernate-core') { + api ('org.hibernate:hibernate-core') { exclude group: 'javax.activation', module: 'javax.activation-api' exclude group: 'javax.persistence', module: 'javax.persistence-api' exclude group: 'javax.xml.bind', module: 'jaxb-api' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-ldap/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-ldap/build.gradle index e6813b77c1f..397e51d579c 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-ldap/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-ldap/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Spring Data LDAP" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'org.springframework.data:spring-data-ldap' } diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-mongodb-reactive/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-mongodb-reactive/build.gradle index 5c097ef19cf..e32f7f97a34 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-mongodb-reactive/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-mongodb-reactive/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using MongoDB document-oriented database and Spring Data MongoDB Reactive" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'io.projectreactor:reactor-core' api 'org.mongodb:mongodb-driver' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-mongodb/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-mongodb/build.gradle index f869e0d5b71..b6b001fc845 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-mongodb/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-mongodb/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using MongoDB document-oriented database and Spring Data MongoDB" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'org.mongodb:mongodb-driver' api ('org.springframework.data:spring-data-mongodb') { diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-neo4j/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-neo4j/build.gradle index 1d24c7f5a89..b4fabd9c661 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-neo4j/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-neo4j/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Neo4j graph database and Spring Data Neo4j" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'org.springframework.data:spring-data-neo4j' } diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-redis-reactive/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-redis-reactive/build.gradle index 87cdf3ae6db..6c1219bd4d9 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-redis-reactive/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-redis-reactive/build.gradle @@ -5,6 +5,6 @@ plugins { description = "Starter for using Redis key-value data store with Spring Data Redis reactive and the Lettuce client" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis') } diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-redis/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-redis/build.gradle index f86d6e0f639..34dd4d4a10e 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-redis/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-redis/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Redis key-value data store with Spring Data Redis and the Lettuce client" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'org.springframework.data:spring-data-redis' api 'io.lettuce:lettuce-core' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-rest/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-rest/build.gradle index 6d74bd03a44..6258a7bb8df 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-rest/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-rest/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for exposing Spring Data repositories over REST using Spring Data REST" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') api 'org.springframework.data:spring-data-rest-webmvc' } diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-solr/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-solr/build.gradle index e9b2c4baa2c..287a62e3b62 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-solr/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-solr/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using the Apache Solr search platform with Spring Data Solr" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api ('org.apache.solr:solr-solrj') { exclude group: 'org.slf4j', module: 'jcl-over-slf4j' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-freemarker/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-freemarker/build.gradle index d3663b2f558..e6151b55d3b 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-freemarker/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-freemarker/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for building MVC web applications using FreeMarker views" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'org.freemarker:freemarker' api 'org.springframework:spring-context-support' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-groovy-templates/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-groovy-templates/build.gradle index be0b2eb313c..640b44e5f65 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-groovy-templates/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-groovy-templates/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for building MVC web applications using Groovy Templates views" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') api 'org.codehaus.groovy:groovy-templates' } diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-hateoas/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-hateoas/build.gradle index b123fb1270f..ca4129e0f09 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-hateoas/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-hateoas/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for building hypermedia-based RESTful web application with Spring MVC and Spring HATEOAS" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') api 'org.springframework.hateoas:spring-hateoas' api 'org.springframework.plugin:spring-plugin-core' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-integration/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-integration/build.gradle index a3ec59a4915..7141809230f 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-integration/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-integration/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Spring Integration" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-aop') api 'org.springframework.integration:spring-integration-core' } diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jdbc/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-jdbc/build.gradle index 15ed9b0be19..71132155c6a 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jdbc/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jdbc/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using JDBC with the HikariCP connection pool" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'com.zaxxer:HikariCP' api 'org.springframework:spring-jdbc' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/build.gradle index 8c461f806f3..dc8b36a02e4 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for building RESTful web applications using JAX-RS and Jersey. An alternative to spring-boot-starter-web" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-json') api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat') api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-validation') diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle index 7baa5c6fd00..976326c771d 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Jetty as the embedded servlet container. An alternative to spring-boot-starter-tomcat" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api 'jakarta.servlet:jakarta.servlet-api' api 'jakarta.websocket:jakarta.websocket-api' api 'org.eclipse.jetty:jetty-servlets' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jooq/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-jooq/build.gradle index 178904f69df..244f4391f70 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jooq/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jooq/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using jOOQ to access SQL databases. An alternative to spring-boot-starter-data-jpa or spring-boot-starter-jdbc" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-jdbc') api 'jakarta.activation:jakarta.activation-api' api 'jakarta.xml.bind:jakarta.xml.bind-api' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-json/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-json/build.gradle index 96d7238b4c3..3d2633702bd 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-json/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-json/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for reading and writing json" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'org.springframework:spring-web' api 'com.fasterxml.jackson.core:jackson-databind' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-atomikos/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-atomikos/build.gradle index 6459c514d39..9dbb5822169 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-atomikos/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-atomikos/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for JTA transactions using Atomikos" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'com.atomikos:transactions-jms' api 'com.atomikos:transactions-jta' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-bitronix/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-bitronix/build.gradle index 56ed7fda490..81967090902 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-bitronix/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-bitronix/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for JTA transactions using Bitronix" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'jakarta.jms:jakarta.jms-api' api 'jakarta.transaction:jakarta.transaction-api' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-log4j2/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-log4j2/build.gradle index 5a3e25390dd..5490015749d 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-log4j2/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-log4j2/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Log4j2 for logging. An alternative to spring-boot-starter-logging" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api 'org.apache.logging.log4j:log4j-slf4j-impl' api 'org.apache.logging.log4j:log4j-core' api 'org.apache.logging.log4j:log4j-jul' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-logging/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-logging/build.gradle index b867aa5ea30..a38b29fd62e 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-logging/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-logging/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for logging using Logback. Default logging starter" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api 'ch.qos.logback:logback-classic' api 'org.apache.logging.log4j:log4j-to-slf4j' api 'org.slf4j:jul-to-slf4j' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-mail/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-mail/build.gradle index e7ba82bbf90..641440d7be7 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-mail/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-mail/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Java Mail and Spring Framework's email sending support" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'org.springframework:spring-context-support' api 'com.sun.mail:jakarta.mail' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-mustache/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-mustache/build.gradle index 0ee7b88e40b..83a4f7c7ed3 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-mustache/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-mustache/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for building web applications using Mustache views" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'com.samskivert:jmustache' } diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-client/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-client/build.gradle index ce191a8a2f2..d31b8573ae3 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-client/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-client/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Spring Security's OAuth2/OpenID Connect client features" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'com.sun.mail:jakarta.mail' api 'org.springframework.security:spring-security-config' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-resource-server/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-resource-server/build.gradle index 44c8f1bade7..39685e87b0f 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-resource-server/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-oauth2-resource-server/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Spring Security's OAuth2 resource server features" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'org.springframework.security:spring-security-config' api 'org.springframework.security:spring-security-core' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-quartz/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-quartz/build.gradle index b8e4474232e..c00a3a01669 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-quartz/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-quartz/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using the Quartz scheduler" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'org.springframework:spring-context-support' api 'org.springframework:spring-tx' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-reactor-netty/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-reactor-netty/build.gradle index 6dec5f156d0..b3c8171ac44 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-reactor-netty/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-reactor-netty/build.gradle @@ -5,6 +5,6 @@ plugins { description = "Starter for using Reactor Netty as the embedded reactive HTTP server." dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api 'io.projectreactor.netty:reactor-netty' } diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-rsocket/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-rsocket/build.gradle index 6df2636c35c..abc5ee6b579 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-rsocket/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-rsocket/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for building RSocket clients and servers" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-json') api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-reactor-netty') diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-security/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-security/build.gradle index 63d46c83b8c..598adca0657 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-security/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-security/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Spring Security" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'org.springframework:spring-aop' api 'org.springframework.security:spring-security-config' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-test/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-test/build.gradle index a102eef68e2..88129876742 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-test/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-test/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for testing Spring Boot applications with libraries including JUnit, Hamcrest and Mockito" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api project(':spring-boot-project:spring-boot-test') diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-thymeleaf/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-thymeleaf/build.gradle index 8cea851552f..eefd35fbf18 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-thymeleaf/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-thymeleaf/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for building MVC web applications using Thymeleaf views" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'org.thymeleaf:thymeleaf-spring5' api 'org.thymeleaf.extras:thymeleaf-extras-java8time' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle index 51a84b383d0..ff03ce46a64 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Tomcat as the embedded servlet container. Default servlet container starter used by spring-boot-starter-web" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api 'jakarta.annotation:jakarta.annotation-api' api ('org.apache.tomcat.embed:tomcat-embed-core') { exclude group: 'org.apache.tomcat', module: 'tomcat-annotations-api' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-undertow/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-undertow/build.gradle index 2271006d2f8..9c0f4b05b7e 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-undertow/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-undertow/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Undertow as the embedded servlet container. An alternative to spring-boot-starter-tomcat" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api 'io.undertow:undertow-core' api ('io.undertow:undertow-servlet') { exclude group: 'org.jboss.spec.javax.annotation', module: 'jboss-annotations-api_1.2_spec' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-validation/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-validation/build.gradle index 71c910cad31..1527c82a380 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-validation/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-validation/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Java Bean Validation with Hibernate Validator" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api 'org.glassfish:jakarta.el' api 'org.hibernate.validator:hibernate-validator' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-web-services/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-web-services/build.gradle index eeb306cca33..5cf4d06251c 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-web-services/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-web-services/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for using Spring Web Services" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') api 'com.sun.xml.messaging.saaj:saaj-impl' api 'jakarta.xml.ws:jakarta.xml.ws-api' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-web/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-web/build.gradle index 8af92e4901d..5b238f9a72e 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-web/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-web/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for building web, including RESTful, applications using Spring MVC. Uses Tomcat as the default embedded container" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-json') api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat') diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-webflux/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-webflux/build.gradle index 7a15a4caadd..0e3353df0a1 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-webflux/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-webflux/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for building WebFlux applications using Spring Framework's Reactive Web support" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-json') api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-reactor-netty') diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-websocket/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-websocket/build.gradle index fd18416bfd6..5b78056e502 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-websocket/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-websocket/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Starter for building WebSocket applications using Spring Framework's WebSocket support" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') api 'org.springframework:spring-messaging' api 'org.springframework:spring-websocket' diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter/build.gradle index da2623962b2..5629d533d52 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter/build.gradle @@ -5,7 +5,7 @@ plugins { description = "Core starter, including auto-configuration support, logging and YAML" dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api project(':spring-boot-project:spring-boot') api project(':spring-boot-project:spring-boot-autoconfigure') diff --git a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle index 278d1739b57..e6e7364e86b 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle @@ -2,20 +2,18 @@ plugins { id 'java-library' id 'org.springframework.boot.conventions' id 'org.springframework.boot.deployed' - id 'org.springframework.boot.internal-dependency-management' id 'org.springframework.boot.optional-dependencies' } description = 'Spring Boot Test AutoConfigure' dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) - + implementation enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) implementation project(':spring-boot-project:spring-boot') implementation project(':spring-boot-project:spring-boot-test') implementation project(':spring-boot-project:spring-boot-autoconfigure') - optional platform(project(':spring-boot-project:spring-boot-dependencies')) + optional enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) optional 'javax.json.bind:javax.json.bind-api' optional 'javax.servlet:javax.servlet-api' optional 'javax.transaction:javax.transaction-api' @@ -48,6 +46,7 @@ dependencies { optional 'org.mongodb:mongodb-driver-async' optional 'org.mongodb:mongodb-driver-reactivestreams' + testImplementation enforcedPlatform(project(':spring-boot-project:spring-boot-parent')) testImplementation project(':spring-boot-project:spring-boot-tools:spring-boot-test-support') testImplementation 'ch.qos.logback:logback-classic' testImplementation 'com.fasterxml.jackson.module:jackson-module-parameter-names' diff --git a/spring-boot-project/spring-boot-test/build.gradle b/spring-boot-project/spring-boot-test/build.gradle index 6fb022cc2c9..f8033155f18 100644 --- a/spring-boot-project/spring-boot-test/build.gradle +++ b/spring-boot-project/spring-boot-test/build.gradle @@ -3,17 +3,16 @@ plugins { id 'org.jetbrains.kotlin.jvm' id 'org.springframework.boot.conventions' id 'org.springframework.boot.deployed' - id 'org.springframework.boot.internal-dependency-management' id 'org.springframework.boot.optional-dependencies' } description = 'Spring Boot Test' dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) + implementation enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) implementation project(':spring-boot-project:spring-boot') - optional platform(project(':spring-boot-project:spring-boot-dependencies')) + optional enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) optional 'com.fasterxml.jackson.core:jackson-databind' optional 'com.google.code.gson:gson' optional 'com.jayway.jsonpath:json-path' @@ -37,6 +36,7 @@ dependencies { optional 'org.springframework:spring-webflux' optional 'net.sourceforge.htmlunit:htmlunit' + testImplementation enforcedPlatform(project(':spring-boot-project:spring-boot-parent')) testImplementation project(':spring-boot-project:spring-boot-tools:spring-boot-test-support') testImplementation 'io.mockk:mockk' testImplementation 'javax.json:javax.json-api' diff --git a/spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle index 95654fc3af8..db29b70576c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle @@ -2,7 +2,6 @@ plugins { id 'java-library' id 'org.springframework.boot.conventions' id 'org.springframework.boot.deployed' - id 'org.springframework.boot.internal-dependency-management' } description = 'Spring Boot Antlib' @@ -20,11 +19,10 @@ dependencies { antUnit "org.apache.ant:ant-antunit:1.3" antIvy "org.apache.ivy:ivy:2.4.0" - api platform(project(":spring-boot-project:spring-boot-dependencies")) - compileOnly project(":spring-boot-project:spring-boot-tools:spring-boot-loader") compileOnly "org.apache.ant:ant:${antVersion}" + implementation enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies")) implementation project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools") implementation "org.springframework:spring-core" } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/build.gradle index 03f18a0b593..6e651c7df65 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/build.gradle @@ -2,14 +2,12 @@ plugins { id 'java-library' id 'maven-publish' id 'org.springframework.boot.conventions' - id 'org.springframework.boot.internal-dependency-management' } description = 'Spring Boot Configuration Metadata' dependencies { - api platform(project(path: ":spring-boot-project:spring-boot-parent")) - + implementation enforcedPlatform(project(path: ":spring-boot-project:spring-boot-parent")) implementation "com.vaadin.external.google:android-json" testImplementation "org.junit.jupiter:junit-jupiter" diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle index 961e911706c..4bb5844f67a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle @@ -4,7 +4,6 @@ plugins { id 'org.asciidoctor.jvm.convert' id 'org.asciidoctor.jvm.pdf' id 'org.springframework.boot.conventions' - id 'org.springframework.boot.internal-dependency-management' id 'org.springframework.boot.maven-repository' id 'org.springframework.boot.optional-dependencies' } @@ -26,16 +25,14 @@ repositories { } dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) - asciidoctorExtensions 'io.spring.asciidoctor:spring-asciidoctor-extensions-block-switch:0.3.0.RELEASE' - + implementation platform(project(':spring-boot-project:spring-boot-dependencies')) implementation project(':spring-boot-project:spring-boot-tools:spring-boot-loader-tools') implementation 'io.spring.gradle:dependency-management-plugin' implementation 'org.apache.commons:commons-compress' implementation 'org.springframework:spring-core' - optional platform(project(':spring-boot-project:spring-boot-dependencies')) + optional enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) optional 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50' testImplementation 'org.junit.jupiter:junit-jupiter' diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle index 177fab00f4b..161f106bb2f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle @@ -2,7 +2,6 @@ plugins { id 'java-library' id 'org.springframework.boot.conventions' id 'org.springframework.boot.deployed' - id 'org.springframework.boot.internal-dependency-management' } description = 'Spring Boot Loader Tools' @@ -14,11 +13,11 @@ configurations { } dependencies { - api platform(project(':spring-boot-project:spring-boot-dependencies')) api "org.apache.commons:commons-compress:1.19" compileOnly "ch.qos.logback:logback-classic" + implementation enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) implementation "org.springframework:spring-core" loader project(":spring-boot-project:spring-boot-tools:spring-boot-loader") diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-loader/build.gradle index d96c1779d86..b80575d23b7 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/build.gradle @@ -2,16 +2,15 @@ plugins { id 'java-library' id 'org.springframework.boot.conventions' id 'org.springframework.boot.deployed' - id 'org.springframework.boot.internal-dependency-management' } description = 'Spring Boot Loader' dependencies { - api platform(project(":spring-boot-project:spring-boot-dependencies")) - compileOnly "org.springframework:spring-core" + implementation enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies")) + testImplementation project(":spring-boot-project:spring-boot-tools:spring-boot-test-support") testImplementation "org.assertj:assertj-core" diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle index e9813877462..aa76c5c4473 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle @@ -2,7 +2,6 @@ plugins { id 'org.asciidoctor.jvm.convert' id 'org.asciidoctor.jvm.pdf' id 'org.springframework.boot.conventions' - id 'org.springframework.boot.internal-dependency-management' id 'org.springframework.boot.maven-plugin' id 'org.springframework.boot.optional-dependencies' } @@ -14,25 +13,25 @@ configurations { } dependencies { - api platform(project(':spring-boot-project:spring-boot-parent')) - compileOnly 'org.apache.maven.plugin-tools:maven-plugin-annotations' compileOnly 'org.sonatype.plexus:plexus-build-api' + implementation enforcedPlatform(project(':spring-boot-project:spring-boot-parent')) implementation project(':spring-boot-project:spring-boot-tools:spring-boot-loader-tools') implementation 'org.apache.maven.shared:maven-common-artifact-filters' implementation 'org.apache.maven:maven-plugin-api' - intTestImplementation platform(project(':spring-boot-project:spring-boot-parent')) + intTestImplementation enforcedPlatform(project(':spring-boot-project:spring-boot-parent')) intTestImplementation 'org.apache.maven.shared:maven-invoker' intTestImplementation 'org.assertj:assertj-core' intTestImplementation 'org.junit.jupiter:junit-jupiter' - optional platform(project(':spring-boot-project:spring-boot-parent')) + optional enforcedPlatform(project(':spring-boot-project:spring-boot-parent')) optional 'org.apache.maven.plugins:maven-shade-plugin' runtimeOnly 'org.sonatype.plexus:plexus-build-api' + testImplementation enforcedPlatform(project(':spring-boot-project:spring-boot-parent')) testImplementation 'org.assertj:assertj-core' testImplementation 'org.junit.jupiter:junit-jupiter' testImplementation 'org.mockito:mockito-core' diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-test-support/build.gradle index 1c089b2b212..e5ea8d2ffda 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/build.gradle @@ -1,14 +1,11 @@ plugins { id 'java-library' id 'org.springframework.boot.conventions' - id 'org.springframework.boot.internal-dependency-management' } description = 'Spring Boot Testing Support' dependencies { - api platform(project(path: ":spring-boot-project:spring-boot-parent")) - compileOnly "com.datastax.oss:java-driver-core" compileOnly "javax.servlet:javax.servlet-api" compileOnly "junit:junit" @@ -20,6 +17,7 @@ dependencies { compileOnly "org.springframework.data:spring-data-redis" compileOnly "org.testcontainers:testcontainers" + implementation enforcedPlatform(project(path: ":spring-boot-project:spring-boot-parent")) implementation "org.apache.maven.resolver:maven-resolver-connector-basic" implementation "org.apache.maven.resolver:maven-resolver-impl" implementation "org.apache.maven:maven-resolver-provider" diff --git a/spring-boot-project/spring-boot/build.gradle b/spring-boot-project/spring-boot/build.gradle index 0323feae433..60a897770f9 100644 --- a/spring-boot-project/spring-boot/build.gradle +++ b/spring-boot-project/spring-boot/build.gradle @@ -4,22 +4,21 @@ plugins { id 'org.springframework.boot.conventions' id 'org.springframework.boot.configuration-properties' id 'org.springframework.boot.deployed' - id 'org.springframework.boot.internal-dependency-management' id 'org.springframework.boot.optional-dependencies' } description = 'Spring Boot' dependencies { - annotationProcessor platform(project(':spring-boot-project:spring-boot-dependencies')) + annotationProcessor enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) annotationProcessor 'org.apache.logging.log4j:log4j-core' - api platform(project(':spring-boot-project:spring-boot-dependencies')) - api 'org.springframework:spring-core' api 'org.springframework:spring-context' - optional platform(project(':spring-boot-project:spring-boot-dependencies')) + implementation enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) + + optional enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) optional 'ch.qos.logback:logback-classic' optional 'com.atomikos:transactions-jdbc' optional 'com.atomikos:transactions-jms' diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.gradle index 8e7b02eb8a7..9b26aae89d8 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.gradle @@ -29,7 +29,7 @@ dependencies { testRepository project(path: ':spring-boot-project:spring-boot-tools:spring-boot-loader', configuration: 'mavenRepository') testRepository project(path: ':spring-boot-project:spring-boot-starters:spring-boot-starter', configuration: 'mavenRepository') - testImplementation platform(project(':spring-boot-project:spring-boot-dependencies')) + testImplementation enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) testImplementation project(path: ':spring-boot-project:spring-boot-tools:spring-boot-loader-tools') testImplementation 'org.assertj:assertj-core' testImplementation 'org.junit.jupiter:junit-jupiter' diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/build.gradle index aa63b13cf0a..5f5aed5f489 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/build.gradle @@ -1,7 +1,6 @@ plugins { id 'java' id 'org.springframework.boot.conventions' - id 'org.springframework.boot.internal-dependency-management' } description = 'Spring Boot Atmosphere smoke test' diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/build.gradle index f3af6387249..75490b6c9c3 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/build.gradle @@ -8,18 +8,18 @@ description = 'Spring Boot Jetty JSP smoke test' dependencies { compileOnly 'jakarta.servlet:jakarta.servlet-api' compileOnly project(':spring-boot-project:spring-boot-starters:spring-boot-starter-jetty') - + implementation(project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web')) { exclude module: 'spring-boot-starter-tomcat' } - - providedRuntime platform(project(':spring-boot-project:spring-boot-dependencies')) + + providedRuntime enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) providedRuntime('org.eclipse.jetty:apache-jsp') { exclude group: 'javax.annotation', module: 'javax.annotation-api' } - + runtimeOnly 'javax.servlet:jstl' - + testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-jetty') } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/build.gradle index 09d6aa952c8..6629c872eb2 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-war/build.gradle @@ -10,7 +10,7 @@ dependencies { exclude module: 'spring-boot-starter-tomcat' } - providedCompile platform(project(':spring-boot-project:spring-boot-dependencies')) + providedCompile enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) providedCompile 'jakarta.servlet:jakarta.servlet-api' testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test')