Move all Java and most Groovy code to core

ascheman · Oct 11, 2023 · fb708b8 · fb708b8
1 parent cfec1fd
commit fb708b8
Show file tree

Hide file tree

Showing 101 changed files with 47 additions and 37 deletions.
diff --git 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}"
+}
diff --git a/...org/aim42/filesystem/FileCollector.groovy → ...org/aim42/filesystem/FileCollector.groovy b/...org/aim42/filesystem/FileCollector.groovy → ...org/aim42/filesystem/FileCollector.groovy
diff --git a/...oovy/org/aim42/filesystem/FileUtil.groovy → ...oovy/org/aim42/filesystem/FileUtil.groovy b/...oovy/org/aim42/filesystem/FileUtil.groovy → ...oovy/org/aim42/filesystem/FileUtil.groovy
diff --git a/...42/htmlsanitycheck/AllChecksRunner.groovy → ...42/htmlsanitycheck/AllChecksRunner.groovy b/...42/htmlsanitycheck/AllChecksRunner.groovy → ...42/htmlsanitycheck/AllChecksRunner.groovy
diff --git a/...im42/htmlsanitycheck/Configuration.groovy → ...im42/htmlsanitycheck/Configuration.groovy b/...im42/htmlsanitycheck/Configuration.groovy → ...im42/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/...itycheck/MisconfigurationException.groovy → ...itycheck/MisconfigurationException.groovy b/...itycheck/MisconfigurationException.groovy → ...itycheck/MisconfigurationException.groovy
diff --git a/...m42/htmlsanitycheck/ProductVersion.groovy → ...m42/htmlsanitycheck/ProductVersion.groovy b/...m42/htmlsanitycheck/ProductVersion.groovy → ...m42/htmlsanitycheck/ProductVersion.groovy
diff --git a/.../htmlsanitycheck/check/AllCheckers.groovy → .../htmlsanitycheck/check/AllCheckers.groovy b/.../htmlsanitycheck/check/AllCheckers.groovy → .../htmlsanitycheck/check/AllCheckers.groovy
diff --git a/...check/BrokenCrossReferencesChecker.groovy → ...check/BrokenCrossReferencesChecker.groovy b/...check/BrokenCrossReferencesChecker.groovy → ...check/BrokenCrossReferencesChecker.groovy
diff --git a/...check/check/BrokenHttpLinksChecker.groovy → ...check/check/BrokenHttpLinksChecker.groovy b/...check/check/BrokenHttpLinksChecker.groovy → ...check/check/BrokenHttpLinksChecker.groovy
diff --git a/...im42/htmlsanitycheck/check/Checker.groovy → ...im42/htmlsanitycheck/check/Checker.groovy b/...im42/htmlsanitycheck/check/Checker.groovy → ...im42/htmlsanitycheck/check/Checker.groovy
diff --git a/...mlsanitycheck/check/CheckerCreator.groovy → ...mlsanitycheck/check/CheckerCreator.groovy b/...mlsanitycheck/check/CheckerCreator.groovy → ...mlsanitycheck/check/CheckerCreator.groovy
diff --git a/...nitycheck/check/DuplicateIdChecker.groovy → ...nitycheck/check/DuplicateIdChecker.groovy b/...nitycheck/check/DuplicateIdChecker.groovy → ...nitycheck/check/DuplicateIdChecker.groovy
diff --git a/...lsanitycheck/check/ImageMapChecker.groovy → ...lsanitycheck/check/ImageMapChecker.groovy b/...lsanitycheck/check/ImageMapChecker.groovy → ...lsanitycheck/check/ImageMapChecker.groovy
diff --git a/...check/MissingAltInImageTagsChecker.groovy → ...check/MissingAltInImageTagsChecker.groovy b/...check/MissingAltInImageTagsChecker.groovy → ...check/MissingAltInImageTagsChecker.groovy
diff --git a/...eck/check/MissingImageFilesChecker.groovy → ...eck/check/MissingImageFilesChecker.groovy b/...eck/check/MissingImageFilesChecker.groovy → ...eck/check/MissingImageFilesChecker.groovy
diff --git a/...check/MissingLocalResourcesChecker.groovy → ...check/MissingLocalResourcesChecker.groovy b/...check/MissingLocalResourcesChecker.groovy → ...check/MissingLocalResourcesChecker.groovy
diff --git a/...anitycheck/check/SuggestingChecker.groovy → ...anitycheck/check/SuggestingChecker.groovy b/...anitycheck/check/SuggestingChecker.groovy → ...anitycheck/check/SuggestingChecker.groovy
diff --git a/...heck/check/UnknownCheckerException.groovy → ...heck/check/UnknownCheckerException.groovy b/...heck/check/UnknownCheckerException.groovy → ...heck/check/UnknownCheckerException.groovy
diff --git a/...mlsanitycheck/collect/CheckResults.groovy → ...mlsanitycheck/collect/CheckResults.groovy b/...mlsanitycheck/collect/CheckResults.groovy → ...mlsanitycheck/collect/CheckResults.groovy
diff --git a/...42/htmlsanitycheck/collect/Finding.groovy → ...42/htmlsanitycheck/collect/Finding.groovy b/...42/htmlsanitycheck/collect/Finding.groovy → ...42/htmlsanitycheck/collect/Finding.groovy
diff --git a/...tmlsanitycheck/collect/PageResults.groovy → ...tmlsanitycheck/collect/PageResults.groovy b/...tmlsanitycheck/collect/PageResults.groovy → ...tmlsanitycheck/collect/PageResults.groovy
diff --git a/...lsanitycheck/collect/PerRunResults.groovy → ...lsanitycheck/collect/PerRunResults.groovy b/...lsanitycheck/collect/PerRunResults.groovy → ...lsanitycheck/collect/PerRunResults.groovy
diff --git a/...htmlsanitycheck/collect/RunResults.groovy → ...htmlsanitycheck/collect/RunResults.groovy b/...htmlsanitycheck/collect/RunResults.groovy → ...htmlsanitycheck/collect/RunResults.groovy
diff --git a/...tycheck/collect/SingleCheckResults.groovy → ...tycheck/collect/SingleCheckResults.groovy b/...tycheck/collect/SingleCheckResults.groovy → ...tycheck/collect/SingleCheckResults.groovy
diff --git a/...itycheck/collect/SinglePageResults.groovy → ...itycheck/collect/SinglePageResults.groovy b/...itycheck/collect/SinglePageResults.groovy → ...itycheck/collect/SinglePageResults.groovy
diff --git a/...m42/htmlsanitycheck/html/HtmlConst.groovy → ...m42/htmlsanitycheck/html/HtmlConst.groovy b/...m42/htmlsanitycheck/html/HtmlConst.groovy → ...m42/htmlsanitycheck/html/HtmlConst.groovy
diff --git a/...2/htmlsanitycheck/html/HtmlElement.groovy → ...2/htmlsanitycheck/html/HtmlElement.groovy b/...2/htmlsanitycheck/html/HtmlElement.groovy → ...2/htmlsanitycheck/html/HtmlElement.groovy
diff --git a/...im42/htmlsanitycheck/html/HtmlPage.groovy → ...im42/htmlsanitycheck/html/HtmlPage.groovy b/...im42/htmlsanitycheck/html/HtmlPage.groovy → ...im42/htmlsanitycheck/html/HtmlPage.groovy
diff --git a/.../htmlsanitycheck/html/ParserSample.groovy → .../htmlsanitycheck/html/ParserSample.groovy b/.../htmlsanitycheck/html/ParserSample.groovy → .../htmlsanitycheck/html/ParserSample.groovy
diff --git a/...aim42/htmlsanitycheck/html/URLUtil.groovy → ...aim42/htmlsanitycheck/html/URLUtil.groovy b/...aim42/htmlsanitycheck/html/URLUtil.groovy → ...aim42/htmlsanitycheck/html/URLUtil.groovy
diff --git a/...sanitycheck/report/ConsoleReporter.groovy → ...sanitycheck/report/ConsoleReporter.groovy b/...sanitycheck/report/ConsoleReporter.groovy → ...sanitycheck/report/ConsoleReporter.groovy
diff --git a/...lsanitycheck/report/CreateLinkUtil.groovy → ...lsanitycheck/report/CreateLinkUtil.groovy b/...lsanitycheck/report/CreateLinkUtil.groovy → ...lsanitycheck/report/CreateLinkUtil.groovy
diff --git a/...tmlsanitycheck/report/HtmlReporter.groovy → ...tmlsanitycheck/report/HtmlReporter.groovy b/...tmlsanitycheck/report/HtmlReporter.groovy → ...tmlsanitycheck/report/HtmlReporter.groovy
diff --git a/...anitycheck/report/JUnitXmlReporter.groovy → ...anitycheck/report/JUnitXmlReporter.groovy b/...anitycheck/report/JUnitXmlReporter.groovy → ...anitycheck/report/JUnitXmlReporter.groovy
diff --git a/...lsanitycheck/report/LoggerReporter.groovy → ...lsanitycheck/report/LoggerReporter.groovy b/...lsanitycheck/report/LoggerReporter.groovy → ...lsanitycheck/report/LoggerReporter.groovy
diff --git a/...42/htmlsanitycheck/report/Reporter.groovy → ...42/htmlsanitycheck/report/Reporter.groovy b/...42/htmlsanitycheck/report/Reporter.groovy → ...42/htmlsanitycheck/report/Reporter.groovy
diff --git a/...lsanitycheck/report/SummarizerUtil.groovy → ...lsanitycheck/report/SummarizerUtil.groovy b/...lsanitycheck/report/SummarizerUtil.groovy → ...lsanitycheck/report/SummarizerUtil.groovy
diff --git a/.../htmlsanitycheck/suggest/Suggester.groovy → .../htmlsanitycheck/suggest/Suggester.groovy b/.../htmlsanitycheck/suggest/Suggester.groovy → .../htmlsanitycheck/suggest/Suggester.groovy
diff --git a/...main/groovy/org/aim42/inet/NetUtil.groovy → ...main/groovy/org/aim42/inet/NetUtil.groovy b/...main/groovy/org/aim42/inet/NetUtil.groovy → ...main/groovy/org/aim42/inet/NetUtil.groovy
diff --git a/...y/AscendingSimilarityScoreComparator.java → ...y/AscendingSimilarityScoreComparator.java b/...y/AscendingSimilarityScoreComparator.java → ...y/AscendingSimilarityScoreComparator.java
diff --git a/.../DescendingSimilarityScoreComparator.java → .../DescendingSimilarityScoreComparator.java b/.../DescendingSimilarityScoreComparator.java → .../DescendingSimilarityScoreComparator.java
diff --git a/...net/ricecode/similarity/JaroStrategy.java → ...net/ricecode/similarity/JaroStrategy.java b/...net/ricecode/similarity/JaroStrategy.java → ...net/ricecode/similarity/JaroStrategy.java
diff --git a/...ecode/similarity/JaroWinklerStrategy.java → ...ecode/similarity/JaroWinklerStrategy.java b/...ecode/similarity/JaroWinklerStrategy.java → ...ecode/similarity/JaroWinklerStrategy.java
diff --git a/.../ricecode/similarity/SimilarityScore.java → .../ricecode/similarity/SimilarityScore.java b/.../ricecode/similarity/SimilarityScore.java → .../ricecode/similarity/SimilarityScore.java
diff --git a/...cecode/similarity/SimilarityStrategy.java → ...cecode/similarity/SimilarityStrategy.java b/...cecode/similarity/SimilarityStrategy.java → ...cecode/similarity/SimilarityStrategy.java
diff --git a/...e/similarity/StringSimilarityService.java → ...e/similarity/StringSimilarityService.java b/...e/similarity/StringSimilarityService.java → ...e/similarity/StringSimilarityService.java
diff --git a/...milarity/StringSimilarityServiceImpl.java → ...milarity/StringSimilarityServiceImpl.java b/...milarity/StringSimilarityServiceImpl.java → ...milarity/StringSimilarityServiceImpl.java
diff --git a/...a/org/aim42/net/TrustAllCertificates.java → ...a/org/aim42/net/TrustAllCertificates.java b/...a/org/aim42/net/TrustAllCertificates.java → ...a/org/aim42/net/TrustAllCertificates.java
diff --git a/...main/resources/product-version.properties → ...main/resources/product-version.properties b/...main/resources/product-version.properties → ...main/resources/product-version.properties
diff --git a/...aim42/filesystem/DirAndFileCreator.groovy → ...aim42/filesystem/DirAndFileCreator.groovy b/...aim42/filesystem/DirAndFileCreator.groovy → ...aim42/filesystem/DirAndFileCreator.groovy
diff --git a/.../filesystem/ImageFileCollectorSpec.groovy → .../filesystem/ImageFileCollectorSpec.groovy b/.../filesystem/ImageFileCollectorSpec.groovy → .../filesystem/ImageFileCollectorSpec.groovy
diff --git a/...tmlsanitycheck/AllChecksRunnerTest.groovy → ...tmlsanitycheck/AllChecksRunnerTest.groovy b/...tmlsanitycheck/AllChecksRunnerTest.groovy → ...tmlsanitycheck/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/ConfigurationSpec.groovy → .../htmlsanitycheck/ConfigurationSpec.groovy b/.../htmlsanitycheck/ConfigurationSpec.groovy → .../htmlsanitycheck/ConfigurationSpec.groovy
diff --git a/...heck/MisconfigurationExceptionSpec.groovy → ...heck/MisconfigurationExceptionSpec.groovy b/...heck/MisconfigurationExceptionSpec.groovy → ...heck/MisconfigurationExceptionSpec.groovy
diff --git a/...htmlsanitycheck/ProductVersionTest.groovy → ...htmlsanitycheck/ProductVersionTest.groovy b/...htmlsanitycheck/ProductVersionTest.groovy → ...htmlsanitycheck/ProductVersionTest.groovy
diff --git a/...2/htmlsanitycheck/RandomStringSpec.groovy → ...2/htmlsanitycheck/RandomStringSpec.groovy b/...2/htmlsanitycheck/RandomStringSpec.groovy → ...2/htmlsanitycheck/RandomStringSpec.groovy
diff --git a/...k/BrokenCrossReferencesCheckerTest.groovy → ...k/BrokenCrossReferencesCheckerTest.groovy b/...k/BrokenCrossReferencesCheckerTest.groovy → ...k/BrokenCrossReferencesCheckerTest.groovy
diff --git a/...k/check/BrokenHttpLinksCheckerSpec.groovy → ...k/check/BrokenHttpLinksCheckerSpec.groovy b/...k/check/BrokenHttpLinksCheckerSpec.groovy → ...k/check/BrokenHttpLinksCheckerSpec.groovy
diff --git a/...nitycheck/check/CheckerCreatorSpec.groovy → ...nitycheck/check/CheckerCreatorSpec.groovy b/...nitycheck/check/CheckerCreatorSpec.groovy → ...nitycheck/check/CheckerCreatorSpec.groovy
diff --git a/...check/check/DuplicateIdCheckerTest.groovy → ...check/check/DuplicateIdCheckerTest.groovy b/...check/check/DuplicateIdCheckerTest.groovy → ...check/check/DuplicateIdCheckerTest.groovy
diff --git a/...tycheck/check/ImageMapsCheckerSpec.groovy → ...tycheck/check/ImageMapsCheckerSpec.groovy b/...tycheck/check/ImageMapsCheckerSpec.groovy → ...tycheck/check/ImageMapsCheckerSpec.groovy
diff --git a/...k/MissingAltInImageTagsCheckerSpec.groovy → ...k/MissingAltInImageTagsCheckerSpec.groovy b/...k/MissingAltInImageTagsCheckerSpec.groovy → ...k/MissingAltInImageTagsCheckerSpec.groovy
diff --git a/...check/MissingImageFilesCheckerTest.groovy → ...check/MissingImageFilesCheckerTest.groovy b/...check/MissingImageFilesCheckerTest.groovy → ...check/MissingImageFilesCheckerTest.groovy
diff --git a/...k/MissingLocalResourceRefCountSpec.groovy → ...k/MissingLocalResourceRefCountSpec.groovy b/...k/MissingLocalResourceRefCountSpec.groovy → ...k/MissingLocalResourceRefCountSpec.groovy
diff --git a/...k/MissingLocalResourcesCheckerSpec.groovy → ...k/MissingLocalResourcesCheckerSpec.groovy b/...k/MissingLocalResourcesCheckerSpec.groovy → ...k/MissingLocalResourcesCheckerSpec.groovy
diff --git a/...k/MissingLocalResourcesCheckerTest.groovy → ...k/MissingLocalResourcesCheckerTest.groovy b/...k/MissingLocalResourcesCheckerTest.groovy → ...k/MissingLocalResourcesCheckerTest.groovy
diff --git a/...tmlsanitycheck/collect/FindingSpec.groovy → ...tmlsanitycheck/collect/FindingSpec.groovy b/...tmlsanitycheck/collect/FindingSpec.groovy → ...tmlsanitycheck/collect/FindingSpec.groovy
diff --git a/...itycheck/collect/PerRunResultsTest.groovy → ...itycheck/collect/PerRunResultsTest.groovy b/...itycheck/collect/PerRunResultsTest.groovy → ...itycheck/collect/PerRunResultsTest.groovy
diff --git a/...eck/collect/SingleCheckResultsTest.groovy → ...eck/collect/SingleCheckResultsTest.groovy b/...eck/collect/SingleCheckResultsTest.groovy → ...eck/collect/SingleCheckResultsTest.groovy
diff --git a/...heck/collect/SinglePageResultsTest.groovy → ...heck/collect/SinglePageResultsTest.groovy b/...heck/collect/SinglePageResultsTest.groovy → ...heck/collect/SinglePageResultsTest.groovy
diff --git a/.../htmlsanitycheck/html/HtmlPageSpec.groovy → .../htmlsanitycheck/html/HtmlPageSpec.groovy b/.../htmlsanitycheck/html/HtmlPageSpec.groovy → .../htmlsanitycheck/html/HtmlPageSpec.groovy
diff --git a/.../htmlsanitycheck/html/HtmlPageTest.groovy → .../htmlsanitycheck/html/HtmlPageTest.groovy b/.../htmlsanitycheck/html/HtmlPageTest.groovy → .../htmlsanitycheck/html/HtmlPageTest.groovy
diff --git a/...tmlsanitycheck/html/HtmlParserTest.groovy → ...tmlsanitycheck/html/HtmlParserTest.groovy b/...tmlsanitycheck/html/HtmlParserTest.groovy → ...tmlsanitycheck/html/HtmlParserTest.groovy
diff --git a/...anitycheck/html/ImageMapParserSpec.groovy → ...anitycheck/html/ImageMapParserSpec.groovy b/...anitycheck/html/ImageMapParserSpec.groovy → ...anitycheck/html/ImageMapParserSpec.groovy
diff --git a/...2/htmlsanitycheck/html/URLUtilSpec.groovy → ...2/htmlsanitycheck/html/URLUtilSpec.groovy b/...2/htmlsanitycheck/html/URLUtilSpec.groovy → ...2/htmlsanitycheck/html/URLUtilSpec.groovy
diff --git a/...2/htmlsanitycheck/html/URLUtilTest.groovy → ...2/htmlsanitycheck/html/URLUtilTest.groovy b/...2/htmlsanitycheck/html/URLUtilTest.groovy → ...2/htmlsanitycheck/html/URLUtilTest.groovy
diff --git a/...tycheck/report/ConsoleReporterTest.groovy → ...tycheck/report/ConsoleReporterTest.groovy b/...tycheck/report/ConsoleReporterTest.groovy → ...tycheck/report/ConsoleReporterTest.groovy
diff --git a/...itycheck/report/CreateLinkUtilSpec.groovy → ...itycheck/report/CreateLinkUtilSpec.groovy b/...itycheck/report/CreateLinkUtilSpec.groovy → ...itycheck/report/CreateLinkUtilSpec.groovy
diff --git a/...ycheck/report/JUnitXmlReporterTest.groovy → ...ycheck/report/JUnitXmlReporterTest.groovy b/...ycheck/report/JUnitXmlReporterTest.groovy → ...ycheck/report/JUnitXmlReporterTest.groovy
diff --git a/...tmlsanitycheck/report/ReporterTest.groovy → ...tmlsanitycheck/report/ReporterTest.groovy b/...tmlsanitycheck/report/ReporterTest.groovy → ...tmlsanitycheck/report/ReporterTest.groovy
diff --git a/...ingCheckerReportingIntegrationSpec.groovy → ...ingCheckerReportingIntegrationSpec.groovy b/...ingCheckerReportingIntegrationSpec.groovy → ...ingCheckerReportingIntegrationSpec.groovy
diff --git a/...itycheck/report/SummarizerUtilSpec.groovy → ...itycheck/report/SummarizerUtilSpec.groovy b/...itycheck/report/SummarizerUtilSpec.groovy → ...itycheck/report/SummarizerUtilSpec.groovy
diff --git a/...rossReferenceCheckerSuggestionTest.groovy → ...rossReferenceCheckerSuggestionTest.groovy b/...rossReferenceCheckerSuggestionTest.groovy → ...rossReferenceCheckerSuggestionTest.groovy
diff --git a/...gest/StringSimilarityServiceImplTest.java → ...gest/StringSimilarityServiceImplTest.java b/...gest/StringSimilarityServiceImplTest.java → ...gest/StringSimilarityServiceImplTest.java
diff --git a/...lsanitycheck/suggest/SuggesterSpec.groovy → ...lsanitycheck/suggest/SuggesterSpec.groovy b/...lsanitycheck/suggest/SuggesterSpec.groovy → ...lsanitycheck/suggest/SuggesterSpec.groovy
diff --git a/.../groovy/org/aim42/inet/NetUtilSpec.groovy → .../groovy/org/aim42/inet/NetUtilSpec.groovy b/.../groovy/org/aim42/inet/NetUtilSpec.groovy → .../groovy/org/aim42/inet/NetUtilSpec.groovy
diff --git a/...m42/testutil/RandomStringGenerator.groovy → ...m42/testutil/RandomStringGenerator.groovy b/...m42/testutil/RandomStringGenerator.groovy → ...m42/testutil/RandomStringGenerator.groovy
diff --git a/...e/similarity/AscendingComparatorTest.java → ...e/similarity/AscendingComparatorTest.java b/...e/similarity/AscendingComparatorTest.java → ...e/similarity/AscendingComparatorTest.java
diff --git a/.../similarity/DescendingComparatorTest.java → .../similarity/DescendingComparatorTest.java b/.../similarity/DescendingComparatorTest.java → .../similarity/DescendingComparatorTest.java
diff --git a/...ricecode/similarity/JaroStrategyTest.java → ...ricecode/similarity/JaroStrategyTest.java b/...ricecode/similarity/JaroStrategyTest.java → ...ricecode/similarity/JaroStrategyTest.java
diff --git a/...e/similarity/JaroWinklerStrategyTest.java → ...e/similarity/JaroWinklerStrategyTest.java b/...e/similarity/JaroWinklerStrategyTest.java → ...e/similarity/JaroWinklerStrategyTest.java
diff --git a/...ecode/similarity/SimilarityScoreTest.java → ...ecode/similarity/SimilarityScoreTest.java b/...ecode/similarity/SimilarityScoreTest.java → ...ecode/similarity/SimilarityScoreTest.java
diff --git a/...net/ricecode/similarity/package-info.java → ...net/ricecode/similarity/package-info.java b/...net/ricecode/similarity/package-info.java → ...net/ricecode/similarity/package-info.java
diff --git a/...ava/org/aim42/UnsecureHttpConnection.java → ...ava/org/aim42/UnsecureHttpConnection.java b/...ava/org/aim42/UnsecureHttpConnection.java → ...ava/org/aim42/UnsecureHttpConnection.java
diff --git a/...ugin/src/test/resources/file-to-test.adoc → ...core/src/test/resources/file-to-test.adoc b/...ugin/src/test/resources/file-to-test.adoc → ...core/src/test/resources/file-to-test.adoc
diff --git a/...ugin/src/test/resources/file-to-test.html → ...core/src/test/resources/file-to-test.html b/...ugin/src/test/resources/file-to-test.html → ...core/src/test/resources/file-to-test.html
diff --git a/...lugin/src/test/resources/images/aim42.png → ...-core/src/test/resources/images/aim42.png b/...lugin/src/test/resources/images/aim42.png → ...-core/src/test/resources/images/aim42.png
diff --git 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
@@ -5,5 +5,5 @@ plugins {
 
 rootProject.name = 'htmlSanityCheck'
 
-include ':htmlSanityCheck-core',
-        ':htmlSanityCheck-gradle-plugin'
+include 'htmlSanityCheck-core',
+        'htmlSanityCheck-gradle-plugin'
diff --git 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