Gradle 8.6-rc-1

nebula-plugins · Jan 8, 2024 · 3e13ea5 · 3e13ea5
1 parent 4d4ecd7
commit 3e13ea5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-rc-1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/...roovy/nebula/plugin/publishing/ivy/IvyNebulaSpringBootPublishPluginIntegrationSpec.groovy b/...roovy/nebula/plugin/publishing/ivy/IvyNebulaSpringBootPublishPluginIntegrationSpec.groovy
@@ -16,7 +16,9 @@
 package nebula.plugin.publishing.ivy
 
 import nebula.plugin.publishing.BaseIntegrationTestKitSpec
+import spock.lang.IgnoreIf
 
+@IgnoreIf({ !jvm.isJava17Compatible() })
 class IvyNebulaSpringBootPublishPluginIntegrationSpec extends BaseIntegrationTestKitSpec {
     def setup() {
         keepFiles = true
@@ -25,8 +27,8 @@ class IvyNebulaSpringBootPublishPluginIntegrationSpec extends BaseIntegrationTes
         buildFile << """\
             plugins {
                 id 'com.netflix.nebula.ivy-publish'
-                id 'org.springframework.boot' version '2.7.11'
-                id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+                id 'org.springframework.boot' version '3.2.1'
+                id 'io.spring.dependency-management' version '1.1.4'
                 id 'java'
                 id "com.netflix.nebula.info" version "12.1.3"
                 id "com.netflix.nebula.contacts" version "7.0.0"
@@ -107,8 +109,8 @@ public class DemoApplication {
         desc.'nebula:Module_Email' == '[email protected]'
 
         and:
-        assertDependency('org.springframework.boot', 'spring-boot-starter-web', '2.7.11', 'runtime->default')
-        assertDependency('org.postgresql', 'postgresql', '42.3.8', 'runtime->default')
+        assertDependency('org.springframework.boot', 'spring-boot-starter-web', '3.2.1', 'runtime->default')
+        assertDependency('org.postgresql', 'postgresql', '42.6.0', 'runtime->default')
 
         when:
         def jar = new File(projectDir, "build/libs/ivypublishingtest-0.1.0.jar")

diff --git a/...y/nebula/plugin/publishing/maven/MavenNebulaSpringBootPublishPluginIntegrationSpec.groovy b/...y/nebula/plugin/publishing/maven/MavenNebulaSpringBootPublishPluginIntegrationSpec.groovy
@@ -17,9 +17,11 @@ package nebula.plugin.publishing.maven
 
 import nebula.plugin.publishing.BaseIntegrationTestKitSpec
 import nebula.plugin.publishing.publications.SpringBootJarPlugin
+import spock.lang.IgnoreIf
 import spock.lang.Subject
 
 @Subject(SpringBootJarPlugin)
+@IgnoreIf({ !jvm.isJava17Compatible() })
 class MavenNebulaSpringBootPublishPluginIntegrationSpec  extends BaseIntegrationTestKitSpec {
     def setup() {
         keepFiles = true
@@ -31,7 +33,7 @@ class MavenNebulaSpringBootPublishPluginIntegrationSpec  extends BaseIntegration
         buildFile << """\
             plugins {
                 id 'com.netflix.nebula.maven-publish'
-                id 'org.springframework.boot' version '2.7.17'
+                id 'org.springframework.boot' version '3.2.1'
                 id 'io.spring.dependency-management' version '1.1.4'
                 id 'java'
                 id "com.netflix.nebula.info" version "12.1.6"
@@ -106,7 +108,7 @@ public class DemoApplication {
         def spring = dependencies.find { it.artifactId == 'spring-boot-starter-web' }
 
         then:
-        spring.version == '2.7.17'
+        spring.version == '3.2.1'
 
         when:
         def jar = new File(projectDir, "build/libs/mavenpublishingtest-0.1.0.jar")