aboutsummaryrefslogtreecommitdiffstats
path: root/subprojects
diff options
context:
space:
mode:
authorLibravatar Kristóf Marussy <kristof@marussy.com>2023-04-08 23:22:02 +0200
committerLibravatar Kristóf Marussy <kristof@marussy.com>2023-04-08 23:22:02 +0200
commit9c327a95dfa844f22f21fe99a8b45cace36567df (patch)
tree38841b46d86e184d9714a80e8a5fb8c650346e44 /subprojects
parentchore(deps): bump dependencies (diff)
downloadrefinery-9c327a95dfa844f22f21fe99a8b45cace36567df.tar.gz
refinery-9c327a95dfa844f22f21fe99a8b45cace36567df.tar.zst
refinery-9c327a95dfa844f22f21fe99a8b45cace36567df.zip
build: always prefer slf4j instead of log4j 1.x
Make sure we get slf4j in every test source set and every application by default. Saves configuration effort when creating a new library that tests VIATRA or other dependencies that require log4j.
Diffstat (limited to 'subprojects')
-rw-r--r--subprojects/language-web/build.gradle.kts7
-rw-r--r--subprojects/store-query-viatra/build.gradle.kts7
2 files changed, 0 insertions, 14 deletions
diff --git a/subprojects/language-web/build.gradle.kts b/subprojects/language-web/build.gradle.kts
index c68daa9a..b78a0d66 100644
--- a/subprojects/language-web/build.gradle.kts
+++ b/subprojects/language-web/build.gradle.kts
@@ -8,11 +8,6 @@ val webapp: Configuration by configurations.creating {
8 isCanBeResolved = true 8 isCanBeResolved = true
9} 9}
10 10
11configurations.all {
12 // Use log4j-over-slf4j instead of log4j 1.x
13 exclude(group = "log4j", module = "log4j")
14}
15
16dependencies { 11dependencies {
17 implementation(project(":refinery-language")) 12 implementation(project(":refinery-language"))
18 implementation(project(":refinery-language-ide")) 13 implementation(project(":refinery-language-ide"))
@@ -20,8 +15,6 @@ dependencies {
20 implementation(libs.jetty.servlet) 15 implementation(libs.jetty.servlet)
21 implementation(libs.jetty.websocket.server) 16 implementation(libs.jetty.websocket.server)
22 implementation(libs.slf4j.api) 17 implementation(libs.slf4j.api)
23 implementation(libs.slf4j.simple)
24 implementation(libs.slf4j.log4j)
25 implementation(libs.xtext.web) 18 implementation(libs.xtext.web)
26 webapp(project(path = ":refinery-frontend", configuration = "productionAssets")) 19 webapp(project(path = ":refinery-frontend", configuration = "productionAssets"))
27 testImplementation(testFixtures(project(":refinery-language"))) 20 testImplementation(testFixtures(project(":refinery-language")))
diff --git a/subprojects/store-query-viatra/build.gradle.kts b/subprojects/store-query-viatra/build.gradle.kts
index d7a37f11..7451dd83 100644
--- a/subprojects/store-query-viatra/build.gradle.kts
+++ b/subprojects/store-query-viatra/build.gradle.kts
@@ -2,15 +2,8 @@ plugins {
2 id("refinery-java-library") 2 id("refinery-java-library")
3} 3}
4 4
5configurations.testRuntimeClasspath {
6 // VIATRA requires log4j 1.x, but we use log4j-over-slf4j instead
7 exclude(group = "log4j", module = "log4j")
8}
9
10dependencies { 5dependencies {
11 implementation(libs.ecore) 6 implementation(libs.ecore)
12 api(libs.viatra) 7 api(libs.viatra)
13 api(project(":refinery-store-query")) 8 api(project(":refinery-store-query"))
14 testImplementation(libs.slf4j.simple)
15 testImplementation(libs.slf4j.log4j)
16} 9}