Browse Source

Merge branch '3.3.x'

pull/43654/head
Andy Wilkinson 12 months ago
parent
commit
425876e95e
  1. 4
      spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle
  2. 12
      spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-classDataSharingApp.gradle
  3. 4
      spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-executableWarApp.gradle
  4. 4
      spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-nativeApp.gradle
  5. 4
      spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle
  6. 4
      spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle
  7. 4
      spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests.gradle
  8. 4
      spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/settings.gradle

4
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle

@ -8,7 +8,9 @@ plugins { @@ -8,7 +8,9 @@ plugins {
repositories {
exclusiveContent {
forRepository {
maven { url '{systemTestMavenRepository}' }
maven {
url = '{systemTestMavenRepository}'
}
}
filter {
includeGroup "org.springframework.boot"

12
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-classDataSharingApp.gradle

@ -7,15 +7,21 @@ plugins { @@ -7,15 +7,21 @@ plugins {
repositories {
exclusiveContent {
forRepository {
maven { url '{systemTestMavenRepository}' }
maven {
url = '{systemTestMavenRepository}'
}
}
filter {
includeGroup "org.springframework.boot"
}
}
mavenCentral()
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'
}
}
dependencies {

4
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-executableWarApp.gradle

@ -8,7 +8,9 @@ plugins { @@ -8,7 +8,9 @@ plugins {
repositories {
exclusiveContent {
forRepository {
maven { url '{systemTestMavenRepository}' }
maven {
url = '{systemTestMavenRepository}'
}
}
filter {
includeGroup "org.springframework.boot"

4
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-nativeApp.gradle

@ -9,7 +9,9 @@ plugins { @@ -9,7 +9,9 @@ plugins {
repositories {
exclusiveContent {
forRepository {
maven { url '{systemTestMavenRepository}' }
maven {
url = '{systemTestMavenRepository}'
}
}
filter {
includeGroup "org.springframework.boot"

4
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle

@ -8,7 +8,9 @@ plugins { @@ -8,7 +8,9 @@ plugins {
repositories {
exclusiveContent {
forRepository {
maven { url '{systemTestMavenRepository}' }
maven {
url = '{systemTestMavenRepository}'
}
}
filter {
includeGroup "org.springframework.boot"

4
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle

@ -8,7 +8,9 @@ plugins { @@ -8,7 +8,9 @@ plugins {
repositories {
exclusiveContent {
forRepository {
maven { url '{systemTestMavenRepository}' }
maven {
url = '{systemTestMavenRepository}'
}
}
filter {
includeGroup "org.springframework.boot"

4
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests.gradle

@ -7,7 +7,9 @@ plugins { @@ -7,7 +7,9 @@ plugins {
repositories {
exclusiveContent {
forRepository {
maven { url '{systemTestMavenRepository}' }
maven {
url = '{systemTestMavenRepository}'
}
}
filter {
includeGroup "org.springframework.boot"

4
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/settings.gradle

@ -3,7 +3,9 @@ pluginManagement { @@ -3,7 +3,9 @@ pluginManagement {
repositories {
exclusiveContent {
forRepository {
maven { url '{systemTestMavenRepository}' }
maven {
url = '{systemTestMavenRepository}'
}
}
filter {
includeGroup "org.springframework.boot"

Loading…
Cancel
Save