diff --git a/htmlSanityCheck-core/build.gradle b/htmlSanityCheck-core/build.gradle index e69de29b..07c9a7e3 100644 --- a/htmlSanityCheck-core/build.gradle +++ b/htmlSanityCheck-core/build.gradle @@ -0,0 +1,31 @@ +repositories { + jcenter() +// mavenCentral() +} + +apply plugin: 'java' +apply plugin: 'groovy' + +dependencies { + + testImplementation( + 'junit:junit:4.12', + 'org.spockframework:spock-core:1.3-groovy-2.5', + 'org.slf4j:slf4j-simple:2.0.7' + ) + +// implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.17.1' + implementation "org.slf4j:slf4j-api:2.0.7" + + // jsoup is our awesome html parser, see jsoup.org + implementation group: 'org.jsoup', name: 'jsoup', version: '1.16.1' + implementation 'org.codehaus.groovy:groovy-all:2.5.22' + implementation 'org.codehaus.groovy:groovy-dateutil:2.5.22' +} + +processResources { + exclude '**/*.png' + inputs.property "version", project.version + filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [version: project.version]) + println "after processResources config, version= ${project.version}" +} \ No newline at end of file diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/filesystem/FileCollector.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/filesystem/FileCollector.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/filesystem/FileCollector.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/filesystem/FileCollector.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/filesystem/FileUtil.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/filesystem/FileUtil.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/filesystem/FileUtil.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/filesystem/FileUtil.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/AllChecksRunner.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/AllChecksRunner.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/AllChecksRunner.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/AllChecksRunner.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/Configuration.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/Configuration.groovy similarity index 99% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/Configuration.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/Configuration.groovy index 1ec7c303..98a5bbb0 100644 --- a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/Configuration.groovy +++ b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/Configuration.groovy @@ -218,7 +218,7 @@ class Configuration { * We need at least one html file as input, maybe several * @param configuration instance * - * srcDocs needs to be of type {@link org.gradle.api.file.FileCollection} + * srcDocs needs to be of type {@link FileCollection} * to be Gradle-compliant */ Boolean isValid() { diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/MisconfigurationException.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/MisconfigurationException.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/MisconfigurationException.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/MisconfigurationException.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/ProductVersion.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/ProductVersion.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/ProductVersion.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/ProductVersion.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/AllCheckers.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/AllCheckers.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/AllCheckers.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/AllCheckers.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/BrokenCrossReferencesChecker.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/BrokenCrossReferencesChecker.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/BrokenCrossReferencesChecker.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/BrokenCrossReferencesChecker.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/BrokenHttpLinksChecker.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/BrokenHttpLinksChecker.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/BrokenHttpLinksChecker.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/BrokenHttpLinksChecker.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/Checker.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/Checker.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/Checker.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/Checker.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/CheckerCreator.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/CheckerCreator.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/CheckerCreator.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/CheckerCreator.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/DuplicateIdChecker.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/DuplicateIdChecker.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/DuplicateIdChecker.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/DuplicateIdChecker.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/ImageMapChecker.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/ImageMapChecker.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/ImageMapChecker.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/ImageMapChecker.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/MissingAltInImageTagsChecker.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/MissingAltInImageTagsChecker.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/MissingAltInImageTagsChecker.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/MissingAltInImageTagsChecker.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/MissingImageFilesChecker.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/MissingImageFilesChecker.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/MissingImageFilesChecker.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/MissingImageFilesChecker.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/MissingLocalResourcesChecker.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/MissingLocalResourcesChecker.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/MissingLocalResourcesChecker.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/MissingLocalResourcesChecker.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/SuggestingChecker.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/SuggestingChecker.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/SuggestingChecker.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/SuggestingChecker.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/UnknownCheckerException.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/UnknownCheckerException.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/check/UnknownCheckerException.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/check/UnknownCheckerException.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/collect/CheckResults.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/collect/CheckResults.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/collect/CheckResults.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/collect/CheckResults.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/collect/Finding.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/collect/Finding.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/collect/Finding.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/collect/Finding.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/collect/PageResults.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/collect/PageResults.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/collect/PageResults.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/collect/PageResults.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/collect/PerRunResults.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/collect/PerRunResults.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/collect/PerRunResults.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/collect/PerRunResults.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/collect/RunResults.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/collect/RunResults.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/collect/RunResults.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/collect/RunResults.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/collect/SingleCheckResults.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/collect/SingleCheckResults.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/collect/SingleCheckResults.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/collect/SingleCheckResults.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/collect/SinglePageResults.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/collect/SinglePageResults.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/collect/SinglePageResults.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/collect/SinglePageResults.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/html/HtmlConst.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/html/HtmlConst.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/html/HtmlConst.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/html/HtmlConst.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/html/HtmlElement.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/html/HtmlElement.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/html/HtmlElement.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/html/HtmlElement.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/html/HtmlPage.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/html/HtmlPage.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/html/HtmlPage.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/html/HtmlPage.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/html/ParserSample.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/html/ParserSample.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/html/ParserSample.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/html/ParserSample.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/html/URLUtil.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/html/URLUtil.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/html/URLUtil.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/html/URLUtil.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/report/ConsoleReporter.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/report/ConsoleReporter.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/report/ConsoleReporter.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/report/ConsoleReporter.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/report/CreateLinkUtil.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/report/CreateLinkUtil.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/report/CreateLinkUtil.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/report/CreateLinkUtil.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/report/HtmlReporter.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/report/HtmlReporter.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/report/HtmlReporter.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/report/HtmlReporter.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/report/JUnitXmlReporter.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/report/JUnitXmlReporter.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/report/JUnitXmlReporter.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/report/JUnitXmlReporter.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/report/LoggerReporter.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/report/LoggerReporter.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/report/LoggerReporter.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/report/LoggerReporter.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/report/Reporter.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/report/Reporter.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/report/Reporter.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/report/Reporter.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/report/SummarizerUtil.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/report/SummarizerUtil.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/report/SummarizerUtil.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/report/SummarizerUtil.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/suggest/Suggester.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/suggest/Suggester.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/htmlsanitycheck/suggest/Suggester.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/htmlsanitycheck/suggest/Suggester.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/inet/NetUtil.groovy b/htmlSanityCheck-core/src/main/groovy/org/aim42/inet/NetUtil.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42/inet/NetUtil.groovy rename to htmlSanityCheck-core/src/main/groovy/org/aim42/inet/NetUtil.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/main/java/net/ricecode/similarity/AscendingSimilarityScoreComparator.java b/htmlSanityCheck-core/src/main/java/net/ricecode/similarity/AscendingSimilarityScoreComparator.java similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/java/net/ricecode/similarity/AscendingSimilarityScoreComparator.java rename to htmlSanityCheck-core/src/main/java/net/ricecode/similarity/AscendingSimilarityScoreComparator.java diff --git a/htmlSanityCheck-gradle-plugin/src/main/java/net/ricecode/similarity/DescendingSimilarityScoreComparator.java b/htmlSanityCheck-core/src/main/java/net/ricecode/similarity/DescendingSimilarityScoreComparator.java similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/java/net/ricecode/similarity/DescendingSimilarityScoreComparator.java rename to htmlSanityCheck-core/src/main/java/net/ricecode/similarity/DescendingSimilarityScoreComparator.java diff --git a/htmlSanityCheck-gradle-plugin/src/main/java/net/ricecode/similarity/JaroStrategy.java b/htmlSanityCheck-core/src/main/java/net/ricecode/similarity/JaroStrategy.java similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/java/net/ricecode/similarity/JaroStrategy.java rename to htmlSanityCheck-core/src/main/java/net/ricecode/similarity/JaroStrategy.java diff --git a/htmlSanityCheck-gradle-plugin/src/main/java/net/ricecode/similarity/JaroWinklerStrategy.java b/htmlSanityCheck-core/src/main/java/net/ricecode/similarity/JaroWinklerStrategy.java similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/java/net/ricecode/similarity/JaroWinklerStrategy.java rename to htmlSanityCheck-core/src/main/java/net/ricecode/similarity/JaroWinklerStrategy.java diff --git a/htmlSanityCheck-gradle-plugin/src/main/java/net/ricecode/similarity/SimilarityScore.java b/htmlSanityCheck-core/src/main/java/net/ricecode/similarity/SimilarityScore.java similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/java/net/ricecode/similarity/SimilarityScore.java rename to htmlSanityCheck-core/src/main/java/net/ricecode/similarity/SimilarityScore.java diff --git a/htmlSanityCheck-gradle-plugin/src/main/java/net/ricecode/similarity/SimilarityStrategy.java b/htmlSanityCheck-core/src/main/java/net/ricecode/similarity/SimilarityStrategy.java similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/java/net/ricecode/similarity/SimilarityStrategy.java rename to htmlSanityCheck-core/src/main/java/net/ricecode/similarity/SimilarityStrategy.java diff --git a/htmlSanityCheck-gradle-plugin/src/main/java/net/ricecode/similarity/StringSimilarityService.java b/htmlSanityCheck-core/src/main/java/net/ricecode/similarity/StringSimilarityService.java similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/java/net/ricecode/similarity/StringSimilarityService.java rename to htmlSanityCheck-core/src/main/java/net/ricecode/similarity/StringSimilarityService.java diff --git a/htmlSanityCheck-gradle-plugin/src/main/java/net/ricecode/similarity/StringSimilarityServiceImpl.java b/htmlSanityCheck-core/src/main/java/net/ricecode/similarity/StringSimilarityServiceImpl.java similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/java/net/ricecode/similarity/StringSimilarityServiceImpl.java rename to htmlSanityCheck-core/src/main/java/net/ricecode/similarity/StringSimilarityServiceImpl.java diff --git a/htmlSanityCheck-gradle-plugin/src/main/java/org/aim42/net/TrustAllCertificates.java b/htmlSanityCheck-core/src/main/java/org/aim42/net/TrustAllCertificates.java similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/java/org/aim42/net/TrustAllCertificates.java rename to htmlSanityCheck-core/src/main/java/org/aim42/net/TrustAllCertificates.java diff --git a/htmlSanityCheck-gradle-plugin/src/main/resources/product-version.properties b/htmlSanityCheck-core/src/main/resources/product-version.properties similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/main/resources/product-version.properties rename to htmlSanityCheck-core/src/main/resources/product-version.properties diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/filesystem/DirAndFileCreator.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/filesystem/DirAndFileCreator.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/filesystem/DirAndFileCreator.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/filesystem/DirAndFileCreator.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/filesystem/ImageFileCollectorSpec.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/filesystem/ImageFileCollectorSpec.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/filesystem/ImageFileCollectorSpec.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/filesystem/ImageFileCollectorSpec.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/AllChecksRunnerTest.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/AllChecksRunnerTest.groovy similarity index 81% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/AllChecksRunnerTest.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/AllChecksRunnerTest.groovy index e4a0c169..3f1ce1f8 100644 --- a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/AllChecksRunnerTest.groovy +++ b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/AllChecksRunnerTest.groovy @@ -1,5 +1,6 @@ package org.aim42.htmlsanitycheck +import junit.framework.TestCase import org.aim42.htmlsanitycheck.check.AllCheckers import org.aim42.htmlsanitycheck.collect.SinglePageResults import org.junit.Test @@ -37,16 +38,16 @@ class AllChecksRunnerTest extends GroovyTestCase { // title = "hsc" int expected = AllCheckers.checkerClazzes.size() - assertEquals("expected $expected kinds of checks", expected, pageResults.singleCheckResults.size()) + TestCase.assertEquals("expected $expected kinds of checks", expected, pageResults.singleCheckResults.size()) - assertEquals("expected 0 items checked", 0, pageResults.nrOfItemsCheckedOnPage()) + TestCase.assertEquals("expected 0 items checked", 0, pageResults.nrOfItemsCheckedOnPage()) - assertEquals("expected 0 findings", 0, pageResults.nrOfFindingsOnPage()) + TestCase.assertEquals("expected 0 findings", 0, pageResults.nrOfFindingsOnPage()) - assertEquals("expected hsc title", "hsc", pageResults.pageTitle) + TestCase.assertEquals("expected hsc title", "hsc", pageResults.pageTitle) String tmpFileName = tmpFile.name - assertEquals("expected $tmpFileName as fileName", tmpFileName, pageResults.pageFileName ) + TestCase.assertEquals("expected $tmpFileName as fileName", tmpFileName, pageResults.pageFileName ) } @@ -69,9 +70,9 @@ class AllChecksRunnerTest extends GroovyTestCase { SinglePageResults pageResults = allChecksRunner.performChecksForOneFile( tmpFile ) int expected = AllCheckers.checkerClazzes.size() - assertEquals("expected $expected kinds of checks", expected, pageResults.singleCheckResults.size()) + TestCase.assertEquals("expected $expected kinds of checks", expected, pageResults.singleCheckResults.size()) - assertEquals("expected 2 findings", 2, pageResults.nrOfFindingsOnPage()) + TestCase.assertEquals("expected 2 findings", 2, pageResults.nrOfFindingsOnPage()) } @@ -86,7 +87,7 @@ class AllChecksRunnerTest extends GroovyTestCase { allChecksRunner = new AllChecksRunner(myConfig) SinglePageResults pageResults = allChecksRunner.performChecksForOneFile(tmpFile) - assertEquals(1, pageResults.singleCheckResults.size()) + TestCase.assertEquals(1, pageResults.singleCheckResults.size()) } } diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/ConfigurationSpec.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/ConfigurationSpec.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/ConfigurationSpec.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/ConfigurationSpec.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/MisconfigurationExceptionSpec.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/MisconfigurationExceptionSpec.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/MisconfigurationExceptionSpec.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/MisconfigurationExceptionSpec.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/ProductVersionTest.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/ProductVersionTest.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/ProductVersionTest.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/ProductVersionTest.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/RandomStringSpec.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/RandomStringSpec.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/RandomStringSpec.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/RandomStringSpec.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/check/BrokenCrossReferencesCheckerTest.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/check/BrokenCrossReferencesCheckerTest.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/check/BrokenCrossReferencesCheckerTest.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/check/BrokenCrossReferencesCheckerTest.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/check/BrokenHttpLinksCheckerSpec.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/check/BrokenHttpLinksCheckerSpec.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/check/BrokenHttpLinksCheckerSpec.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/check/BrokenHttpLinksCheckerSpec.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/check/CheckerCreatorSpec.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/check/CheckerCreatorSpec.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/check/CheckerCreatorSpec.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/check/CheckerCreatorSpec.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/check/DuplicateIdCheckerTest.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/check/DuplicateIdCheckerTest.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/check/DuplicateIdCheckerTest.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/check/DuplicateIdCheckerTest.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/check/ImageMapsCheckerSpec.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/check/ImageMapsCheckerSpec.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/check/ImageMapsCheckerSpec.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/check/ImageMapsCheckerSpec.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/check/MissingAltInImageTagsCheckerSpec.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/check/MissingAltInImageTagsCheckerSpec.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/check/MissingAltInImageTagsCheckerSpec.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/check/MissingAltInImageTagsCheckerSpec.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/check/MissingImageFilesCheckerTest.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/check/MissingImageFilesCheckerTest.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/check/MissingImageFilesCheckerTest.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/check/MissingImageFilesCheckerTest.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/check/MissingLocalResourceRefCountSpec.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/check/MissingLocalResourceRefCountSpec.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/check/MissingLocalResourceRefCountSpec.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/check/MissingLocalResourceRefCountSpec.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/check/MissingLocalResourcesCheckerSpec.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/check/MissingLocalResourcesCheckerSpec.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/check/MissingLocalResourcesCheckerSpec.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/check/MissingLocalResourcesCheckerSpec.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/check/MissingLocalResourcesCheckerTest.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/check/MissingLocalResourcesCheckerTest.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/check/MissingLocalResourcesCheckerTest.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/check/MissingLocalResourcesCheckerTest.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/collect/FindingSpec.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/collect/FindingSpec.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/collect/FindingSpec.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/collect/FindingSpec.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/collect/PerRunResultsTest.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/collect/PerRunResultsTest.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/collect/PerRunResultsTest.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/collect/PerRunResultsTest.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/collect/SingleCheckResultsTest.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/collect/SingleCheckResultsTest.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/collect/SingleCheckResultsTest.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/collect/SingleCheckResultsTest.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/collect/SinglePageResultsTest.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/collect/SinglePageResultsTest.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/collect/SinglePageResultsTest.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/collect/SinglePageResultsTest.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/html/HtmlPageSpec.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/html/HtmlPageSpec.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/html/HtmlPageSpec.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/html/HtmlPageSpec.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/html/HtmlPageTest.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/html/HtmlPageTest.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/html/HtmlPageTest.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/html/HtmlPageTest.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/html/HtmlParserTest.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/html/HtmlParserTest.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/html/HtmlParserTest.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/html/HtmlParserTest.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/html/ImageMapParserSpec.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/html/ImageMapParserSpec.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/html/ImageMapParserSpec.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/html/ImageMapParserSpec.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/html/URLUtilSpec.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/html/URLUtilSpec.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/html/URLUtilSpec.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/html/URLUtilSpec.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/html/URLUtilTest.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/html/URLUtilTest.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/html/URLUtilTest.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/html/URLUtilTest.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/report/ConsoleReporterTest.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/report/ConsoleReporterTest.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/report/ConsoleReporterTest.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/report/ConsoleReporterTest.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/report/CreateLinkUtilSpec.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/report/CreateLinkUtilSpec.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/report/CreateLinkUtilSpec.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/report/CreateLinkUtilSpec.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/report/JUnitXmlReporterTest.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/report/JUnitXmlReporterTest.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/report/JUnitXmlReporterTest.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/report/JUnitXmlReporterTest.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/report/ReporterTest.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/report/ReporterTest.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/report/ReporterTest.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/report/ReporterTest.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/report/SuggestingCheckerReportingIntegrationSpec.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/report/SuggestingCheckerReportingIntegrationSpec.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/report/SuggestingCheckerReportingIntegrationSpec.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/report/SuggestingCheckerReportingIntegrationSpec.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/report/SummarizerUtilSpec.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/report/SummarizerUtilSpec.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/report/SummarizerUtilSpec.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/report/SummarizerUtilSpec.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/suggest/BrokenCrossReferenceCheckerSuggestionTest.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/suggest/BrokenCrossReferenceCheckerSuggestionTest.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/suggest/BrokenCrossReferenceCheckerSuggestionTest.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/suggest/BrokenCrossReferenceCheckerSuggestionTest.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/suggest/StringSimilarityServiceImplTest.java b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/suggest/StringSimilarityServiceImplTest.java similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/suggest/StringSimilarityServiceImplTest.java rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/suggest/StringSimilarityServiceImplTest.java diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/suggest/SuggesterSpec.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/suggest/SuggesterSpec.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/htmlsanitycheck/suggest/SuggesterSpec.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/htmlsanitycheck/suggest/SuggesterSpec.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/inet/NetUtilSpec.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/inet/NetUtilSpec.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/inet/NetUtilSpec.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/inet/NetUtilSpec.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/testutil/RandomStringGenerator.groovy b/htmlSanityCheck-core/src/test/groovy/org/aim42/testutil/RandomStringGenerator.groovy similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42/testutil/RandomStringGenerator.groovy rename to htmlSanityCheck-core/src/test/groovy/org/aim42/testutil/RandomStringGenerator.groovy diff --git a/htmlSanityCheck-gradle-plugin/src/test/java/net/ricecode/similarity/AscendingComparatorTest.java b/htmlSanityCheck-core/src/test/java/net/ricecode/similarity/AscendingComparatorTest.java similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/java/net/ricecode/similarity/AscendingComparatorTest.java rename to htmlSanityCheck-core/src/test/java/net/ricecode/similarity/AscendingComparatorTest.java diff --git a/htmlSanityCheck-gradle-plugin/src/test/java/net/ricecode/similarity/DescendingComparatorTest.java b/htmlSanityCheck-core/src/test/java/net/ricecode/similarity/DescendingComparatorTest.java similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/java/net/ricecode/similarity/DescendingComparatorTest.java rename to htmlSanityCheck-core/src/test/java/net/ricecode/similarity/DescendingComparatorTest.java diff --git a/htmlSanityCheck-gradle-plugin/src/test/java/net/ricecode/similarity/JaroStrategyTest.java b/htmlSanityCheck-core/src/test/java/net/ricecode/similarity/JaroStrategyTest.java similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/java/net/ricecode/similarity/JaroStrategyTest.java rename to htmlSanityCheck-core/src/test/java/net/ricecode/similarity/JaroStrategyTest.java diff --git a/htmlSanityCheck-gradle-plugin/src/test/java/net/ricecode/similarity/JaroWinklerStrategyTest.java b/htmlSanityCheck-core/src/test/java/net/ricecode/similarity/JaroWinklerStrategyTest.java similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/java/net/ricecode/similarity/JaroWinklerStrategyTest.java rename to htmlSanityCheck-core/src/test/java/net/ricecode/similarity/JaroWinklerStrategyTest.java diff --git a/htmlSanityCheck-gradle-plugin/src/test/java/net/ricecode/similarity/SimilarityScoreTest.java b/htmlSanityCheck-core/src/test/java/net/ricecode/similarity/SimilarityScoreTest.java similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/java/net/ricecode/similarity/SimilarityScoreTest.java rename to htmlSanityCheck-core/src/test/java/net/ricecode/similarity/SimilarityScoreTest.java diff --git a/htmlSanityCheck-gradle-plugin/src/test/java/net/ricecode/similarity/package-info.java b/htmlSanityCheck-core/src/test/java/net/ricecode/similarity/package-info.java similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/java/net/ricecode/similarity/package-info.java rename to htmlSanityCheck-core/src/test/java/net/ricecode/similarity/package-info.java diff --git a/htmlSanityCheck-gradle-plugin/src/test/java/org/aim42/UnsecureHttpConnection.java b/htmlSanityCheck-core/src/test/java/org/aim42/UnsecureHttpConnection.java similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/java/org/aim42/UnsecureHttpConnection.java rename to htmlSanityCheck-core/src/test/java/org/aim42/UnsecureHttpConnection.java diff --git a/htmlSanityCheck-gradle-plugin/src/test/resources/file-to-test.adoc b/htmlSanityCheck-core/src/test/resources/file-to-test.adoc similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/resources/file-to-test.adoc rename to htmlSanityCheck-core/src/test/resources/file-to-test.adoc diff --git a/htmlSanityCheck-gradle-plugin/src/test/resources/file-to-test.html b/htmlSanityCheck-core/src/test/resources/file-to-test.html similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/resources/file-to-test.html rename to htmlSanityCheck-core/src/test/resources/file-to-test.html diff --git a/htmlSanityCheck-gradle-plugin/src/test/resources/images/aim42.png b/htmlSanityCheck-core/src/test/resources/images/aim42.png similarity index 100% rename from htmlSanityCheck-gradle-plugin/src/test/resources/images/aim42.png rename to htmlSanityCheck-core/src/test/resources/images/aim42.png diff --git a/htmlSanityCheck-gradle-plugin/build.gradle b/htmlSanityCheck-gradle-plugin/build.gradle index c5614ce5..23133a61 100755 --- a/htmlSanityCheck-gradle-plugin/build.gradle +++ b/htmlSanityCheck-gradle-plugin/build.gradle @@ -28,19 +28,11 @@ dependencies { 'junit:junit:4.12', 'org.spockframework:spock-core:1.3-groovy-2.5') - implementation gradleApi() - - implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.17.1' - - // since gradle 4.6, annotation processors shall be explicitly declared - // (instead of just having them in the compile-group) - annotationProcessor 'org.apache.logging.log4j:log4j-core:2.17.1' - - - // jsoup is our awesome html parser, see jsoup.org implementation group: 'org.jsoup', name: 'jsoup', version: '1.16.1' + implementation gradleApi() + implementation project(":htmlSanityCheck-core") } // dependencies @@ -55,7 +47,6 @@ ext { // tag::BuildPlugins[] apply plugin: 'groovy' -apply plugin: 'java' apply plugin: 'java-gradle-plugin' @@ -82,19 +73,6 @@ task copyResourceImages(type: Copy) { into processResources.destinationDir } -processResources { - exclude '**/*.png' - inputs.property "version", project.version - filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [version: project.version]) - dependsOn copyResourceImages - println "after processResources config, version= ${project.version}" -} - -// ======================================================== - - - - // ========================================================== // if you use htmlSanityCheck locally, publish with // "gradle publishToMavenLocal" diff --git a/settings.gradle b/settings.gradle index f9d6ccea..014a608a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,5 +5,5 @@ plugins { rootProject.name = 'htmlSanityCheck' -include ':htmlSanityCheck-core', - ':htmlSanityCheck-gradle-plugin' \ No newline at end of file +include 'htmlSanityCheck-core', + 'htmlSanityCheck-gradle-plugin' \ No newline at end of file diff --git a/src/docs/arc42/chapters/_config.adoc b/src/docs/arc42/chapters/_config.adoc index 1e954dd1..d2d0ba3a 100644 --- a/src/docs/arc42/chapters/_config.adoc +++ b/src/docs/arc42/chapters/_config.adoc @@ -23,8 +23,8 @@ ifndef::imagesdir[:imagesdir: ../images] :project-repository-docs-link: https://github.com/aim42/htmlSanityCheck/blob/main/src/docs/ :project-repository-docs-edit-link: https://github.com/aim42/htmlSanityCheck/edit/main/src/docs/ -:coresourcepath: {projectRootDir}/src/main/groovy/org/aim42 -:coretestpath: {projectRootDir}/src/test/groovy/org/aim42 +:coresourcepath: {projectRootDir}/htmlSanityCheck-gradle-plugin/src/main/groovy/org/aim42 +:coretestpath: {projectRootDir}/htmlSanityCheck-gradle-plugin/src/test/groovy/org/aim42 :asciidoctor-gradle-plugin-url: https://github.com/asciidoctor/asciidoctor-gradle-plugin