From babbc9aa24eb0fe6999b7fcc8de760309e7438de Mon Sep 17 00:00:00 2001 From: Mario Garcia Date: Fri, 24 Feb 2023 01:39:26 +0100 Subject: [PATCH] Fixes #68 error when setting logging level in Gradle 7.x --- gradle.properties | 2 +- src/main/groovy/org/jbake/gradle/JBakeServeTask.groovy | 2 -- src/test/groovy/org/jbake/gradle/JbakeIntegrationSpec.groovy | 5 +++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9134a0c..3acfb79 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,7 +17,7 @@ # group = org.jbake -version = 5.5.0 +version = 5.5.1 pluginId = org.jbake.site pluginDisplayName = JBake Gradle Plugin diff --git a/src/main/groovy/org/jbake/gradle/JBakeServeTask.groovy b/src/main/groovy/org/jbake/gradle/JBakeServeTask.groovy index 2c53047..7e7d61d 100644 --- a/src/main/groovy/org/jbake/gradle/JBakeServeTask.groovy +++ b/src/main/groovy/org/jbake/gradle/JBakeServeTask.groovy @@ -19,7 +19,6 @@ package org.jbake.gradle import org.gradle.api.DefaultTask import org.gradle.api.artifacts.Configuration -import org.gradle.api.logging.LogLevel import org.gradle.api.tasks.Classpath import org.gradle.api.tasks.Input import org.gradle.api.tasks.InputDirectory @@ -46,7 +45,6 @@ class JBakeServeTask extends DefaultTask { @TaskAction void serve() { - logging.level = LogLevel.INFO createJettyServer() jettyServer.prepare() println("Starting server. Browse to http://localhost:${getPort()}") diff --git a/src/test/groovy/org/jbake/gradle/JbakeIntegrationSpec.groovy b/src/test/groovy/org/jbake/gradle/JbakeIntegrationSpec.groovy index 7820982..47b2a5a 100644 --- a/src/test/groovy/org/jbake/gradle/JbakeIntegrationSpec.groovy +++ b/src/test/groovy/org/jbake/gradle/JbakeIntegrationSpec.groovy @@ -29,7 +29,7 @@ import static org.gradle.testkit.runner.TaskOutcome.SUCCESS @Unroll class JbakeIntegrationSpec extends PluginIntegrationSpec { @Shared - String latestGradleVersion = '7.0.2' + String latestGradleVersion = '8.0.1' @Shared String latestJbakeVersion = '2.6.7' @@ -75,7 +75,8 @@ class JbakeIntegrationSpec extends PluginIntegrationSpec { where: version | jdk9Compatible | jdk14Compatible '5.6.4' | true | false // latest 5.x version - '6.8.3' | true | true // latest 6.x version + '6.9.4' | true | true // latest 6.x version + '7.6' | true | true // latest 7.x version latestGradleVersion | true | true // latest release, deprecations & warnings }