Merge pull request #165 from Ozsie/dependabot/maven/detekt.version-1.…

…22.0 Bump detekt.version from 1.21.0 to 1.22.0
Ozsie · Nov 21, 2022 · b0c937f · b0c937f
2 parents e5d4220 + eb40f71
commit b0c937f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ A maven plugin that wraps the Detekt CLI. It supports the same parameters as the
 ```
 Using the above configuration, Detekt will scan source files in _${basedir}/src_ and output the results in _${basedir}/detekt_.
 
-All parameters available to Detekt version _1.21.0_ can be configured in
+All parameters available to Detekt version _1.22.0_ can be configured in
 the plugin.
 
 ### Remote configuration

diff --git a/pom.xml b/pom.xml
@@ -40,7 +40,7 @@
 
         <!-- Compile -->
         <kotlin.version>1.6.10</kotlin.version>
-        <detekt.version>1.21.0</detekt.version>
+        <detekt.version>1.22.0</detekt.version>
         <jcommander.version>1.82</jcommander.version>
         <snakeyaml.version>1.21</snakeyaml.version>
         <maven.api.version>3.8.6</maven.api.version>

diff --git a/src/main/java/com/github/ozsie/DetektMojo.kt b/src/main/java/com/github/ozsie/DetektMojo.kt
@@ -16,9 +16,9 @@ const val CONFIG_RESOURCE = "-cr"
 const val DEBUG = "--debug"
 const val DISABLE_DEFAULT_RULE_SET = "-dd"
 const val EXCLUDES = "-ex"
-const val FAIL_FAST = "--fail-fast"
 const val INCLUDES = "-in"
 const val INPUT = "-i"
+const val JDK_HOME = "--jdk-home"
 const val JVM_TARGET = "--jvm-target"
 const val LANGUAGE_VERSION = "--language-version"
 const val MAX_ISSUES = "--max-issues"
@@ -70,9 +70,6 @@ abstract class DetektMojo : AbstractMojo() {
     @Parameter(property = "detekt.buildUponDefaultConfig", defaultValue = "false")
     var buildUponDefaultConfig = false
 
-    @Parameter(property = "detekt.failFast", defaultValue = "false")
-    var failFast = false
-
     @Parameter(property = "detekt.report")
     var report = ArrayList<String>()
 
@@ -91,6 +88,9 @@ abstract class DetektMojo : AbstractMojo() {
     @Parameter(property = "detekt.includes")
     var includes = ""
 
+    @Parameter(property = "detekt.jdkHome")
+    var jdkHome = ""
+
     @Parameter(property = "detekt.jvmTarget")
     var jvmTarget = ""
 
@@ -122,13 +122,13 @@ abstract class DetektMojo : AbstractMojo() {
                 .useIf(input.isNotEmpty(), INPUT, input)
                 .useIf(report.isNotEmpty(), reportsToArgList(report))
                 .useIf(buildUponDefaultConfig, BUILD_UPON_DEFAULT_CONFIG)
-                .useIf(failFast, FAIL_FAST)
                 .useIf(plugins.isNotEmpty(), PLUGINS,
                     plugins.buildPluginPaths(mavenProject, localRepoLocation, this@DetektMojo.log))
                 .useIf(autoCorrect, AUTO_CORRECT)
                 .useIf(classPath.isNotEmpty(), CLASS_PATH, classPath)
                 .useIf(excludes.isNotEmpty(), EXCLUDES, excludes)
                 .useIf(includes.isNotEmpty(), INCLUDES, includes)
+                .useIf(jdkHome.isNotEmpty(), JDK_HOME, jdkHome)
                 .useIf(jvmTarget.isNotEmpty(), JVM_TARGET, jvmTarget)
                 .useIf(languageVersion.isNotEmpty(), LANGUAGE_VERSION, languageVersion)
                 .useIf(allRules, ALL_RULES)

diff --git a/src/test/java/com/github/ozsie/CheckMojoSpec.kt b/src/test/java/com/github/ozsie/CheckMojoSpec.kt
@@ -41,7 +41,6 @@ class CheckMojoSpec : Spek({
         val checkMojo = CheckMojo().apply {
             input = invalidPackageNamingDirectoryPath
             failBuildOnMaxIssuesReached = false
-            failFast = true // fail on any issue
         }
         on("checkMojo.execute()") {
             test("Unit is expected") {
@@ -56,7 +55,6 @@ class CheckMojoSpec : Spek({
         val checkMojo = CheckMojo().apply {
             input = invalidPackageNamingDirectoryPath
             failBuildOnMaxIssuesReached = true
-            failFast = true // fail on any issue
         }
         on("checkMojo.execute()") {
             test("Unit is expected") {

diff --git a/src/test/java/com/github/ozsie/CheckWithTypeResolutionMojoSpec.kt b/src/test/java/com/github/ozsie/CheckWithTypeResolutionMojoSpec.kt
@@ -36,7 +36,6 @@ class CheckWithTypeResolutionMojoSpec : Spek({
     given("a CheckMojo and 'failBuildOnMaxIssuesReached' is false") {
         val checkMojo = CheckWithTypeResolutionMojoTestFactory.createWithInvalidPackageNamingStructure {
             failBuildOnMaxIssuesReached = false
-            failFast = true
         }
 
         on("checkMojo.execute()") {
@@ -51,7 +50,6 @@ class CheckWithTypeResolutionMojoSpec : Spek({
     given("a CheckMojo and 'failBuildOnMaxIssuesReached' is true") {
         val checkMojo = CheckWithTypeResolutionMojoTestFactory.createWithInvalidPackageNamingStructure {
             failBuildOnMaxIssuesReached = true
-            failFast = true
         }
         on("checkMojo.execute()") {
             test("Unit is expected") {