Merge branch '3.3.x'

Closes gh-43649 in 3.4.x
Closes gh-43651
This commit is contained in:
Andy Wilkinson
2025-01-02 12:22:59 +00:00
54 changed files with 353 additions and 261 deletions

View File

@@ -1,6 +1,8 @@
buildscript {
repositories {
maven { url 'https://repo.spring.io/libs-snapshot' }
maven {
url = 'https://repo.spring.io/libs-snapshot'
}
}
dependencies {

View File

@@ -1,6 +1,8 @@
pluginManagement {
repositories {
maven { url 'https://repo.spring.io/milestone' }
maven {
url = 'https://repo.spring.io/milestone'
}
gradlePluginPortal()
}
}

View File

@@ -1,7 +1,11 @@
pluginManagement {
repositories {
maven { url 'https://repo.spring.io/milestone' }
maven { url 'https://repo.spring.io/snapshot' }
maven {
url = 'https://repo.spring.io/milestone'
}
maven {
url = 'https://repo.spring.io/snapshot'
}
gradlePluginPortal()
}
}

View File

@@ -8,8 +8,9 @@ apply(plugin = "io.spring.dependency-management")
// end::apply[]
tasks.register("verify") {
val plugins = project.plugins
doLast {
project.plugins.getPlugin(JavaPlugin::class)
project.plugins.getPlugin(io.spring.gradle.dependencymanagement.DependencyManagementPlugin::class)
plugins.getPlugin(JavaPlugin::class)
plugins.getPlugin(io.spring.gradle.dependencymanagement.DependencyManagementPlugin::class)
}
}

View File

@@ -24,5 +24,7 @@ dependencyManagement {
}
repositories {
maven { url 'repository' }
maven {
url = 'repository'
}
}

View File

@@ -14,7 +14,9 @@ dependencies {
}
repositories {
maven { url 'repository' }
maven {
url = 'repository'
}
}
configurations.all {

View File

@@ -9,7 +9,9 @@ dependencies {
}
repositories {
maven { url 'repository' }
maven {
url = 'repository'
}
}
configurations.all {

View File

@@ -19,7 +19,9 @@ ext['slf4j.version'] = '1.7.20'
// end::custom-version[]
repositories {
maven { url 'repository' }
maven {
url = 'repository'
}
}
task slf4jVersion {

View File

@@ -27,7 +27,8 @@ the<DependencyManagementExtension>().apply {
}
tasks.register("slf4jVersion") {
val dependencyManagement = project.the<DependencyManagementExtension>()
doLast {
println(project.the<DependencyManagementExtension>().managedVersions["org.slf4j:slf4j-api"])
println(dependencyManagement.managedVersions["org.slf4j:slf4j-api"])
}
}

View File

@@ -1,6 +1,8 @@
buildscript {
repositories {
maven { url 'https://repo.spring.io/libs-milestone' }
maven {
url = 'https://repo.spring.io/libs-milestone'
}
}
dependencies {

View File

@@ -1,6 +1,8 @@
buildscript {
repositories {
maven { url 'https://repo.spring.io/libs-snapshot' }
maven {
url = 'https://repo.spring.io/libs-snapshot'
}
}
dependencies {

View File

@@ -13,7 +13,7 @@ publishing {
}
repositories {
maven {
url 'https://repo.example.com'
url = 'https://repo.example.com'
}
}
}