diff --git a/build.gradle b/build.gradle index dad5682f..db9d6ae2 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,9 @@ configure(subprojects) { implementation platform(libs.groovy.bom) implementation 'org.codehaus.groovy:groovy' - testImplementation platform(libs.spock) + implementation platform (libs.slf4j.bom) + + testImplementation platform (libs.spock) testImplementation "org.spockframework:spock-core" testImplementation "org.spockframework:spock-junit4" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index be776d19..dee311e6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,16 +2,17 @@ groovy-version = "3.0.17" junit5-version = "5.10.1" picocli-version = "4.7.5" +slf4j-version = "2.0.11" [libraries] # Use Groovy which corresponds to Gradle version (of hsc build) groovy-bom = { module = "org.codehaus.groovy:groovy-bom", version.ref = "groovy-version" } jsoup = "org.jsoup:jsoup:1.17.2" junit-vintage = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit5-version" } +mockito = "org.mockito:mockito-junit-jupiter:3.11.2" picocli-impl = { module = 'info.picocli:picocli', version.ref = "picocli-version" } picocli-annotationprocessor = { module = 'info.picocli:picocli-codegen', version.ref = "picocli-version" } -slf4j-api = "org.slf4j:slf4j-api:2.0.11" -slf4j-nop = "org.slf4j:slf4j-nop:2.0.11" +slf4j-bom = { module = "org.slf4j:slf4j-bom", version.ref = "slf4j-version" } spock = "org.spockframework:spock-bom:2.3-groovy-3.0" [plugins] diff --git a/htmlSanityCheck-cli/build.gradle b/htmlSanityCheck-cli/build.gradle index 5ee0437a..3fdcdf4b 100644 --- a/htmlSanityCheck-cli/build.gradle +++ b/htmlSanityCheck-cli/build.gradle @@ -2,25 +2,16 @@ plugins { id 'application' } -test { - useJUnitPlatform() -} - dependencies { implementation libs.picocli.impl annotationProcessor libs.picocli.annotationprocessor - implementation libs.slf4j.api - implementation libs.slf4j.simple - implementation libs.groovy.all + implementation 'org.slf4j:slf4j-api' + implementation 'org.slf4j:slf4j-simple' implementation project(":htmlSanityCheck-core") - testImplementation libs.spock.core - testImplementation libs.jupiter.api testImplementation libs.mockito - testRuntimeOnly libs.jupiter.engine - testImplementation libs.spock.reports } compileGroovy { @@ -30,4 +21,33 @@ compileGroovy { application { mainClass = 'org.aim42.htmlsanitycheck.cli.Main' applicationName = 'hsc' -} \ No newline at end of file +} + +/* + * Copyright Gerd Aschemann and aim42 contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + */ diff --git a/htmlSanityCheck-core/build.gradle b/htmlSanityCheck-core/build.gradle index 8a5898f9..a9086f93 100644 --- a/htmlSanityCheck-core/build.gradle +++ b/htmlSanityCheck-core/build.gradle @@ -1,8 +1,8 @@ import org.apache.tools.ant.filters.ReplaceTokens dependencies { - implementation libs.slf4j.api - testImplementation libs.slf4j.nop + implementation 'org.slf4j:slf4j-api' + testImplementation 'org.slf4j:slf4j-nop' // jsoup is our awesome html parser, see jsoup.org implementation libs.jsoup implementation 'org.codehaus.groovy:groovy-xml' diff --git a/htmlSanityCheck-gradle-plugin/build.gradle b/htmlSanityCheck-gradle-plugin/build.gradle index 67c3f547..e2d47621 100755 --- a/htmlSanityCheck-gradle-plugin/build.gradle +++ b/htmlSanityCheck-gradle-plugin/build.gradle @@ -13,9 +13,11 @@ gradlePlugin { dependencies { implementation gradleApi() + implementation project(":htmlSanityCheck-core") testImplementation( + libs.jsoup, gradleTestKit() ) }