ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-22 18:12:53 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

DEVOPS-764 - Jolokia dependency is incorrectly specified and removed in master (#3380)

Browse Source 
* DEVOPS-764 - Jolokia dependency is incorrectly specified and removed in master.

* Backported more changes.
This commit is contained in:
Clinton 2018-08-30 16:02:24 +01:00 committed by Katelyn Baker
parent 80c6c46d6f
commit ac694e3023
2 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webserver/build.gradle
View File

@ -38,7 +38,6 @@ dependencies {
compile "org.eclipse.jetty:jetty-servlet:$jetty_version" compile "org.eclipse.jetty:jetty-servlet:$jetty_version"
compile "org.eclipse.jetty:jetty-webapp:$jetty_version" compile "org.eclipse.jetty:jetty-webapp:$jetty_version"
compile "javax.servlet:javax.servlet-api:3.1.0" compile "javax.servlet:javax.servlet-api:3.1.0"
compile "org.jolokia:jolokia-war:$jolokia_version"
compile "commons-fileupload:commons-fileupload:$fileupload_version" compile "commons-fileupload:commons-fileupload:$fileupload_version"
// Log4J: logging framework (with SLF4J bindings) // Log4J: logging framework (with SLF4J bindings)

40
webserver/src/main/kotlin/net/corda/webserver/JolokiaSlf4Adapter.kt
View File

@ -1,40 +0,0 @@
package net.corda.webserver
import org.jolokia.util.LogHandler
import org.slf4j.Logger
import org.slf4j.LoggerFactory
/**
* This also exists in node, because depends on jolokia
**/
class JolokiaSlf4Adapter : LogHandler {
companion object {
val log: Logger = LoggerFactory.getLogger("org.jolokia")
}
override fun error(message: String?, t: Throwable?) {
if (message != null) {
if (t != null) {
log.error(message, t)
} else {
log.error(message)
}
} else if (t != null) {
log.error("Exception without a comment", t)
}
}
override fun debug(message: String?) {
if (message != null) {
log.debug(message)
}
}
override fun info(message: String?) {
if (message != null) {
log.info(message)
}
}
}