diff --git a/app/resources/logback.xml b/app/resources/logback.xml index 9ede072..2df9ebc 100644 --- a/app/resources/logback.xml +++ b/app/resources/logback.xml @@ -1,6 +1,5 @@ - true %cyan(%d{YYYY-MM-dd HH:mm:ss.SSS}) [%thread] %highlight(%-5level) %green(%logger{36}) - %msg%n diff --git a/app/src/jetty/Jetty.kt b/app/src/jetty/Jetty.kt index 4d89fae..5b91387 100644 --- a/app/src/jetty/Jetty.kt +++ b/app/src/jetty/Jetty.kt @@ -11,7 +11,6 @@ import org.http4k.server.ServerConfig import org.http4k.servlet.asServlet class Jetty(private val port: Int, private val server: Server) : ServerConfig { - constructor(port: Int = 8000) : this(port, http(port)) constructor(port: Int, vararg inConnectors: ConnectorBuilder) : this( port, Server().apply { @@ -19,8 +18,8 @@ class Jetty(private val port: Int, private val server: Server) : ServerConfig { } ) - override fun toServer(httpHandler: HttpHandler): Http4kServer { - server.insertHandler(httpHandler.toJettyHandler()) + override fun toServer(http: HttpHandler): Http4kServer { + server.insertHandler(http.toJettyHandler()) return object : Http4kServer { override fun start(): Http4kServer = apply { @@ -39,5 +38,3 @@ fun HttpHandler.toJettyHandler() = ServletContextHandler(SESSIONS).apply { } typealias ConnectorBuilder = (Server) -> ServerConnector - -fun http(httpPort: Int): ConnectorBuilder = { server: Server -> ServerConnector(server).apply { port = httpPort } } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index db10ba1..56fcb53 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -12,8 +12,8 @@ repositories { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.20") - implementation("org.jetbrains.kotlin:kotlin-serialization:1.4.20") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30") + implementation("org.jetbrains.kotlin:kotlin-serialization:1.4.30") implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0") implementation("org.jlleitschuh.gradle:ktlint-gradle:9.4.1") implementation("com.github.ben-manes:gradle-versions-plugin:0.28.0") diff --git a/buildSrc/src/main/kotlin/be/simplenotes/Libs.kt b/buildSrc/src/main/kotlin/be/simplenotes/Libs.kt index 5873c10..c179eab 100644 --- a/buildSrc/src/main/kotlin/be/simplenotes/Libs.kt +++ b/buildSrc/src/main/kotlin/be/simplenotes/Libs.kt @@ -11,12 +11,12 @@ object Libs { } object Database { - const val flyway = "org.flywaydb:flyway-core:6.5.4" - const val hikariCP = "com.zaxxer:HikariCP:3.4.5" + const val flyway = "org.flywaydb:flyway-core:7.5.2" + const val hikariCP = "com.zaxxer:HikariCP:4.0.1" object Drivers { const val h2 = "com.h2database:h2:1.4.200" - const val mariadb = "org.mariadb.jdbc:mariadb-java-client:2.7.1" + const val mariadb = "org.mariadb.jdbc:mariadb-java-client:2.7.2" } object Ktorm { @@ -27,20 +27,20 @@ object Libs { } object Lucene { - private const val version = "8.7.0" + private const val version = "8.8.0" const val core = "org.apache.lucene:lucene-core:$version" const val analyzersCommon = "org.apache.lucene:lucene-analyzers-common:$version" const val queryParser = "org.apache.lucene:lucene-queryparser:$version" } object Http4k { - private const val version = "3.280.0" + private const val version = "4.2.0.0" const val core = "org.http4k:http4k-core:$version" const val testingHamkrest = "org.http4k:http4k-testing-hamkrest:$version" } object Jetty { - private const val version = "9.4.32.v20200930" + private const val version = "10.0.0" const val server = "org.eclipse.jetty:jetty-server:$version" const val servlet = "org.eclipse.jetty:jetty-servlet:$version" } @@ -54,39 +54,39 @@ object Libs { } object Slf4J { - const val api = "org.slf4j:slf4j-api:1.7.25" - const val logback = "ch.qos.logback:logback-classic:1.2.3" + const val api = "org.slf4j:slf4j-api:2.0.0-alpha1" + const val logback = "ch.qos.logback:logback-classic:1.3.0-alpha5" } object Mapstruct { - private const val version = "1.4.1.Final" + private const val version = "1.4.2.Final" const val core = "org.mapstruct:mapstruct:$version" const val processor = "org.mapstruct:mapstruct-processor:$version" } object Micronaut { - private const val version = "2.2.0" + private const val version = "2.3.1" const val inject = "io.micronaut:micronaut-inject:$version" const val processor = "io.micronaut:micronaut-inject-java:$version" } const val arrowCoreData = "io.arrow-kt:arrow-core-data:0.11.0" const val commonsCompress = "org.apache.commons:commons-compress:1.20" - const val javaJwt = "com.auth0:java-jwt:3.11.0" + const val javaJwt = "com.auth0:java-jwt:3.12.1" const val javaxServlet = "javax.servlet:javax.servlet-api:4.0.1" const val jbcrypt = "org.mindrot:jbcrypt:0.4" const val konform = "io.konform:konform-jvm:0.2.0" const val owaspHtmlSanitizer = "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20200713.1" - const val prettytime = "org.ocpsoft.prettytime:prettytime:4.0.6.Final" + const val prettytime = "org.ocpsoft.prettytime:prettytime:5.0.0.Final" const val snakeyaml = "org.yaml:snakeyaml:1.27" object Test { - const val assertJ = "org.assertj:assertj-core:3.18.1" + const val assertJ = "org.assertj:assertj-core:3.19.0" const val hamkrest = "com.natpryce:hamkrest:1.8.0.1" - const val junit = "org.junit.jupiter:junit-jupiter:5.7.0" - const val mockk = "io.mockk:mockk:1.10.2" + const val junit = "org.junit.jupiter:junit-jupiter:5.7.1" + const val mockk = "io.mockk:mockk:1.10.5" const val faker = "com.github.javafaker:javafaker:1.0.2" - const val mariaTestContainer = "org.testcontainers:mariadb:1.15.0" + const val mariaTestContainer = "org.testcontainers:mariadb:1.15.1" } } diff --git a/buildSrc/src/main/kotlin/be/simplenotes/java-convention.gradle.kts b/buildSrc/src/main/kotlin/be/simplenotes/java-convention.gradle.kts index 9c4679a..c1f52e2 100644 --- a/buildSrc/src/main/kotlin/be/simplenotes/java-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/be/simplenotes/java-convention.gradle.kts @@ -1,13 +1,11 @@ package be.simplenotes plugins { - java `java-library` } repositories { mavenCentral() - jcenter() maven { url = uri("https://dl.bintray.com/arrow-kt/arrow-kt/") } maven { url = uri("https://kotlin.bintray.com/kotlinx") } } diff --git a/buildSrc/src/main/kotlin/be/simplenotes/kotlin-convention.gradle.kts b/buildSrc/src/main/kotlin/be/simplenotes/kotlin-convention.gradle.kts index fbb4ba7..20ab906 100644 --- a/buildSrc/src/main/kotlin/be/simplenotes/kotlin-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/be/simplenotes/kotlin-convention.gradle.kts @@ -8,7 +8,7 @@ plugins { dependencies { implementation(kotlin("stdlib-jdk8")) - implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.4.20")) + implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.4.30")) } tasks.withType { diff --git a/buildSrc/src/main/kotlin/be/simplenotes/versions.gradle.kts b/buildSrc/src/main/kotlin/be/simplenotes/versions.gradle.kts index ea8442f..fae2790 100644 --- a/buildSrc/src/main/kotlin/be/simplenotes/versions.gradle.kts +++ b/buildSrc/src/main/kotlin/be/simplenotes/versions.gradle.kts @@ -1,7 +1,6 @@ package be.simplenotes import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask -import org.gradle.kotlin.dsl.named plugins { id("com.github.ben-manes.versions") @@ -11,7 +10,12 @@ tasks.named("dependencyUpdates").configure { resolutionStrategy { componentSelection { all { - if (candidate.module in listOf("slf4j-api", "logback-classic")) reject("Release candidate") + if ("RC" in candidate.version) reject("Release candidate") + + when { + candidate.group == "org.eclipse.jetty" && candidate.version.startsWith("11.") -> reject("javax -> jakarta") + candidate.group == "me.liuwj.ktorm" && candidate.version != "3.0.0" -> reject("SQL Case sensitivity changed") + } } } } diff --git a/config/testresources/logback.xml b/config/testresources/logback.xml index c7be3fd..e36a6ab 100644 --- a/config/testresources/logback.xml +++ b/config/testresources/logback.xml @@ -1,6 +1,5 @@ - true %cyan(%d{YYYY-MM-dd HH:mm:ss.SSS}) [%thread] %highlight(%-5level) %green(%logger{36}) - %msg%n diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 089b9f3..2a56324 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/persistance/testresources/logback.xml b/persistance/testresources/logback.xml index 380db36..74710a0 100644 --- a/persistance/testresources/logback.xml +++ b/persistance/testresources/logback.xml @@ -1,6 +1,5 @@ - true %cyan(%d{YYYY-MM-dd HH:mm:ss.SSS}) [%thread] %highlight(%-5level) %green(%logger{36}) - %msg%n