From 11c8c21fff1d7c29c2659d212aff5d72bfdef407 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2020 05:17:10 +0000 Subject: [PATCH 1/2] Bump detekt-cli from 1.9.1 to 1.10.0 Bumps [detekt-cli](https://github.com/detekt/detekt) from 1.9.1 to 1.10.0. - [Release notes](https://github.com/detekt/detekt/releases) - [Commits](https://github.com/detekt/detekt/compare/v1.9.1...v1.10.0) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c23a507..c4d6b9d 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ 1.3.72 - 1.9.1 + 1.10.0 1.78 1.21 3.6.3 From 79dfc332309ac7fc1a1218f59c0e41d3b9a160e4 Mon Sep 17 00:00:00 2001 From: Oscar Djupfeldt Date: Mon, 29 Jun 2020 10:57:06 +0200 Subject: [PATCH 2/2] Fixed build issues, readme etc --- README.md | 11 ++++++----- pom.xml | 4 ++-- src/main/java/com/github/ozsie/CheckMojo.kt | 3 +-- src/main/java/com/github/ozsie/CreateBaselineMojo.kt | 2 +- src/main/java/com/github/ozsie/GenerateConfigMojo.kt | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index f2469ed..9210342 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ [![codecov](https://codecov.io/gh/Ozsie/detekt-maven-plugin/branch/master/graph/badge.svg)](https://codecov.io/gh/Ozsie/detekt-maven-plugin) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FOzsie%2Fdetekt-maven-plugin.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2FOzsie%2Fdetekt-maven-plugin?ref=badge_shield) [![Maven Central](https://img.shields.io/maven-central/v/com.github.ozsie/detekt-maven-plugin.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.github.ozsie%22%20AND%20a:%22detekt-maven-plugin%22) +[![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=Ozsie/detekt-maven-plugin)](https://dependabot.com) # Detekt Maven Plugin @@ -15,7 +16,7 @@ A maven plugin that wraps the Detekt CLI. It supports the same parameters as the com.github.ozsie detekt-maven-plugin - 1.9.1 + 1.10.0 verify @@ -28,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.9.1_ can be configured in +All parameters available to Detekt version _1.10.0_ can be configured in the plugin. @@ -39,7 +40,7 @@ the plugin. com.github.ozsie detekt-maven-plugin - 1.9.1 + 1.10.0 verify @@ -63,7 +64,7 @@ the plugin. com.github.ozsie detekt-maven-plugin - 1.9.1 + 1.10.0 verify @@ -114,7 +115,7 @@ _Example_ * `mvn detekt:gc` * `mvn detekt:generate-config` - For more information on Detekt, have a look at https://github.com/arturbosch/detekt + For more information on Detekt, have a look at https://github.com/detekt/detekt ## Contributors * [andreysaksonov](https://github.com/andreysaksonov) diff --git a/pom.xml b/pom.xml index c4d6b9d..e48fdc0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.github.ozsie detekt-maven-plugin - 1.9.1 + 1.10.0 maven-plugin detekt-maven-plugin Maven Plugin @@ -61,7 +61,7 @@ 0.8.5 1.6.8 1.6 - 1.6.0 + 1.9.1 diff --git a/src/main/java/com/github/ozsie/CheckMojo.kt b/src/main/java/com/github/ozsie/CheckMojo.kt index 97b35a1..987fe94 100644 --- a/src/main/java/com/github/ozsie/CheckMojo.kt +++ b/src/main/java/com/github/ozsie/CheckMojo.kt @@ -1,6 +1,5 @@ package com.github.ozsie -import io.gitlab.arturbosch.detekt.cli.CliArgs import io.gitlab.arturbosch.detekt.cli.parseArguments import io.gitlab.arturbosch.detekt.cli.runners.Runner import org.apache.maven.plugins.annotations.LifecyclePhase @@ -19,7 +18,7 @@ class CheckMojo : DetektMojo() { getCliSting().forEach { log.debug("Applying $it") } - val cliArgs = parseArguments(getCliSting().log().toTypedArray(), System.out, System.err) + val cliArgs = parseArguments(getCliSting().log().toTypedArray(), System.out, System.err) skip = !Files.isDirectory(Paths.get(input)) if (!skip) return Runner(cliArgs, System.out, System.err).execute() diff --git a/src/main/java/com/github/ozsie/CreateBaselineMojo.kt b/src/main/java/com/github/ozsie/CreateBaselineMojo.kt index 8bf98ab..01ef268 100644 --- a/src/main/java/com/github/ozsie/CreateBaselineMojo.kt +++ b/src/main/java/com/github/ozsie/CreateBaselineMojo.kt @@ -13,7 +13,7 @@ open class CreateBaselineMojo : DetektMojo() { cliStr.forEach { log.debug("Applying $it") } - val cliArgs = parseArguments(cliStr, System.out, System.err) + val cliArgs = parseArguments(cliStr, System.out, System.err) if (!skip) Runner(cliArgs, System.out, System.err).execute() } private val cliString get() = getCliSting().apply { diff --git a/src/main/java/com/github/ozsie/GenerateConfigMojo.kt b/src/main/java/com/github/ozsie/GenerateConfigMojo.kt index 6605785..ccb125e 100644 --- a/src/main/java/com/github/ozsie/GenerateConfigMojo.kt +++ b/src/main/java/com/github/ozsie/GenerateConfigMojo.kt @@ -9,7 +9,7 @@ import org.apache.maven.plugins.annotations.Mojo @Mojo(name = "generate-config") open class GenerateConfigMojo : DetektMojo() { override fun execute() { - val cliArgs = parseArguments(getCliSting().log().toTypedArray(), System.out, System.err) + val cliArgs = parseArguments(getCliSting().log().toTypedArray(), System.out, System.err) ConfigExporter(cliArgs).run { if (!skip) return execute() }