diff options
author | Kristóf Marussy <kristof@marussy.com> | 2021-12-14 01:55:57 +0100 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2021-12-14 02:14:23 +0100 |
commit | 3a649c5adc1c0e6a923d99e065c42c39bf5513b9 (patch) | |
tree | 5689c7b1cdbf0045ffcd8e90c637cdc33299e31e | |
parent | docs: use eclipse 2021-12 (diff) | |
download | refinery-3a649c5adc1c0e6a923d99e065c42c39bf5513b9.tar.gz refinery-3a649c5adc1c0e6a923d99e065c42c39bf5513b9.tar.zst refinery-3a649c5adc1c0e6a923d99e065c42c39bf5513b9.zip |
build: make sure slf4j is used instead of log4j
-rw-r--r-- | gradle/libs.versions.toml | 1 | ||||
-rw-r--r-- | 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 | |||
30 | mwe-utils = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe.utils", version = "1.6.2.M1" } | 30 | mwe-utils = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe.utils", version = "1.6.2.M1" } |
31 | mwe2-launch = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.launch", version.ref = "mwe2" } | 31 | mwe2-launch = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.launch", version.ref = "mwe2" } |
32 | mwe2-lib = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.lib", version.ref = "mwe2" } | 32 | mwe2-lib = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.lib", version.ref = "mwe2" } |
33 | slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" } | ||
33 | slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" } | 34 | slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" } |
34 | slf4j-log4j = { group = "org.slf4j", name = "log4j-over-slf4j", version.ref = "slf4j" } | 35 | slf4j-log4j = { group = "org.slf4j", name = "log4j-over-slf4j", version.ref = "slf4j" } |
35 | viatra = { group = "org.eclipse.viatra", name = "viatra-query-runtime", version = "2.6.0" } | 36 | 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 { | |||
8 | canBeConsumed = false | 8 | canBeConsumed = false |
9 | canBeResolved = true | 9 | canBeResolved = true |
10 | } | 10 | } |
11 | |||
12 | all { | ||
13 | // Use log4j-over-slf4j instead of log4j 1.x | ||
14 | exclude group: 'log4j', module: 'log4j' | ||
15 | } | ||
11 | } | 16 | } |
12 | 17 | ||
13 | dependencies { | 18 | dependencies { |
14 | implementation project(':refinery-language') | 19 | implementation project(':refinery-language') |
15 | implementation project(':refinery-language-ide') | 20 | implementation project(':refinery-language-ide') |
16 | implementation libs.xtend.lib | ||
17 | implementation libs.xtext.web | ||
18 | implementation libs.jetty.server | 21 | implementation libs.jetty.server |
19 | implementation libs.jetty.servlet | 22 | implementation libs.jetty.servlet |
20 | implementation libs.jetty.websocket.server | 23 | implementation libs.jetty.websocket.server |
24 | implementation libs.slf4j.api | ||
21 | implementation libs.slf4j.simple | 25 | implementation libs.slf4j.simple |
22 | implementation libs.slf4j.log4j | 26 | implementation libs.slf4j.log4j |
27 | implementation libs.xtend.lib | ||
28 | implementation libs.xtext.web | ||
23 | webapp project(path: ':refinery-frontend', configuration: 'productionAssets') | 29 | webapp project(path: ':refinery-frontend', configuration: 'productionAssets') |
24 | testImplementation testFixtures(project(':refinery-language')) | 30 | testImplementation testFixtures(project(':refinery-language')) |
25 | testImplementation libs.jetty.websocket.client | 31 | testImplementation libs.jetty.websocket.client |