mirror of
https://github.com/spring-projects/spring-boot.git
synced 2026-09-17 20:19:06 +00:00
Merge branch '4.0.x'
This commit is contained in:
+2
-2
@@ -27,7 +27,7 @@ java {
|
||||
}
|
||||
|
||||
repositories {
|
||||
maven { url "file:${rootDir}/../docker-test-maven-repository"}
|
||||
maven { url = layout.projectDirectory.dir("../docker-test-maven-repository") }
|
||||
mavenCentral()
|
||||
spring.mavenRepositories()
|
||||
}
|
||||
@@ -43,7 +43,7 @@ tasks.register("bootJarUnpack", BootJar.class) {
|
||||
classpath = bootJar.classpath
|
||||
requiresUnpack '**/bcprov-jdk18on-*.jar'
|
||||
archiveClassifier.set("unpack")
|
||||
targetJavaVersion = targetCompatibility
|
||||
targetJavaVersion = java.targetCompatibility
|
||||
}
|
||||
|
||||
build.dependsOn bootJarUnpack
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
pluginManagement {
|
||||
evaluate(new File("${gradle.parent.rootProject.rootDir}/buildSrc/SpringRepositorySupport.groovy")).apply(this)
|
||||
repositories {
|
||||
maven { url "file:${rootDir}/../docker-test-maven-repository"}
|
||||
maven { url = layout.settingsDirectory.dir("../docker-test-maven-repository") }
|
||||
mavenCentral()
|
||||
spring.mavenRepositories()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user