Polish "Test the Gradle plugin against Gradle 4.10.3 and 5.1.1"

Closes spring-projectsgh-15791
anshuman-mor · Feb 11, 2019 · 4faa0f5 · 4faa0f5
1 parent 1de372d
commit 4faa0f5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/...-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilitySuite.java b/...-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/.../test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java b/.../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 void noKotlinVersionPropertyWithoutKotlinPlugin() {
 	}
 
 	@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/...boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java b/...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/...nVersionMatchesKotlinPluginVersion.gradle → ...onTests-kotlinVersionPropertyIsSet.gradle b/...nVersionMatchesKotlinPluginVersion.gradle → ...onTests-kotlinVersionPropertyIsSet.gradle