From 3a649c5adc1c0e6a923d99e065c42c39bf5513b9 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Tue, 14 Dec 2021 01:55:57 +0100 Subject: build: make sure slf4j is used instead of log4j --- gradle/libs.versions.toml | 1 + subprojects/language-web/build.gradle | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fbc71bdc..c0372cad 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,6 +30,7 @@ mockito-junit = { group = "org.mockito", name = "mockito-junit-jupiter", version mwe-utils = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe.utils", version = "1.6.2.M1" } mwe2-launch = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.launch", version.ref = "mwe2" } mwe2-lib = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.lib", version.ref = "mwe2" } +slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" } slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" } slf4j-log4j = { group = "org.slf4j", name = "log4j-over-slf4j", version.ref = "slf4j" } viatra = { group = "org.eclipse.viatra", name = "viatra-query-runtime", version = "2.6.0" } diff --git a/subprojects/language-web/build.gradle b/subprojects/language-web/build.gradle index 6be4d5e8..a1d4753a 100644 --- a/subprojects/language-web/build.gradle +++ b/subprojects/language-web/build.gradle @@ -8,18 +8,24 @@ configurations { canBeConsumed = false canBeResolved = true } + + all { + // Use log4j-over-slf4j instead of log4j 1.x + exclude group: 'log4j', module: 'log4j' + } } dependencies { implementation project(':refinery-language') implementation project(':refinery-language-ide') - implementation libs.xtend.lib - implementation libs.xtext.web implementation libs.jetty.server implementation libs.jetty.servlet implementation libs.jetty.websocket.server + implementation libs.slf4j.api implementation libs.slf4j.simple implementation libs.slf4j.log4j + implementation libs.xtend.lib + implementation libs.xtext.web webapp project(path: ':refinery-frontend', configuration: 'productionAssets') testImplementation testFixtures(project(':refinery-language')) testImplementation libs.jetty.websocket.client -- cgit v1.2.3-54-g00ecf