diff --git a/admin/conf/logback.xml b/admin/conf/logback.xml index 45418df2aa30..ce08bf16805c 100644 --- a/admin/conf/logback.xml +++ b/admin/conf/logback.xml @@ -30,7 +30,13 @@ - + + + + + + + diff --git a/applications/conf/logback.xml b/applications/conf/logback.xml index 73674b3d957e..2631c29502ff 100644 --- a/applications/conf/logback.xml +++ b/applications/conf/logback.xml @@ -25,7 +25,13 @@ - + + + + + + + diff --git a/archive/conf/logback.xml b/archive/conf/logback.xml index 34e52a438775..f8569dd5e112 100644 --- a/archive/conf/logback.xml +++ b/archive/conf/logback.xml @@ -25,7 +25,13 @@ - + + + + + + + diff --git a/article/conf/logback.xml b/article/conf/logback.xml index befc7af7839f..d97caedccc1b 100644 --- a/article/conf/logback.xml +++ b/article/conf/logback.xml @@ -25,7 +25,13 @@ - + + + + + + + diff --git a/build.sbt b/build.sbt index afc1bac4d019..fea5bd9fe35a 100644 --- a/build.sbt +++ b/build.sbt @@ -70,6 +70,7 @@ val common = library("common") pekkoSlf4j, pekkoSerializationJackson, pekkoActorTyped, + janino, ) ++ jackson, TestAssets / mappings ~= filterAssets, ) diff --git a/commercial/conf/logback.xml b/commercial/conf/logback.xml index 044b5cfe3559..63dfc3ec7e73 100644 --- a/commercial/conf/logback.xml +++ b/commercial/conf/logback.xml @@ -25,7 +25,13 @@ - + + + + + + + diff --git a/common/test/resources/logback.xml b/common/test/resources/logback.xml index 03c2e50630e4..2c8848d0524e 100644 --- a/common/test/resources/logback.xml +++ b/common/test/resources/logback.xml @@ -25,7 +25,13 @@ - + + + + + + + diff --git a/dev-build/conf/logback.xml b/dev-build/conf/logback.xml index 34fad1454363..cb86de9b9c3a 100644 --- a/dev-build/conf/logback.xml +++ b/dev-build/conf/logback.xml @@ -29,7 +29,13 @@ - + + + + + + + diff --git a/discussion/conf/logback.xml b/discussion/conf/logback.xml index f22cc96f287f..627925dab0ad 100644 --- a/discussion/conf/logback.xml +++ b/discussion/conf/logback.xml @@ -25,7 +25,13 @@ - + + + + + + + diff --git a/facia-press/conf/logback.xml b/facia-press/conf/logback.xml index 19e1eadccec1..10d19e003049 100644 --- a/facia-press/conf/logback.xml +++ b/facia-press/conf/logback.xml @@ -25,7 +25,13 @@ - + + + + + + + diff --git a/facia/conf/logback.xml b/facia/conf/logback.xml index 213c43784143..07d73510602c 100644 --- a/facia/conf/logback.xml +++ b/facia/conf/logback.xml @@ -25,7 +25,13 @@ - + + + + + + + diff --git a/identity/conf/logback.xml b/identity/conf/logback.xml index 35795d61ae60..937dec8f9b93 100644 --- a/identity/conf/logback.xml +++ b/identity/conf/logback.xml @@ -29,6 +29,12 @@ - + + + + + + + diff --git a/onward/conf/logback.xml b/onward/conf/logback.xml index 95974d06e781..80bfbd32b7ed 100644 --- a/onward/conf/logback.xml +++ b/onward/conf/logback.xml @@ -25,7 +25,13 @@ - + + + + + + + diff --git a/preview/conf/logback.xml b/preview/conf/logback.xml index ce692fbc7dd2..acf142222892 100644 --- a/preview/conf/logback.xml +++ b/preview/conf/logback.xml @@ -25,7 +25,13 @@ - + + + + + + + diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8283800dfafe..4e085fd83f2c 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -88,6 +88,7 @@ object Dependencies { val logstash = ("net.logstash.logback" % "logstash-logback-encoder" % "8.0") .excludeAll(ExclusionRule("com.fasterxml.jackson.core")) // Avoid conflicts with Play's Jackson dependency + val janino = "org.codehaus.janino" % "janino" % "3.1.12" val targetingClient = "com.gu.targeting-client" %% "client-play-json-v30" % "1.1.9" val scanamo = "org.scanamo" %% "scanamo" % "2.0.0" diff --git a/rss/conf/logback.xml b/rss/conf/logback.xml index 223af294c625..2435e9168caa 100644 --- a/rss/conf/logback.xml +++ b/rss/conf/logback.xml @@ -25,7 +25,13 @@ - + + + + + + + diff --git a/sbt b/sbt index 6dc1c59a539d..fc9cbbfa7ead 100755 --- a/sbt +++ b/sbt @@ -59,4 +59,5 @@ export APP_SECRET="this_is_not_a_real_secret_just_for_tests" java $FRONTEND_JVM_ARGS \ $DEBUG_PARAMS \ -Duser.timezone=Australia/Sydney \ + -DSTAGE=DEV \ -jar `dirname $0`/bin/sbt-launch.jar "$@" diff --git a/sport/conf/logback.xml b/sport/conf/logback.xml index 90bcb69fdf0f..d1b9a048be1b 100644 --- a/sport/conf/logback.xml +++ b/sport/conf/logback.xml @@ -25,7 +25,13 @@ - + + + + + + +