diff --git a/README.adoc b/README.adoc index 83d14a9c..ceab7668 100644 --- a/README.adoc +++ b/README.adoc @@ -1,5 +1,5 @@ = image:./htmlsanitycheck-logo.png[Html-SC] Html Sanity Check -:version: 0.9.6 +:version: 0.9.7 :plugin-url: https://github.com/aim42/htmlSanityCheck :plugin-issues: https://github.com/aim42/htmlSanityCheck/issues @@ -127,7 +127,7 @@ buildscript { dependencies { classpath (group: 'gradle.plugin.org.aim42', name: 'htmlSanityCheck', - version: '0.9.6') + version: '0.9.7') classpath (group: 'org.asciidoctor', name: 'asciidoctor-gradle-plugin', diff --git a/build.gradle b/build.gradle index 81c274ef..9f919df8 100644 --- a/build.gradle +++ b/build.gradle @@ -104,12 +104,20 @@ tasks.withType(GroovyCompile) { targetCompatibility = rootProject.targetCompatibility } +task copyResourceImages(type: Copy) { + from('src/main/resources') { + include '**/*.png' + } + into processResources.destinationDir +} processResources { + exclude '**/*.png' inputs.property "version", project.version filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [version: project.version]) - println "after processResources, version= ${project.version}" - + dependsOn copyResourceImages + println "after processResources config, version= ${project.version}" } + // ======================================================== diff --git a/changelog.txt b/changelog.txt index 536894ec..ad95bd6a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,10 @@ HtmlSanityCheck - ChangeLog +V.0.9.7 +May 3rd 2017: Fix broken logos in reports. #149 +May 3rd 2017: Clean up three logging statements. + V.0.9.6 Dec 13th 2016: Fix absolute local image check. #130 Dec 12th 2016: Gradle plugin sends output to info log. diff --git a/sonar-project.properties b/sonar-project.properties index f13fee78..200c86b3 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -3,7 +3,7 @@ sonar.projectKey=htmlSanityCheck # this is the name displayed in the SonarQube UI sonar.projectName=htmlSanityCheck -sonar.projectVersion=0.9.6 +sonar.projectVersion=0.9.7 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/src/main/groovy/org/aim42/htmlsanitycheck/HtmlSanityCheckTask.groovy b/src/main/groovy/org/aim42/htmlsanitycheck/HtmlSanityCheckTask.groovy index ee74faaa..5ff98e8e 100644 --- a/src/main/groovy/org/aim42/htmlsanitycheck/HtmlSanityCheckTask.groovy +++ b/src/main/groovy/org/aim42/htmlsanitycheck/HtmlSanityCheckTask.groovy @@ -92,8 +92,8 @@ class HtmlSanityCheckTask extends DefaultTask { // TODO: unclear: do we need to adjust pathnames if running on Windows(tm)?? - logger.warn("buildfile-info", sourceDocuments?.toString()) - logger.warn("allFilesToCheck" + allFilesToCheck.toString(), "") + logger.info("buildfile-info", sourceDocuments?.toString()) + logger.info("allFilesToCheck" + allFilesToCheck.toString(), "") // create an AllChecksRunner... def allChecksRunner = new AllChecksRunner( diff --git a/src/main/groovy/org/aim42/htmlsanitycheck/report/HtmlReporter.groovy b/src/main/groovy/org/aim42/htmlsanitycheck/report/HtmlReporter.groovy index 904da2cd..a8174e83 100644 --- a/src/main/groovy/org/aim42/htmlsanitycheck/report/HtmlReporter.groovy +++ b/src/main/groovy/org/aim42/htmlsanitycheck/report/HtmlReporter.groovy @@ -1,6 +1,7 @@ // see end-of-file for license information package org.aim42.htmlsanitycheck.report +import groovy.util.logging.Slf4j import org.aim42.htmlsanitycheck.collect.PerRunResults import org.aim42.htmlsanitycheck.collect.SingleCheckResults import org.aim42.htmlsanitycheck.collect.SinglePageResults @@ -9,6 +10,7 @@ import org.gradle.util.GFileUtils /** * write the findings report to HTML */ +@Slf4j public class HtmlReporter extends Reporter { // @@ -381,7 +383,7 @@ function scrollToTop() { writer << "" writer.flush() - println "wrote report to ${resultsOutputDir}${File.separatorChar}$REPORT_FILENAME" + log.info "wrote report to ${resultsOutputDir}${File.separatorChar}$REPORT_FILENAME" }