diff --git a/.sdkmanrc b/.sdkmanrc
index 67192c8..03a43a2 100644
--- a/.sdkmanrc
+++ b/.sdkmanrc
@@ -1,3 +1,3 @@
# Enable auto-env through the sdkman_auto_env config
# Add key=value pairs of SDKs to use below
-java=11.0.20-zulu
+java=11.0.24-zulu
diff --git a/plugins/protocw-checker/.sdkmanrc b/plugins/protocw-checker/.sdkmanrc
new file mode 100644
index 0000000..03a43a2
--- /dev/null
+++ b/plugins/protocw-checker/.sdkmanrc
@@ -0,0 +1,3 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=11.0.24-zulu
diff --git a/plugins/protocw-checker/pom.xml b/plugins/protocw-checker/pom.xml
index 4fbdfcd..2c13712 100644
--- a/plugins/protocw-checker/pom.xml
+++ b/plugins/protocw-checker/pom.xml
@@ -25,15 +25,18 @@
+ UTF-8
+ UTF-8
+ 1.9.24
+ 0.10.5
+ 11
+ 11
+ 3.1.1
+
protocw-checker
com.freenow.sauron.plugins.SauronPlugin
freenow
- 1.3.72
- 0.10.5
- 11
- 11
- 2.5.3
scm:git:git@github.com:freenowtech/sauron.git
@@ -87,7 +90,7 @@
com.fasterxml.jackson.module
jackson-module-kotlin
- 2.10.4
+ 2.11.2
org.jetbrains.kotlin
@@ -95,15 +98,9 @@
${kotlin.version}
- io.github.microutils
- kotlin-logging
- 1.6.26
-
-
- slf4j-api
- org.slf4j
-
-
+ io.github.oshai
+ kotlin-logging-jvm
+ 7.0.0
@@ -119,7 +116,6 @@
4.13.1
test
-
org.mockito
mockito-core
@@ -140,11 +136,18 @@
compile
- compile
+ process-sources
compile
+
+ test-compile
+ test-compile
+
+ test-compile
+
+
kapt
@@ -158,9 +161,9 @@
- 1.8
+ ${maven.compiler.target}
-java-parameters
- -Xinline-classes
+ -Xjsr305=strict
spring
@@ -188,7 +191,6 @@
${plugin.dependencies}
- ${project.build.finalName}
jar-with-dependencies
@@ -208,6 +210,7 @@
org.apache.maven.plugins
maven-compiler-plugin
+ 3.13.0
compile
@@ -252,7 +255,7 @@
org.apache.maven.plugins
maven-source-plugin
- 3.2.1
+ 3.3.1
attach-sources
@@ -266,7 +269,7 @@
org.jetbrains.dokka
dokka-maven-plugin
- 1.4.30
+ 1.9.20
package
@@ -280,7 +283,7 @@
org.jetbrains.dokka
kotlin-as-java-plugin
- 1.4.30
+ 1.9.20
diff --git a/plugins/protocw-checker/src/main/kotlin/com/freenow/sauron/plugins/ProtocwChecker.kt b/plugins/protocw-checker/src/main/kotlin/com/freenow/sauron/plugins/ProtocwChecker.kt
index 973f123..3745967 100644
--- a/plugins/protocw-checker/src/main/kotlin/com/freenow/sauron/plugins/ProtocwChecker.kt
+++ b/plugins/protocw-checker/src/main/kotlin/com/freenow/sauron/plugins/ProtocwChecker.kt
@@ -1,19 +1,18 @@
package com.freenow.sauron.plugins
import com.freenow.sauron.model.DataSet
-import com.freenow.sauron.plugins.SauronExtension
import com.freenow.sauron.plugins.protocw.Checker
import com.freenow.sauron.plugins.protocw.DefaultChecker
import com.freenow.sauron.plugins.protocw.DefaultService
import com.freenow.sauron.plugins.protocw.DefaultValidator
import com.freenow.sauron.properties.PluginsConfigurationProperties
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
import org.pf4j.Extension
@Extension
class ProtocwChecker(
private val checker: Checker = DefaultChecker(DefaultService(), DefaultValidator())
-) : SauronExtension, KLogging() {
+) : SauronExtension {
override fun apply(properties: PluginsConfigurationProperties, input: DataSet): DataSet {
checker.apply(
@@ -32,6 +31,7 @@ class ProtocwChecker(
}
companion object {
+ private val logger = KotlinLogging.logger {}
const val PROP_PROTOC_FILE_NAME = "protocw-file-name"
const val PROP_PROTOCW_PROPERTIRES_FILE_NAME = "protocw-properties-file-name"
diff --git a/plugins/protocw-checker/src/main/kotlin/com/freenow/sauron/plugins/protocw/DefaultService.kt b/plugins/protocw-checker/src/main/kotlin/com/freenow/sauron/plugins/protocw/DefaultService.kt
index 3a411ef..a42b7d9 100644
--- a/plugins/protocw-checker/src/main/kotlin/com/freenow/sauron/plugins/protocw/DefaultService.kt
+++ b/plugins/protocw-checker/src/main/kotlin/com/freenow/sauron/plugins/protocw/DefaultService.kt
@@ -23,5 +23,4 @@ class DefaultService : Service {
return "malformed_version"
}
}
-
-}
+}
\ No newline at end of file
diff --git a/plugins/protocw-checker/src/main/kotlin/com/freenow/sauron/plugins/protocw/DefaultValidator.kt b/plugins/protocw-checker/src/main/kotlin/com/freenow/sauron/plugins/protocw/DefaultValidator.kt
index 499f73c..7b54737 100644
--- a/plugins/protocw-checker/src/main/kotlin/com/freenow/sauron/plugins/protocw/DefaultValidator.kt
+++ b/plugins/protocw-checker/src/main/kotlin/com/freenow/sauron/plugins/protocw/DefaultValidator.kt
@@ -9,13 +9,13 @@ class DefaultValidator : Validator {
override fun check(repository: Path): Either {
return Either.fx {
- !checkRepositorExists(repository)
+ !checkRepositoryExists(repository)
!checkNeedsProtoc(repository)
Unit
}
}
- private fun checkRepositorExists(repository: Path): Either {
+ private fun checkRepositoryExists(repository: Path): Either {
return Either.cond(Files.isDirectory(repository),
{ Unit },
{ "Repository is not a directory" }
@@ -36,5 +36,4 @@ class DefaultValidator : Validator {
)
}
}
-
}
diff --git a/plugins/protocw-checker/src/main/kotlin/com/freenow/sauron/plugins/protocw/Validator.kt b/plugins/protocw-checker/src/main/kotlin/com/freenow/sauron/plugins/protocw/Validator.kt
index 74c2584..78ca03d 100644
--- a/plugins/protocw-checker/src/main/kotlin/com/freenow/sauron/plugins/protocw/Validator.kt
+++ b/plugins/protocw-checker/src/main/kotlin/com/freenow/sauron/plugins/protocw/Validator.kt
@@ -5,5 +5,4 @@ import java.nio.file.Path
interface Validator {
fun check(repository: Path): Either
-
}
diff --git a/sauron-service/.sdkmanrc b/sauron-service/.sdkmanrc
new file mode 100644
index 0000000..03a43a2
--- /dev/null
+++ b/sauron-service/.sdkmanrc
@@ -0,0 +1,3 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=11.0.24-zulu