From 1de372d8963f1881d777cb2dfa610008010451a2 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Fri, 25 Jan 2019 21:03:04 +0100 Subject: [PATCH 1/2] Test the Gradle plugin against Gradle 4.10.3 and 5.1.1 See gh-15791 --- .../boot/gradle/junit/GradleCompatibilitySuite.java | 2 +- .../org/springframework/boot/gradle/testkit/GradleBuild.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilitySuite.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilitySuite.java index 31a8b70220d..f934eb38aab 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilitySuite.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilitySuite.java @@ -39,7 +39,7 @@ import org.springframework.boot.gradle.testkit.GradleBuild; public final class GradleCompatibilitySuite extends Suite { private static final List GRADLE_VERSIONS = Arrays.asList("default", "4.5.1", - "4.6", "4.7", "4.8.1", "4.9", "4.10.2", "5.0"); + "4.6", "4.7", "4.8.1", "4.9", "4.10.3", "5.0", "5.1.1"); public GradleCompatibilitySuite(Class clazz) throws InitializationError { super(clazz, createRunners(clazz)); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java index ba7a4660315..d0114eff987 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java @@ -195,7 +195,7 @@ public class GradleBuild implements TestRule { gradleRunner.withGradleVersion(this.gradleVersion); } else if (this.dsl == Dsl.KOTLIN) { - gradleRunner.withGradleVersion("4.10.2"); + gradleRunner.withGradleVersion("4.10.3"); } List allArguments = new ArrayList<>(); allArguments.add("-PbootVersion=" + getBootVersion()); From 4faa0f51b7e3a284f2157735064915a959eb3f38 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 11 Feb 2019 15:36:04 +0000 Subject: [PATCH 2/2] Polish "Test the Gradle plugin against Gradle 4.10.3 and 5.1.1" Closes gh-15791 --- .../boot/gradle/junit/GradleCompatibilitySuite.java | 2 +- .../gradle/plugin/KotlinPluginActionIntegrationTests.java | 8 +++----- .../springframework/boot/gradle/testkit/GradleBuild.java | 2 +- ...ionIntegrationTests-kotlinVersionPropertyIsSet.gradle} | 0 4 files changed, 5 insertions(+), 7 deletions(-) rename spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/{KotlinPluginActionIntegrationTests-kotlinVersionMatchesKotlinPluginVersion.gradle => KotlinPluginActionIntegrationTests-kotlinVersionPropertyIsSet.gradle} (100%) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilitySuite.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilitySuite.java index f934eb38aab..a07bb2bc512 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilitySuite.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilitySuite.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2019 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. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java index 1fcc43794e3..347453c88fb 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2019 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. @@ -43,12 +43,10 @@ public class KotlinPluginActionIntegrationTests { } @Test - public void kotlinVersionMatchesKotlinPluginVersion() { + public void kotlinVersionPropertyIsSet() { String output = this.gradleBuild.build("kotlinVersion", "dependencies", "--configuration", "compileClasspath").getOutput(); - assertThat(output).contains("Kotlin version: 1.2.20"); - assertThat(output) - .containsPattern("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.20"); + assertThat(output).containsPattern("Kotlin version: [0-9]\\.[0-9]\\.[0-9]+"); } @Test diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java index d0114eff987..e75c7aad089 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2019 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. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests-kotlinVersionMatchesKotlinPluginVersion.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests-kotlinVersionPropertyIsSet.gradle similarity index 100% rename from spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests-kotlinVersionMatchesKotlinPluginVersion.gradle rename to spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests-kotlinVersionPropertyIsSet.gradle