Update dependencies

hexagontk · Feb 28, 2024 · 63403f7 · 63403f7
1 parent 5143251
commit 63403f7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,9 +10,10 @@ plugins {
 
 val os = getProperty("os.name").lowercase()
 
-val hexagonVersion = "3.4.7"
+val hexagonVersion = "3.5.0"
 val hexagonExtraVersion = "3.4.6"
 val vertxVersion = "4.5.3"
+val slf4jVersion = "2.0.12"
 
 val gradleScripts = "https://raw.githubusercontent.com/hexagonkt/hexagon/$hexagonVersion/gradle"
 
@@ -34,7 +35,6 @@ if (current() !in setOf(VERSION_17, VERSION_18, VERSION_19, VERSION_20, VERSION_
 
 dependencies {
     "implementation"("com.hexagonkt:http_server_netty:$hexagonVersion")
-    "implementation"("com.hexagonkt:logging_slf4j_jul:$hexagonVersion")
     "implementation"("com.hexagonkt:serialization_jackson_json:$hexagonVersion")
     "implementation"("com.hexagonkt:serialization_jackson_yaml:$hexagonVersion")
     "implementation"("com.hexagonkt:serialization_jackson_toml:$hexagonVersion")
@@ -43,6 +43,9 @@ dependencies {
     "implementation"("com.hexagonkt.extra:args:$hexagonExtraVersion")
 
     "implementation"("io.vertx:vertx-json-schema:$vertxVersion")
+    "implementation"("org.slf4j:log4j-over-slf4j:$slf4jVersion")
+    "implementation"("org.slf4j:jcl-over-slf4j:$slf4jVersion")
+    "implementation"("org.slf4j:slf4j-jdk14:$slf4jVersion")
 
     "testImplementation"("com.hexagonkt:http_client_jetty:$hexagonVersion")
 }

diff --git a/src/main/kotlin/Cv.kt b/src/main/kotlin/Cv.kt
@@ -4,7 +4,6 @@ import com.hexagonkt.args.*
 import com.hexagonkt.args.Property.Companion.HELP
 import com.hexagonkt.args.Property.Companion.VERSION
 import com.hexagonkt.core.*
-import com.hexagonkt.core.logging.LoggingManager
 import com.hexagonkt.core.logging.logger
 import com.hexagonkt.core.media.mediaTypeOfOrNull
 import com.hexagonkt.core.CodedException
@@ -19,7 +18,6 @@ import com.hexagonkt.http.server.HttpServerSettings
 import com.hexagonkt.http.server.callbacks.UrlCallback
 import com.hexagonkt.http.server.netty.NettyServerAdapter
 import com.hexagonkt.http.server.serve
-import com.hexagonkt.logging.jul.JulLoggingAdapter
 import com.hexagonkt.serialization.SerializationManager
 import com.hexagonkt.serialization.jackson.json.Json
 import com.hexagonkt.serialization.jackson.toml.Toml
@@ -41,6 +39,7 @@ import java.net.InetAddress
 import java.net.URI
 import java.net.URL
 import java.nio.file.Path
+import java.util.logging.LogManager
 import kotlin.system.exitProcess
 
 const val preventExitFlag: String = "PREVENT_EXIT"
@@ -76,9 +75,10 @@ fun main(vararg args: String) {
     try {
         val buildProperties = properties(urlOf(buildProperties))
         val project = buildProperties.require("project")
+        val loggingConfiguration = urlOf("classpath:logging.properties")
 
-        LoggingManager.adapter = JulLoggingAdapter(messageOnly = true, stream = System.err)
-        LoggingManager.defaultLoggerName = project
+        System.setProperty("hexagonkt_logging_logger_name", project)
+        LogManager.getLogManager().readConfiguration(loggingConfiguration.openStream())
         SerializationManager.formats = linkedSetOf(Yaml, Json, Toml)
 
         val program = createProgram(buildProperties)

diff --git a/src/main/resources/logging.properties b/src/main/resources/logging.properties
@@ -0,0 +1,9 @@
+
+handlers=java.util.logging.ConsoleHandler
+java.util.logging.ConsoleHandler.level=ALL
+java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+java.util.logging.SimpleFormatter.format=%6$s%n
+
+.level=INFO
+
+com.hexagonkt.level=INFO