Spring/spring-aot-smoke-tests
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update smoke tests now that Boot 3.2.x has entered commercial support

Browse Source
This commit is contained in:
Andy Wilkinson
2024-11-22 10:33:30 +00:00
parent 7ab8bb2c2b
commit 641e6aaa30
6 changed files with 152 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
aot-smoke-test-support/build.gradle
View File

@@ -5,21 +5,44 @@ plugins {
}
repositories {
if (System.env['REPO_SPRING_IO_USERNAME'] != null && System.env['REPO_SPRING_IO_PASSWORD'] != null) {
maven {
name "Maven Central Mirror"
url "https://repo.spring.io/artifactory/repo1"
credentials {
username System.env['REPO_SPRING_IO_USERNAME']
password System.env['REPO_SPRING_IO_PASSWORD']
}
mavenContent {
releasesOnly()
}
maven {
name "Spring Commercial Snapshot"
url "https://repo.spring.io/artifactory/spring-commercial-snapshot-remote"
credentials {
username System.env['REPO_SPRING_IO_USERNAME']
password System.env['REPO_SPRING_IO_PASSWORD']
}
mavenContent {
snapshotsOnly()
includeGroupByRegex("io.micrometer.*")
includeGroupByRegex("org.springframework.*")
includeGroupByRegex("io.projectreactor.*")
}
}
else {
mavenCentral()
maven {
name "Spring Commercial Release"
url "https://repo.spring.io/artifactory/spring-commercial-release-remote"
credentials {
username System.env['REPO_SPRING_IO_USERNAME']
password System.env['REPO_SPRING_IO_PASSWORD']
}
mavenContent {
releasesOnly()
includeGroupByRegex("io.micrometer.*")
includeGroupByRegex("org.springframework.*")
includeGroupByRegex("io.projectreactor.*")
}
}
maven {
name "Maven Central Mirror"
url "https://repo.spring.io/artifactory/repo1"
credentials {
username System.env['REPO_SPRING_IO_USERNAME']
password System.env['REPO_SPRING_IO_PASSWORD']
}
mavenContent {
releasesOnly()
}
}
maven {
name "Spring Snapshot"

2
gradle.properties
View File

@@ -6,6 +6,6 @@ reachabilityMetadataVersion=0.3.14
kotlinVersion=1.9.24
javaFormatVersion=0.0.39
nbtVersion=0.9.28
springBootVersion=3.2.12-SNAPSHOT
springBootVersion=3.2.13-SNAPSHOT
springCloudVersion=2023.0.4-SNAPSHOT
springBootGeneration=3.2.x

49
gradle/plugins/aot-smoke-test-plugin/build.gradle
View File

@@ -5,21 +5,44 @@ plugins {
}
repositories {
if (System.env['REPO_SPRING_IO_USERNAME'] != null && System.env['REPO_SPRING_IO_PASSWORD'] != null) {
maven {
name "Maven Central Mirror"
url "https://repo.spring.io/artifactory/repo1"
credentials {
username System.env['REPO_SPRING_IO_USERNAME']
password System.env['REPO_SPRING_IO_PASSWORD']
}
mavenContent {
releasesOnly()
}
maven {
name "Spring Commercial Snapshot"
url "https://repo.spring.io/artifactory/spring-commercial-snapshot-remote"
credentials {
username System.env['REPO_SPRING_IO_USERNAME']
password System.env['REPO_SPRING_IO_PASSWORD']
}
mavenContent {
snapshotsOnly()
includeGroupByRegex("io.micrometer.*")
includeGroupByRegex("org.springframework.*")
includeGroupByRegex("io.projectreactor.*")
}
}
else {
mavenCentral()
maven {
name "Spring Commercial Release"
url "https://repo.spring.io/artifactory/spring-commercial-release-remote"
credentials {
username System.env['REPO_SPRING_IO_USERNAME']
password System.env['REPO_SPRING_IO_PASSWORD']
}
mavenContent {
releasesOnly()
includeGroupByRegex("io.micrometer.*")
includeGroupByRegex("org.springframework.*")
includeGroupByRegex("io.projectreactor.*")
}
}
maven {
name "Maven Central Mirror"
url "https://repo.spring.io/artifactory/repo1"
credentials {
username System.env['REPO_SPRING_IO_USERNAME']
password System.env['REPO_SPRING_IO_PASSWORD']
}
mavenContent {
releasesOnly()
}
}
maven {
name "Spring Snapshot"

23
gradle/plugins/aot-smoke-test-plugin/settings.gradle
View File

@@ -12,21 +12,16 @@ pluginManagement {
id "io.spring.javaformat" version gradle.extensions.extraProperties.get("javaFormatVersion")
}
repositories {
if (System.env['REPO_SPRING_IO_USERNAME'] != null && System.env['REPO_SPRING_IO_PASSWORD'] != null) {
maven {
name "Maven Central Mirror"
url "https://repo.spring.io/artifactory/repo1"
credentials {
username System.env['REPO_SPRING_IO_USERNAME']
password System.env['REPO_SPRING_IO_PASSWORD']
}
mavenContent {
releasesOnly()
}
maven {
name "Maven Central Mirror"
url "https://repo.spring.io/artifactory/repo1"
credentials {
username System.env['REPO_SPRING_IO_USERNAME']
password System.env['REPO_SPRING_IO_PASSWORD']
}
mavenContent {
releasesOnly()
}
}
else {
mavenCentral()
}
}
}

50
gradle/plugins/aot-smoke-test-plugin/src/main/java/org/springframework/aot/gradle/AotSmokeTestPlugin.java
View File

@@ -111,21 +111,43 @@ public class AotSmokeTestPlugin implements Plugin<Project> {
project.getConfigurations()
.all((configuration) -> configuration.getResolutionStrategy().eachDependency(forceSnapshots));
}
if (System.getenv().containsKey("REPO_SPRING_IO_USERNAME")
&& System.getenv().containsKey("REPO_SPRING_IO_PASSWORD")) {
project.getRepositories().maven((repo) -> {
repo.setName("Maven Central Mirror");
repo.setUrl("https://repo.spring.io/artifactory/repo1");
repo.credentials((credentials) -> {
credentials.setUsername(System.getenv().get("REPO_SPRING_IO_USERNAME"));
credentials.setPassword(System.getenv().get("REPO_SPRING_IO_PASSWORD"));
});
repo.mavenContent((mavenContent) -> mavenContent.releasesOnly());
project.getRepositories().maven((repo) -> {
repo.setName("Spring Commercial Snapshot");
repo.setUrl("https://repo.spring.io/artifactory/spring-commercial-snapshot-remote");
repo.credentials((credentials) -> {
credentials.setUsername(System.getenv().get("REPO_SPRING_IO_USERNAME"));
credentials.setPassword(System.getenv().get("REPO_SPRING_IO_PASSWORD"));
});
}
else {
project.getRepositories().mavenCentral();
}
repo.mavenContent((mavenContent) -> {
mavenContent.snapshotsOnly();
mavenContent.includeGroupByRegex("io.micrometer.*");
mavenContent.includeGroupByRegex("org.springframework.*");
mavenContent.includeGroupByRegex("io.projectreactor.*");
});
});
project.getRepositories().maven((repo) -> {
repo.setName("Spring Commercial Release");
repo.setUrl("https://repo.spring.io/artifactory/spring-commercial-release-remote");
repo.credentials((credentials) -> {
credentials.setUsername(System.getenv().get("REPO_SPRING_IO_USERNAME"));
credentials.setPassword(System.getenv().get("REPO_SPRING_IO_PASSWORD"));
});
repo.mavenContent((mavenContent) -> {
mavenContent.releasesOnly();
mavenContent.includeGroupByRegex("io.micrometer.*");
mavenContent.includeGroupByRegex("org.springframework.*");
mavenContent.includeGroupByRegex("io.projectreactor.*");
});
});
project.getRepositories().maven((repo) -> {
repo.setName("Maven Central Mirror");
repo.setUrl("https://repo.spring.io/artifactory/repo1");
repo.credentials((credentials) -> {
credentials.setUsername(System.getenv().get("REPO_SPRING_IO_USERNAME"));
credentials.setPassword(System.getenv().get("REPO_SPRING_IO_PASSWORD"));
});
repo.mavenContent((mavenContent) -> mavenContent.releasesOnly());
});
project.getRepositories().maven((repo) -> {
repo.setName("Spring Snapshot");
repo.setUrl("https://repo.spring.io/artifactory/snapshot");

47
settings.gradle
View File

@@ -1,21 +1,42 @@
pluginManagement {
includeBuild "gradle/plugins/aot-smoke-test-plugin"
repositories {
if (System.env['REPO_SPRING_IO_USERNAME'] != null && System.env['REPO_SPRING_IO_PASSWORD'] != null) {
maven {
name "Maven Central Mirror"
url "https://repo.spring.io/artifactory/repo1"
credentials {
username System.env['REPO_SPRING_IO_USERNAME']
password System.env['REPO_SPRING_IO_PASSWORD']
}
mavenContent {
releasesOnly()
}
maven {
name "Spring Commercial Snapshot"
url "https://repo.spring.io/artifactory/spring-commercial-snapshot-remote"
credentials {
username System.env['REPO_SPRING_IO_USERNAME']
password System.env['REPO_SPRING_IO_PASSWORD']
}
mavenContent {
snapshotsOnly()
includeGroupByRegex("org.springframework.*")
includeGroupByRegex("io.projectreactor.*")
}
}
else {
mavenCentral()
maven {
name "Spring Commercial Release"
url "https://repo.spring.io/artifactory/spring-commercial-release-remote"
credentials {
username System.env['REPO_SPRING_IO_USERNAME']
password System.env['REPO_SPRING_IO_PASSWORD']
}
mavenContent {
releasesOnly()
includeGroupByRegex("org.springframework.*")
includeGroupByRegex("io.projectreactor.*")
}
}
maven {
name "Maven Central Mirror"
url "https://repo.spring.io/artifactory/repo1"
credentials {
username System.env['REPO_SPRING_IO_USERNAME']
password System.env['REPO_SPRING_IO_PASSWORD']
}
mavenContent {
releasesOnly()
}
}
gradlePluginPortal()
maven {