From 7ba7739d3de6fbb8a1bc2f27cd787f74610ec580 Mon Sep 17 00:00:00 2001
From: Lindsey Dew <1202622+lindseydew@users.noreply.github.com>
Date: Wed, 24 Apr 2024 16:01:46 +0100
Subject: [PATCH] Use simple logger
---
build.sbt | 8 +-------
common/src/main/scala/com/gu/sfl/Logging.scala | 5 +++--
.../src/main/resources/log4j2.xml | 15 ---------------
.../src/main/resources/simplelogger.properties | 0
.../src/main/resources/log4j2.xml | 15 ---------------
.../src/main/resources/simplelogger.properties | 0
.../scala/com/gu/sfl/lambda/AwsLambdaSpec.scala | 2 +-
project/dependencies.scala | 2 ++
8 files changed, 7 insertions(+), 40 deletions(-)
delete mode 100644 mobile-save-for-later-user-deletion/src/main/resources/log4j2.xml
create mode 100644 mobile-save-for-later-user-deletion/src/main/resources/simplelogger.properties
delete mode 100644 mobile-save-for-later/src/main/resources/log4j2.xml
create mode 100644 mobile-save-for-later/src/main/resources/simplelogger.properties
diff --git a/build.sbt b/build.sbt
index 1103f923..f3a20bbd 100644
--- a/build.sbt
+++ b/build.sbt
@@ -40,10 +40,10 @@ val commonSettings: immutable.Seq[Def.Setting[_]] = List(
jackson,
jacksonDataFormat,
jacksonJsrDataType,
- log4j,
commonsIo,
scanamo,
okHttp,
+ slf4jSimple,
identityAuthCore,
specsCore,
specsScalaCheck,
@@ -54,12 +54,6 @@ val commonSettings: immutable.Seq[Def.Setting[_]] = List(
case PathList(ps @ _*) if ps.last equalsIgnoreCase "Log4j2Plugins.dat" => sbtassembly.Log4j2MergeStrategy.plugincache
case _ => MergeStrategy.first
},
- dependencyOverrides ++= Seq(
- commonsLogging,
- slf4jApi,
- apacheLog4JCore,
- apacheLog$jApi
- ),
organization := "com.gu",
version := "1.0",
scalaVersion := "2.12.19",
diff --git a/common/src/main/scala/com/gu/sfl/Logging.scala b/common/src/main/scala/com/gu/sfl/Logging.scala
index 98b1654e..e6f0a759 100644
--- a/common/src/main/scala/com/gu/sfl/Logging.scala
+++ b/common/src/main/scala/com/gu/sfl/Logging.scala
@@ -1,11 +1,12 @@
package com.gu.sfl
-import org.apache.logging.log4j.LogManager
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
import scala.util.{Failure, Success, Try}
trait Logging {
- val logger = LogManager.getLogger(this.getClass.getName)
+ val logger: Logger = LoggerFactory.getLogger(this.getClass)
def logOnThrown[T](function: () => T, messageOnError: String = ""): T = Try(function()) match {
case Success(value) => value
diff --git a/mobile-save-for-later-user-deletion/src/main/resources/log4j2.xml b/mobile-save-for-later-user-deletion/src/main/resources/log4j2.xml
deleted file mode 100644
index c31e90b0..00000000
--- a/mobile-save-for-later-user-deletion/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
- %d{yyyy-MM-dd HH:mm:ss} [%t] %X{AWSRequestId} %-5p %c{1}:%L - %m%n
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mobile-save-for-later-user-deletion/src/main/resources/simplelogger.properties b/mobile-save-for-later-user-deletion/src/main/resources/simplelogger.properties
new file mode 100644
index 00000000..e69de29b
diff --git a/mobile-save-for-later/src/main/resources/log4j2.xml b/mobile-save-for-later/src/main/resources/log4j2.xml
deleted file mode 100644
index c31e90b0..00000000
--- a/mobile-save-for-later/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
- %d{yyyy-MM-dd HH:mm:ss} [%t] %X{AWSRequestId} %-5p %c{1}:%L - %m%n
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mobile-save-for-later/src/main/resources/simplelogger.properties b/mobile-save-for-later/src/main/resources/simplelogger.properties
new file mode 100644
index 00000000..e69de29b
diff --git a/mobile-save-for-later/src/test/scala/com/gu/sfl/lambda/AwsLambdaSpec.scala b/mobile-save-for-later/src/test/scala/com/gu/sfl/lambda/AwsLambdaSpec.scala
index 12202ca9..107f7335 100644
--- a/mobile-save-for-later/src/test/scala/com/gu/sfl/lambda/AwsLambdaSpec.scala
+++ b/mobile-save-for-later/src/test/scala/com/gu/sfl/lambda/AwsLambdaSpec.scala
@@ -3,7 +3,7 @@ package com.gu.sfl.lambda
import java.io.{ByteArrayInputStream, ByteArrayOutputStream}
-import org.apache.logging.log4j.core.Logger
+import org.slf4j.Logger
import org.specs2.mock.Mockito
import org.specs2.mutable.Specification
diff --git a/project/dependencies.scala b/project/dependencies.scala
index b1e617c3..746a7989 100644
--- a/project/dependencies.scala
+++ b/project/dependencies.scala
@@ -35,4 +35,6 @@ object Dependencies {
val slf4jApi = "org.slf4j" % "slf4j-api" % "1.7.25"
val apacheLog4JCore = "org.apache.logging.log4j" % "log4j-core" % log4j2Version
val apacheLog$jApi = "org.apache.logging.log4j" % "log4j-api" % log4j2Version % "provided"
+
+ val slf4jSimple = "org.slf4j" % "slf4j-simple" % "2.0.13"
}