Skip to content

Commit

Permalink
Merge pull request #150 from aim42/broken-logo-in-report-149
Browse files Browse the repository at this point in the history
Pat, awesome you fixed it immediately - really appreciated!
thanx!!
Broken logo in report, fixes #149
  • Loading branch information
gernotstarke authored May 3, 2017
2 parents 6f3bce4 + 47358a4 commit 93bd4d3
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 8 deletions.
4 changes: 2 additions & 2 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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',
Expand Down
12 changes: 10 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}

// ========================================================


Expand Down
4 changes: 4 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -9,6 +10,7 @@ import org.gradle.util.GFileUtils
/**
* write the findings report to HTML
*/
@Slf4j
public class HtmlReporter extends Reporter {

//
Expand Down Expand Up @@ -381,7 +383,7 @@ function scrollToTop() {
writer << "</body></html>"
writer.flush()

println "wrote report to ${resultsOutputDir}${File.separatorChar}$REPORT_FILENAME"
log.info "wrote report to ${resultsOutputDir}${File.separatorChar}$REPORT_FILENAME"
}


Expand Down

0 comments on commit 93bd4d3

Please sign in to comment.