You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2023/09/29 12:20:20 UTC

[logging-log4j-scala] branch main updated (8ac6e7e -> e92cce0)

This is an automated email from the ASF dual-hosted git repository.

vy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-scala.git


    from 8ac6e7e  Merge pull request #25 from sullis/sbt170
     add 39ac9ab  Add sbt wrapper
     add a5e02d4  Switch to semantic versioning: `13.0.0-SNAPSHOT`
     add 86638c3  Simplify `build.sbt`
     add 3c019b5  Attempt to add Maven
     add b569396  Fix compilation
     add 7acdc9b  Fix license warnings
     add 1ebc938  Fix compilation of 2.10, 2.11 and 3
     add bc705bd  Add missing dependencies
     add c5f86f4  Fix `.java-version`
     new 54accc8  Switch from `sbt` to Maven
     new 66ac4a7  Fixed Scala 3 macros (#26)
     new b3ecc99  Add multiple JDKs to CI
     new b75a82e  Add auto-generated files
     new e92cce0  Fix OSGi/JPMS module names

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/ci.yml => .asf.yaml              |  52 ++--
 .editorconfig                                      |  66 +++++
 project/build.properties => .gitattributes         |  18 +-
 .github/{workflows/ci.yml => dependabot.yaml}      |  42 +--
 .github/generate-email.sh                          | 103 +++++++
 .github/workflows/build.yaml                       |  80 ++++++
 .github/workflows/merge-dependabot.yaml            |  46 +++
 .java-version                                      |   1 +
 .mvn/jvm.config                                    |   1 +
 .mvn/wrapper/maven-wrapper.jar                     | Bin 0 -> 62547 bytes
 .mvn/wrapper/maven-wrapper.properties              |  18 ++
 BUILDING.md                                        |  25 --
 CONTRIBUTING.md                                    |  19 --
 NOTICE.txt                                         |   3 +
 README.adoc                                        |  23 ++
 README.md                                          |  90 ------
 build.sbt                                          | 211 --------------
 create-distributions.sh                            |  64 -----
 log4j-api-scala_2.10/pom.xml                       | 117 ++++++++
 .../org/apache/logging/log4j/scala/Logger.scala    |   0
 .../apache/logging/log4j/scala/LoggerMacro.scala   |   0
 .../org/apache/logging/log4j/scala/Logging.scala   |   0
 .../logging/log4j/scala/LoggingContext.scala       |   0
 .../apache/logging/log4j/scala/LoggerTest.scala    |   0
 .../logging/log4j/scala/LoggingContextTest.scala   |   0
 log4j-api-scala_2.11/pom.xml                       | 108 +++++++
 .../org/apache/logging/log4j/scala/Logger.scala    |   1 +
 .../apache/logging/log4j/scala/LoggerMacro.scala   |   0
 .../org/apache/logging/log4j/scala/Logging.scala   |   1 +
 .../logging/log4j/scala/LoggingContext.scala       |   1 +
 .../apache/logging/log4j/scala/LoggerTest.scala    |   1 +
 .../logging/log4j/scala/LoggingContextTest.scala   |   1 +
 log4j-api-scala_2.12/pom.xml                       | 110 ++++++++
 .../org/apache/logging/log4j/scala/Logger.scala    |   1 +
 .../apache/logging/log4j/scala/LoggerMacro.scala   |   1 +
 .../org/apache/logging/log4j/scala/Logging.scala   |   1 +
 .../logging/log4j/scala/LoggingContext.scala       |   0
 .../apache/logging/log4j/scala/LoggerTest.scala    |   1 +
 .../logging/log4j/scala/LoggingContextTest.scala   |   1 +
 log4j-api-scala_2.13/pom.xml                       | 110 ++++++++
 .../org/apache/logging/log4j/scala/Logger.scala    |   1 +
 .../apache/logging/log4j/scala/LoggerMacro.scala   |   1 +
 .../org/apache/logging/log4j/scala/Logging.scala   |   1 +
 .../logging/log4j/scala/LoggingContext.scala       |   0
 .../apache/logging/log4j/scala/LoggerTest.scala    |   1 +
 .../logging/log4j/scala/LoggingContextTest.scala   |   1 +
 log4j-api-scala_3/pom.xml                          | 103 +++++++
 .../org/apache/logging/log4j/scala/Logger.scala    |   0
 .../apache/logging/log4j/scala/LoggerMacro.scala   |  34 +--
 .../org/apache/logging/log4j/scala/Logging.scala   |   1 +
 .../logging/log4j/scala/LoggingContext.scala       |   1 +
 .../apache/logging/log4j/scala/LoggerTest.scala    |   0
 .../logging/log4j/scala/LoggingContextTest.scala   |   1 +
 mvnw                                               | 311 +++++++++++++++++++++
 mvnw.cmd                                           | 212 ++++++++++++++
 pom.xml                                            | 259 +++++++++++++++++
 project/AsciidocPlugin.scala                       |  85 ------
 project/Dependencies.scala                         |  42 ---
 project/Distributions.scala                        |  96 -------
 project/plugins.sbt                                |  24 --
 sample/src/main/resources/log4j2.xml               |  32 ---
 .../logging/log4j/scala/sample/LoggingApp.scala    |  54 ----
 src/asciidoctor/build.adoc                         |  32 ---
 src/asciidoctor/changes.adoc                       |  55 ----
 src/asciidoctor/contributing.adoc                  |  66 -----
 src/asciidoctor/download.adoc                      |  82 ------
 src/asciidoctor/index.adoc                         |  42 ---
 src/asciidoctor/usage.adoc                         |  80 ------
 src/changelog/.13.x.x/.release-notes.adoc.ftl      |  43 +++
 src/changelog/.13.x.x/26_fix-scala-3-macros.xml    |  10 +
 src/changelog/.13.x.x/LOG4J2-3184_add-scala-3.xml  |  10 +
 src/changelog/.13.x.x/java-17.xml                  |   9 +
 src/changelog/.13.x.x/switch-to-github-actions.xml |   8 +
 src/changelog/.13.x.x/switch-to-maven.xml          |   8 +
 src/changelog/.13.x.x/switch-to-semver.xml         |   8 +
 .../update_org_apache_logging_log4j_log4j_api.xml  |   8 +
 .../update_org_apache_logging_logging_parent.xml   |  24 ++
 src/changelog/.13.x.x/use-changelog.xml            |  24 ++
 src/changelog/.changelog.adoc.ftl                  |  26 ++
 src/changelog/.index.adoc.ftl                      |  41 +++
 src/changelog/12.0/.release-notes.adoc.ftl         |  43 +++
 src/changelog/12.0/.release.xml                    |  21 ++
 src/changelog/12.0/LOG4J2-1882_migrate-to-sbt.xml  |   9 +
 src/changelog/12.0/LOG4J2-2291_add-Jenkins.xml     |   9 +
 .../12.0/LOG4J2-2293_add-license-files.xml         |   9 +
 src/changelog/12.0/LOG4J2-2294_rat-plugin.xml      |   9 +
 .../12.0/LOG4J2-2295_add-osgi-descriptor.xml       |   9 +
 src/changelog/12.0/LOG4J2-2296_add-site.xml        |   9 +
 src/changelog/12.0/LOG4J2-2298_add-changelog.xml   |   9 +
 .../LOG4J2-2303_release-distribution-script.xml    |   9 +
 src/changelog/12.0/LOG4J2-2668_add-scala-2_13.xml  |   9 +
 src/site/_constants.adoc                           |  41 +++
 src/site/_constants.tmpl.adoc                      |  41 +++
 src/site/_release-notes.adoc                       |  40 +++
 src/site/_release-notes/_12.0.adoc                 |  57 ++++
 src/site/_release-notes/_13.x.x.adoc               |  60 ++++
 src/site/index.adoc                                | 157 +++++++++++
 version.sbt                                        |   1 -
 98 files changed, 2514 insertions(+), 1181 deletions(-)
 copy .github/workflows/ci.yml => .asf.yaml (54%)
 create mode 100644 .editorconfig
 rename project/build.properties => .gitattributes (54%)
 rename .github/{workflows/ci.yml => dependabot.yaml} (54%)
 create mode 100755 .github/generate-email.sh
 create mode 100644 .github/workflows/build.yaml
 create mode 100644 .github/workflows/merge-dependabot.yaml
 create mode 100644 .java-version
 create mode 100644 .mvn/jvm.config
 create mode 100644 .mvn/wrapper/maven-wrapper.jar
 create mode 100644 .mvn/wrapper/maven-wrapper.properties
 delete mode 100644 BUILDING.md
 delete mode 100644 CONTRIBUTING.md
 create mode 100644 README.adoc
 delete mode 100644 README.md
 delete mode 100644 build.sbt
 delete mode 100755 create-distributions.sh
 create mode 100644 log4j-api-scala_2.10/pom.xml
 rename {src/main/scala-2 => log4j-api-scala_2.10/src/main/scala}/org/apache/logging/log4j/scala/Logger.scala (100%)
 rename {src/main/scala-2.10 => log4j-api-scala_2.10/src/main/scala}/org/apache/logging/log4j/scala/LoggerMacro.scala (100%)
 rename {src => log4j-api-scala_2.10/src}/main/scala/org/apache/logging/log4j/scala/Logging.scala (100%)
 copy {src/main/scala-2.12- => log4j-api-scala_2.10/src/main/scala}/org/apache/logging/log4j/scala/LoggingContext.scala (100%)
 rename {src/test/scala-2 => log4j-api-scala_2.10/src/test/scala}/org/apache/logging/log4j/scala/LoggerTest.scala (100%)
 rename {src => log4j-api-scala_2.10/src}/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala (100%)
 create mode 100644 log4j-api-scala_2.11/pom.xml
 create mode 120000 log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/Logger.scala
 rename {src/main/scala-2.11+ => log4j-api-scala_2.11/src/main/scala}/org/apache/logging/log4j/scala/LoggerMacro.scala (100%)
 create mode 120000 log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/Logging.scala
 create mode 120000 log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggingContext.scala
 create mode 120000 log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
 create mode 120000 log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala
 create mode 100644 log4j-api-scala_2.12/pom.xml
 create mode 120000 log4j-api-scala_2.12/src/main/scala/org/apache/logging/log4j/scala/Logger.scala
 create mode 120000 log4j-api-scala_2.12/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala
 create mode 120000 log4j-api-scala_2.12/src/main/scala/org/apache/logging/log4j/scala/Logging.scala
 rename {src/main/scala-2.12- => log4j-api-scala_2.12/src/main/scala}/org/apache/logging/log4j/scala/LoggingContext.scala (100%)
 create mode 120000 log4j-api-scala_2.12/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
 create mode 120000 log4j-api-scala_2.12/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala
 create mode 100644 log4j-api-scala_2.13/pom.xml
 create mode 120000 log4j-api-scala_2.13/src/main/scala/org/apache/logging/log4j/scala/Logger.scala
 create mode 120000 log4j-api-scala_2.13/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala
 create mode 120000 log4j-api-scala_2.13/src/main/scala/org/apache/logging/log4j/scala/Logging.scala
 rename {src/main/scala-2.13+ => log4j-api-scala_2.13/src/main/scala}/org/apache/logging/log4j/scala/LoggingContext.scala (100%)
 create mode 120000 log4j-api-scala_2.13/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
 create mode 120000 log4j-api-scala_2.13/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala
 create mode 100644 log4j-api-scala_3/pom.xml
 rename {src/main/scala-3 => log4j-api-scala_3/src/main/scala}/org/apache/logging/log4j/scala/Logger.scala (100%)
 rename {src/main/scala-3 => log4j-api-scala_3/src/main/scala}/org/apache/logging/log4j/scala/LoggerMacro.scala (95%)
 create mode 120000 log4j-api-scala_3/src/main/scala/org/apache/logging/log4j/scala/Logging.scala
 create mode 120000 log4j-api-scala_3/src/main/scala/org/apache/logging/log4j/scala/LoggingContext.scala
 rename {src/test/scala-3 => log4j-api-scala_3/src/test/scala}/org/apache/logging/log4j/scala/LoggerTest.scala (100%)
 create mode 120000 log4j-api-scala_3/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala
 create mode 100755 mvnw
 create mode 100644 mvnw.cmd
 create mode 100644 pom.xml
 delete mode 100644 project/AsciidocPlugin.scala
 delete mode 100644 project/Dependencies.scala
 delete mode 100644 project/Distributions.scala
 delete mode 100644 project/plugins.sbt
 delete mode 100644 sample/src/main/resources/log4j2.xml
 delete mode 100644 sample/src/main/scala/org/apache/logging/log4j/scala/sample/LoggingApp.scala
 delete mode 100644 src/asciidoctor/build.adoc
 delete mode 100644 src/asciidoctor/changes.adoc
 delete mode 100644 src/asciidoctor/contributing.adoc
 delete mode 100644 src/asciidoctor/download.adoc
 delete mode 100644 src/asciidoctor/index.adoc
 delete mode 100644 src/asciidoctor/usage.adoc
 create mode 100644 src/changelog/.13.x.x/.release-notes.adoc.ftl
 create mode 100644 src/changelog/.13.x.x/26_fix-scala-3-macros.xml
 create mode 100644 src/changelog/.13.x.x/LOG4J2-3184_add-scala-3.xml
 create mode 100644 src/changelog/.13.x.x/java-17.xml
 create mode 100644 src/changelog/.13.x.x/switch-to-github-actions.xml
 create mode 100644 src/changelog/.13.x.x/switch-to-maven.xml
 create mode 100644 src/changelog/.13.x.x/switch-to-semver.xml
 create mode 100644 src/changelog/.13.x.x/update_org_apache_logging_log4j_log4j_api.xml
 create mode 100644 src/changelog/.13.x.x/update_org_apache_logging_logging_parent.xml
 create mode 100644 src/changelog/.13.x.x/use-changelog.xml
 create mode 100644 src/changelog/.changelog.adoc.ftl
 create mode 100644 src/changelog/.index.adoc.ftl
 create mode 100644 src/changelog/12.0/.release-notes.adoc.ftl
 create mode 100644 src/changelog/12.0/.release.xml
 create mode 100644 src/changelog/12.0/LOG4J2-1882_migrate-to-sbt.xml
 create mode 100644 src/changelog/12.0/LOG4J2-2291_add-Jenkins.xml
 create mode 100644 src/changelog/12.0/LOG4J2-2293_add-license-files.xml
 create mode 100644 src/changelog/12.0/LOG4J2-2294_rat-plugin.xml
 create mode 100644 src/changelog/12.0/LOG4J2-2295_add-osgi-descriptor.xml
 create mode 100644 src/changelog/12.0/LOG4J2-2296_add-site.xml
 create mode 100644 src/changelog/12.0/LOG4J2-2298_add-changelog.xml
 create mode 100644 src/changelog/12.0/LOG4J2-2303_release-distribution-script.xml
 create mode 100644 src/changelog/12.0/LOG4J2-2668_add-scala-2_13.xml
 create mode 100644 src/site/_constants.adoc
 create mode 100644 src/site/_constants.tmpl.adoc
 create mode 100644 src/site/_release-notes.adoc
 create mode 100644 src/site/_release-notes/_12.0.adoc
 create mode 100644 src/site/_release-notes/_13.x.x.adoc
 create mode 100644 src/site/index.adoc
 delete mode 100644 version.sbt


[logging-log4j-scala] 03/05: Add multiple JDKs to CI

Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-scala.git

commit b3ecc9982429eb3702aa9dd907541b2d8c0de041
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Fri Sep 29 14:10:12 2023 +0200

    Add multiple JDKs to CI
---
 .github/workflows/build.yaml            | 11 +++++++++++
 .github/workflows/merge-dependabot.yaml |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8416f97..1bfd9e3 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -39,6 +39,10 @@ jobs:
   build:
     if: github.actor != 'dependabot[bot]'
     uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
+    with:
+      java-version: |
+        8
+        17
 
   deploy-snapshot:
     needs: build
@@ -48,6 +52,10 @@ jobs:
     secrets:
       NEXUS_USER: ${{ secrets.NEXUS_USER }}
       NEXUS_PW: ${{ secrets.NEXUS_PW }}
+    with:
+      java-version: |
+        8
+        17
 
   deploy-release:
     needs: build
@@ -67,3 +75,6 @@ jobs:
       project-id: log4j-scala
       distribution-attachment-count: 5
       site-enabled: true
+      java-version: |
+        8
+        17
diff --git a/.github/workflows/merge-dependabot.yaml b/.github/workflows/merge-dependabot.yaml
index 76a3f19..ed27e3d 100644
--- a/.github/workflows/merge-dependabot.yaml
+++ b/.github/workflows/merge-dependabot.yaml
@@ -40,3 +40,7 @@ jobs:
       pull-requests: write                                # to close the PR
     secrets:
       GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}       # to sign commits
+    with:
+      java-version: |
+        8
+        17


[logging-log4j-scala] 05/05: Fix OSGi/JPMS module names

Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-scala.git

commit e92cce087036bf8b0787d00e1f912c6b1b4435ac
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Fri Sep 29 14:20:58 2023 +0200

    Fix OSGi/JPMS module names
---
 pom.xml             | 2 --
 src/site/index.adoc | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index f956dda..066899e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,8 +123,6 @@
     <maven.compiler.target>8</maven.compiler.target>
     <maven.compiler.release>8</maven.compiler.release>
 
-    <bnd-module-name>${groupId}.api_scala</bnd-module-name>
-
     <!-- disable `maven-site-plugin`-->
     <maven.site.skip>true</maven.site.skip>
     <maven.site.deploy.skip>true</maven.site.deploy.skip>
diff --git a/src/site/index.adoc b/src/site/index.adoc
index 8d00b17..81e05e5 100644
--- a/src/site/index.adoc
+++ b/src/site/index.adoc
@@ -42,7 +42,7 @@ libraryDependencies ++= Seq(
 )
 ----
 
-Java module name and OSGi `Bundle-SymbolicName` are set to `{bnd-module-name}`.
+Java module name and OSGi `Bundle-SymbolicName` are both set to `org.apache.logging.log4j.api_scala_2_10`, `org.apache.logging.log4j.api_scala_2_11`, and so on.
 
 [#usage]
 == Usage


[logging-log4j-scala] 02/05: Fixed Scala 3 macros (#26)

Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-scala.git

commit 66ac4a718112e536a1f293bfcd5a244d1ff9e410
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Fri Sep 29 14:06:29 2023 +0200

    Fixed Scala 3 macros (#26)
---
 .../apache/logging/log4j/scala/LoggerMacro.scala   | 34 ++++++++++------------
 src/changelog/.13.x.x/26_fix-scala-3-macros.xml    | 10 +++++++
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/log4j-api-scala_3/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala b/log4j-api-scala_3/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala
index d3ec3f4..1e050e5 100644
--- a/log4j-api-scala_3/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala
+++ b/log4j-api-scala_3/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala
@@ -451,23 +451,23 @@ private object LoggerMacro {
                              args: Expr[Seq[Any]]) (using Quotes) = {
     val anyRefArgs = formatArgs(args)
     if(anyRefArgs.isEmpty)
-    '{ if ($underlying.delegate.isEnabled($level)) $underlying.logMessage($level, null, ${charSequenceExprToStringExpr(message)}, null) }
+    '{ if ($underlying.delegate.isEnabled($level)) $underlying.logMessage($level, null, $message.toString, null) }
     else if(anyRefArgs.length == 1)
-    '{ if ($underlying.delegate.isEnabled($level)) $underlying.delegate.log($level, ${charSequenceExprToStringExpr(message)}, ${anyRefArgs.head}) }
+    '{ if ($underlying.delegate.isEnabled($level)) $underlying.delegate.log($level, $message.toString, ${anyRefArgs.head}) }
     else
-    '{ if ($underlying.delegate.isEnabled($level)) $underlying.delegate.log($level, ${charSequenceExprToStringExpr(message)}, ${Expr.ofSeq(anyRefArgs)}*) }
+    '{ if ($underlying.delegate.isEnabled($level)) $underlying.delegate.log($level, $message.toString, ${Expr.ofSeq(anyRefArgs)}*) }
   }
 
   private def logMessageArgsThrowable(underlying: Expr[Logger], level: Expr[Level], message: Expr[CharSequence],
                                       args: Expr[Seq[Any]], throwable: Expr[Throwable]) (using Quotes) = {
     val anyRefArgs = formatArgs(args)
     if(anyRefArgs.isEmpty)
-    '{ if ($underlying.delegate.isEnabled($level)) $underlying.logMessage($level, null, ${charSequenceExprToStringExpr(message)}, $throwable) }
+    '{ if ($underlying.delegate.isEnabled($level)) $underlying.logMessage($level, null, $message.toString, $throwable) }
     else if(anyRefArgs.length == 1)
-    '{ if ($underlying.delegate.isEnabled($level)) $underlying.delegate.log($level, ${charSequenceExprToStringExpr(message)}, ${anyRefArgs.head}, $throwable) }
+    '{ if ($underlying.delegate.isEnabled($level)) $underlying.delegate.log($level, $message.toString, ${anyRefArgs.head}, $throwable) }
     else {
       val extendedArgs = anyRefArgs :+ throwable
-      '{ if ($underlying.delegate.isEnabled($level)) $underlying.delegate.log($level, ${charSequenceExprToStringExpr(message)}, ${Expr.ofSeq(extendedArgs)}*) }
+      '{ if ($underlying.delegate.isEnabled($level)) $underlying.delegate.log($level, $message.toString, ${Expr.ofSeq(extendedArgs)}*) }
     }
   }
 
@@ -475,28 +475,28 @@ private object LoggerMacro {
                                    args: Expr[Seq[Any]]) (using Quotes) = {
     val anyRefArgs = formatArgs(args)
     if(anyRefArgs.isEmpty)
-    '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.logMessage($level, $marker, ${charSequenceExprToStringExpr(message)}, null) }
+    '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.logMessage($level, $marker, $message.toString, null) }
     else if(anyRefArgs.length == 1)
-    '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.delegate.log($level, $marker, ${charSequenceExprToStringExpr(message)}, ${anyRefArgs.head}) }
+    '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.delegate.log($level, $marker, $message.toString, ${anyRefArgs.head}) }
     else
-    '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.delegate.log($level, $marker, ${charSequenceExprToStringExpr(message)}, ${Expr.ofSeq(anyRefArgs)}*) }
+    '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.delegate.log($level, $marker, $message.toString, ${Expr.ofSeq(anyRefArgs)}*) }
   }
 
   private def logMarkerMessageArgsThrowable(underlying: Expr[Logger], level: Expr[Level], marker: Expr[Marker],
                                             message: Expr[CharSequence], args: Expr[Seq[Any]], throwable: Expr[Throwable]) (using Quotes) = {
     val anyRefArgs = formatArgs(args)
     if(anyRefArgs.isEmpty)
-    '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.logMessage($level, $marker, ${charSequenceExprToStringExpr(message)}, $throwable) }
+    '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.logMessage($level, $marker, $message.toString, $throwable) }
     else if(anyRefArgs.length == 1)
-    '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.delegate.log($level, $marker, ${charSequenceExprToStringExpr(message)}, ${anyRefArgs.head}, $throwable) }
+    '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.delegate.log($level, $marker, $message.toString, ${anyRefArgs.head}, $throwable) }
     else {
       val extendedArgs = anyRefArgs :+ throwable
-      '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.delegate.log($level, $marker, ${charSequenceExprToStringExpr(message)}, ${Expr.ofSeq(extendedArgs)}*) }
+      '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.delegate.log($level, $marker, $message.toString, ${Expr.ofSeq(extendedArgs)}*) }
     }
   }
 
   /** Checks whether `message` is an interpolated string and transforms it into LOG4J string interpolation. */
-  private def deconstructInterpolatedMessage(message: Expr[CharSequence])(using Quotes): (Expr[String], Seq[Expr[Any]]) = {
+  private def deconstructInterpolatedMessage(message: Expr[CharSequence])(using Quotes): (Expr[CharSequence], Seq[Expr[Any]]) = {
     import quotes.reflect.*
     import util.*
 
@@ -525,9 +525,9 @@ private object LoggerMacro {
 
             (Expr(format), formatArgs)
           case _ =>
-            (charSequenceExprToStringExpr(message), Seq.empty)
+            (message, Seq.empty)
         }
-      case _ => (charSequenceExprToStringExpr(message), Seq.empty)
+      case _ => (message, Seq.empty)
     }
   }
   
@@ -549,8 +549,4 @@ private object LoggerMacro {
       case _ => Seq.empty
     }
   }
-
-  private def charSequenceExprToStringExpr(expr: Expr[CharSequence])(using Quotes): Expr[String] = expr match {
-    case '{ $cs } => Expr(cs.toString)
-  }
 }
diff --git a/src/changelog/.13.x.x/26_fix-scala-3-macros.xml b/src/changelog/.13.x.x/26_fix-scala-3-macros.xml
new file mode 100644
index 0000000..69c8946
--- /dev/null
+++ b/src/changelog/.13.x.x/26_fix-scala-3-macros.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       type="fixed">
+  <issue id="26" link="https://github.com/apache/logging-log4j-scala/pull/26"/>
+  <author id="github:Flowdalic" name="Florian Schmaus"/>
+  <author id="github:vy"/>
+  <description format="asciidoc">Fixed Scala 3 macros</description>
+</entry>


[logging-log4j-scala] 01/05: Switch from `sbt` to Maven

Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-scala.git

commit 54accc8b32b0248950c1fa1dcfbad8927ade7b12
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Fri Sep 29 13:57:23 2023 +0200

    Switch from `sbt` to Maven
---
 .github/workflows/ci.yml => .asf.yaml              |  48 +-
 .editorconfig                                      |  66 ++
 project/build.properties => .gitattributes         |  18 +-
 .github/{workflows/ci.yml => dependabot.yaml}      |  38 +-
 .github/generate-email.sh                          | 103 ++++
 .github/workflows/build.yaml                       |  69 +++
 .../workflows/{ci.yml => merge-dependabot.yaml}    |  44 +-
 BUILDING.md                                        |  25 -
 CONTRIBUTING.md                                    |  19 -
 README.adoc                                        |  23 +
 README.md                                          |  90 ---
 build.sbt                                          | 145 -----
 create-distributions.sh                            |  64 --
 log4j-api-scala_2.10/pom.xml                       |   5 +-
 log4j-api-scala_2.11/pom.xml                       |   3 +-
 log4j-api-scala_2.12/pom.xml                       |   3 +-
 log4j-api-scala_2.13/pom.xml                       |   3 +-
 log4j-api-scala_3/pom.xml                          |   3 +-
 pom.xml                                            | 116 +++-
 project/AsciidocPlugin.scala                       |  85 ---
 project/Dependencies.scala                         |  42 --
 project/Distributions.scala                        |  96 ---
 sample/src/main/resources/log4j2.xml               |  32 -
 .../logging/log4j/scala/sample/LoggingApp.scala    |  54 --
 sbt                                                | 664 ---------------------
 src/asciidoctor/build.adoc                         |  32 -
 src/asciidoctor/changes.adoc                       |  55 --
 src/asciidoctor/contributing.adoc                  |  66 --
 src/asciidoctor/download.adoc                      |  82 ---
 src/asciidoctor/index.adoc                         |  42 --
 src/asciidoctor/usage.adoc                         |  80 ---
 src/changelog/.13.x.x/.release-notes.adoc.ftl      |  43 ++
 src/changelog/.13.x.x/LOG4J2-3184_add-scala-3.xml  |  10 +
 src/changelog/.13.x.x/java-17.xml                  |   9 +
 src/changelog/.13.x.x/switch-to-github-actions.xml |   8 +
 src/changelog/.13.x.x/switch-to-maven.xml          |   8 +
 src/changelog/.13.x.x/switch-to-semver.xml         |   8 +
 .../update_org_apache_logging_log4j_log4j_api.xml  |   8 +
 .../update_org_apache_logging_logging_parent.xml   |  24 +
 src/changelog/.13.x.x/use-changelog.xml            |  24 +
 src/changelog/.changelog.adoc.ftl                  |  26 +
 src/changelog/.index.adoc.ftl                      |  41 ++
 src/changelog/12.0/.release-notes.adoc.ftl         |  43 ++
 src/changelog/12.0/.release.xml                    |  21 +
 src/changelog/12.0/LOG4J2-1882_migrate-to-sbt.xml  |   9 +
 src/changelog/12.0/LOG4J2-2291_add-Jenkins.xml     |   9 +
 .../12.0/LOG4J2-2293_add-license-files.xml         |   9 +
 src/changelog/12.0/LOG4J2-2294_rat-plugin.xml      |   9 +
 .../12.0/LOG4J2-2295_add-osgi-descriptor.xml       |   9 +
 src/changelog/12.0/LOG4J2-2296_add-site.xml        |   9 +
 src/changelog/12.0/LOG4J2-2298_add-changelog.xml   |   9 +
 .../LOG4J2-2303_release-distribution-script.xml    |   9 +
 src/changelog/12.0/LOG4J2-2668_add-scala-2_13.xml  |   9 +
 .../apache/logging/log4j/scala/LoggerMacro.scala   | 339 -----------
 .../apache/logging/log4j/scala/LoggerMacro.scala   | 339 -----------
 .../logging/log4j/scala/LoggingContext.scala       |  84 ---
 .../logging/log4j/scala/LoggingContext.scala       |  75 ---
 .../org/apache/logging/log4j/scala/Logger.scala    | 596 ------------------
 .../org/apache/logging/log4j/scala/Logger.scala    | 597 ------------------
 .../apache/logging/log4j/scala/LoggerMacro.scala   | 556 -----------------
 .../org/apache/logging/log4j/scala/Logging.scala   |  30 -
 src/site/_constants.adoc                           |  41 ++
 src/site/_constants.tmpl.adoc                      |  41 ++
 src/site/_release-notes.adoc                       |  40 ++
 src/site/_release-notes/_12.0.adoc                 |  57 ++
 src/site/_release-notes/_13.x.x.adoc               |  55 ++
 src/site/index.adoc                                | 157 +++++
 .../apache/logging/log4j/scala/LoggerTest.scala    | 555 -----------------
 .../apache/logging/log4j/scala/LoggerTest.scala    | 555 -----------------
 .../logging/log4j/scala/LoggingContextTest.scala   | 116 ----
 version.sbt                                        |  17 -
 71 files changed, 1166 insertions(+), 5653 deletions(-)

diff --git a/.github/workflows/ci.yml b/.asf.yaml
similarity index 58%
copy from .github/workflows/ci.yml
copy to .asf.yaml
index 2cfa633..2183dca 100644
--- a/.github/workflows/ci.yml
+++ b/.asf.yaml
@@ -14,31 +14,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-name: CI
 
-on:
-  pull_request:
-    branches:
-      - master
-  push:
-    branches:
-      - master
+# `.asf.yaml` documentation: https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features
 
-jobs:
-  build:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        scala: [2.10.7, 2.11.12, 2.12.15, 2.13.8, 3.0.2]
-        java: ['8', '11', '17']
-    runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK
-      uses: actions/setup-java@v3
-      with:
-        java-version: ${{ matrix.java }}
-        distribution: 'zulu'
-        cache: 'sbt'
-    - name: Build
-      run: sbt ++${{ matrix.scala }} test
+github:
+
+  description: A Scala-friendly interface to log against the Log4j API
+  homepage: https://logging.apache.org/log4j/kotlin
+  labels:
+    - apache
+    - api
+    - jvm
+    - library
+    - log4j
+    - log4j2
+    - logging
+    - logger
+    - scala
+
+  features:
+    issues: true
+
+  protected_branches:
+    main:
+      required_signatures: true
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..6c3d154
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,66 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Configuration here must match the one for Spotless in `pom.xml`!
+
+root = true
+
+[*]
+indent_size = 4
+ij_continuation_indent_size = 8
+indent_style = space
+trim_trailing_whitespace = true
+
+# `ij_any_use_relative_indents = true` is deliberately left out since it messes up the indentation in ternary operator usages
+
+# Split some things over multiple lines to keep lines short
+ij_any_call_parameters_wrap = on_every_item
+ij_any_method_parameters_wrap = on_every_item
+ij_any_method_call_chain_wrap = on_every_item
+
+# Don't align with the first line to avoid single-line changes having an impact in the rest of the code
+ij_any_align_multiline_parameters_in_calls = false
+ij_any_align_multiline_parameters = false
+ij_any_align_multiline_chained_methods = false
+
+# Only use `import *` when importing 5 or more
+ij_java_names_count_to_use_import_on_demand = 5
+ij_java_class_count_to_use_import_on_demand = 5
+
+# Order imports
+# `*` denotes any packages except explicitly specified ones
+# `|` denotes a blank line
+# `$` denotes the prefix for static packages
+# `**` means including subpackages
+ij_java_imports_layout = java.**, |, javax.**, |, org.apache.logging.**, |, *, |, $java.**, |, $javax.**, |, $org.apache.logging.**, |, $*
+
+# Force curly braces
+ij_any_for_brace_force = always
+ij_any_if_brace_force = always
+ij_any_do_while_brace_force = always
+ij_any_while_brace_force = always
+
+# Don't align parameters and exceptions in javadoc based on the longest names to avoid single-line changes having an impact in the rest of the code
+ij_java_doc_align_param_comments = false
+ij_java_doc_align_exception_comments = false
+
+[*.{xml,xsd,properties,yml,yaml,json}]
+indent_size = 2
+
+[*.{md,adoc}]
+indent_size = 2
+ij_any_wrap_long_lines = false
+# The `no` value doesn't work in IntelliJ IDEA so a big number does the trick as well in most cases:
+max_line_length = 9999
diff --git a/project/build.properties b/.gitattributes
similarity index 54%
rename from project/build.properties
rename to .gitattributes
index 724f3e6..10914c1 100644
--- a/project/build.properties
+++ b/.gitattributes
@@ -1,18 +1,20 @@
-#
 # Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
+# contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache license, Version 2.0
+# The ASF licenses this file to you under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
+# the License.  You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the license for the specific language governing permissions and
-# limitations under the license.
-#
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-sbt.version=1.7.1
+# Checked by Spotless (LF line endings)
+*.java text eol=lf
+*.xml  text eol=lf
+*.yaml text eol=lf
+*.yml  text eol=lf
diff --git a/.github/workflows/ci.yml b/.github/dependabot.yaml
similarity index 58%
copy from .github/workflows/ci.yml
copy to .github/dependabot.yaml
index 2cfa633..72ca504 100644
--- a/.github/workflows/ci.yml
+++ b/.github/dependabot.yaml
@@ -14,31 +14,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-name: CI
 
-on:
-  pull_request:
-    branches:
-      - master
-  push:
-    branches:
-      - master
+version: 2
+updates:
 
-jobs:
-  build:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        scala: [2.10.7, 2.11.12, 2.12.15, 2.13.8, 3.0.2]
-        java: ['8', '11', '17']
-    runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK
-      uses: actions/setup-java@v3
-      with:
-        java-version: ${{ matrix.java }}
-        distribution: 'zulu'
-        cache: 'sbt'
-    - name: Build
-      run: sbt ++${{ matrix.scala }} test
+  - package-ecosystem: maven
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: weekly
diff --git a/.github/generate-email.sh b/.github/generate-email.sh
new file mode 100755
index 0000000..9702185
--- /dev/null
+++ b/.github/generate-email.sh
@@ -0,0 +1,103 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
+
+stderr() {
+    echo "$*" 1>&2
+}
+
+fail_for_invalid_args() {
+    stderr "Invalid arguments!"
+    stderr "Expected arguments: <vote|announce> <version> <commitId>"
+    exit 1
+}
+
+# Check arguments
+[ $# -ne 3 ] && fail_for_invalid_args
+
+# Constants
+PROJECT_NAME="Apache Log4j Scala"
+PROJECT_SITE="https://logging.apache.org/log4j/scala"
+PROJECT_REPO="https://github.com/apache/logging-log4j-scala"
+PROJECT_DIST_DIR="https://dist.apache.org/repos/dist/dev/logging/log4j-scala"
+PROJECT_VERSION="$2"
+COMMIT_ID="$3"
+
+# Check release notes file
+RELEASE_NOTES_FILE="$SCRIPT_DIR/../src/site/_release-notes/_$PROJECT_VERSION.adoc"
+[ -f "$RELEASE_NOTES_FILE" ] || {
+    stderr "Couldn't find release notes file: $RELEASE_NOTES_FILE"
+    exit 1
+}
+
+dump_release_notes() {
+    awk "f{print} /^Release date::/{f=1}" "$RELEASE_NOTES_FILE"
+}
+
+case $1 in
+
+vote)
+    cat <<EOF
+To: dev@logging.apache.org
+Title: [VOTE] Release $PROJECT_NAME $PROJECT_VERSION
+
+This is a vote to release the $PROJECT_NAME $PROJECT_VERSION.
+
+Source repository: $PROJECT_REPO
+Commit: $COMMIT_ID
+Distribution: $PROJECT_DIST_DIR
+Nexus: https://repository.apache.org/content/repositories/orgapachelogging-1113
+Signing key: 0x077e8893a6dcc33dd4a4d5b256e73ba9a0b592d0
+
+Please download, test, and cast your votes on this mailing list.
+
+[ ] +1, release the artifacts
+[ ] -1, don't release, because...
+
+This vote is open for 72 hours and will pass unless getting a
+net negative vote count. All votes are welcome and we encourage
+everyone to test the release, but only the Logging Services PMC
+votes are officially counted. At least 3 +1 votes and more
+positive than negative votes are required.
+
+=== Release Notes
+EOF
+    dump_release_notes
+    ;;
+
+announce)
+    cat <<EOF
+To: log4j-user@logging.apache.org, dev@logging.apache.org
+Title: [ANNOUNCE] $PROJECT_NAME $PROJECT_VERSION released
+
+${PROJECT_NAME} team is pleased to announce the $PROJECT_VERSION
+release. This project provides a Scala-friendly interface to log
+against the Log4j API. For further information (support, download,
+etc.) see the project website[1].
+
+[1] $PROJECT_SITE
+
+# Release Notes
+EOF
+    dump_release_notes
+    ;;
+
+*) fail_for_invalid_args
+
+esac
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
new file mode 100644
index 0000000..8416f97
--- /dev/null
+++ b/.github/workflows/build.yaml
@@ -0,0 +1,69 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name: build
+
+on:
+  push:
+    branches:
+      - "main"
+      - "release/*"
+    paths-ignore:
+      - "**.adoc"
+      - "**.md"
+      - "**.txt"
+  pull_request:
+    paths-ignore:
+      - "**.adoc"
+      - "**.md"
+      - "**.txt"
+
+permissions: read-all
+
+jobs:
+
+  build:
+    if: github.actor != 'dependabot[bot]'
+    uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
+
+  deploy-snapshot:
+    needs: build
+    if: github.repository == 'apache/logging-log4j-scala' && github.ref_name == 'main'
+    uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@main
+    # Secrets for deployments
+    secrets:
+      NEXUS_USER: ${{ secrets.NEXUS_USER }}
+      NEXUS_PW: ${{ secrets.NEXUS_PW }}
+
+  deploy-release:
+    needs: build
+    if: github.repository == 'apache/logging-log4j-scala' && startsWith(github.ref_name, 'release/')
+    uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@main
+    # Secrets for deployments
+    secrets:
+      GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
+      LOGGING_STAGE_DEPLOYER_USER: ${{ secrets.LOGGING_STAGE_DEPLOYER_USER }}
+      LOGGING_STAGE_DEPLOYER_PW: ${{ secrets.LOGGING_STAGE_DEPLOYER_PW }}
+      SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
+      SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
+    # Write permissions to allow the Maven `revision` property update, changelog release, etc.
+    permissions:
+      contents: write
+    with:
+      project-id: log4j-scala
+      distribution-attachment-count: 5
+      site-enabled: true
diff --git a/.github/workflows/ci.yml b/.github/workflows/merge-dependabot.yaml
similarity index 51%
rename from .github/workflows/ci.yml
rename to .github/workflows/merge-dependabot.yaml
index 2cfa633..76a3f19 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/merge-dependabot.yaml
@@ -14,31 +14,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-name: CI
+
+name: merge-dependabot
 
 on:
-  pull_request:
-    branches:
-      - master
-  push:
-    branches:
-      - master
+  pull_request_target:
+    paths-ignore:
+      - "**.adoc"
+      - "**.md"
+      - "**.txt"
+
+permissions: read-all
 
 jobs:
+
   build:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        scala: [2.10.7, 2.11.12, 2.12.15, 2.13.8, 3.0.2]
-        java: ['8', '11', '17']
-    runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK
-      uses: actions/setup-java@v3
-      with:
-        java-version: ${{ matrix.java }}
-        distribution: 'zulu'
-        cache: 'sbt'
-    - name: Build
-      run: sbt ++${{ matrix.scala }} test
+    if: github.repository == 'apache/logging-log4j-scala' && github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
+    uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
+
+  merge-dependabot:
+    needs: build
+    uses: apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@main
+    permissions:
+      contents: write                                     # to push changelog commits
+      pull-requests: write                                # to close the PR
+    secrets:
+      GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}       # to sign commits
diff --git a/BUILDING.md b/BUILDING.md
deleted file mode 100644
index 7a534a6..0000000
--- a/BUILDING.md
+++ /dev/null
@@ -1,25 +0,0 @@
-<!---
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-# Building Log4j 2 Scala API
-
-Moved to [site docs](./src/asciidoctor/build.adoc).
-
-Install [sbt](https://www.scala-sbt.org/) if you do not have it installed.
-
-Summary:
-
-    sbt "+ publishM2"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 93299c1..0000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!---
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-# Contributing to Apache Log4j 2
-
-Moved to [site docs](./src/asciidoctor/contributing.adoc).
diff --git a/README.adoc b/README.adoc
new file mode 100644
index 0000000..da3b11f
--- /dev/null
+++ b/README.adoc
@@ -0,0 +1,23 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+////
+
+https://github.com/apache/logging-log4j-scala/actions[image:https://github.com/apache/logging-log4j-scala/workflows/build/badge.svg[Actions Status]]
+https://search.maven.org/search?q=g:org.apache.logging.log4j%20a:log4j-api-scala-parent[image:https://img.shields.io/maven-central/v/org.apache.logging.log4j/log4j-api-scala-parent.svg[Maven Central]]
+https://www.apache.org/licenses/LICENSE-2.0.txt[image:https://img.shields.io/github/license/apache/logging-log4j-scala.svg[License]]
+
+Log4j Scala API provides a Scala-friendly interface to log against the https://logging.apache.org/log4j[Log4j] API.
+See https://logging.apache.org/log4j/scala[the project website] for more information.
diff --git a/README.md b/README.md
deleted file mode 100644
index ed79531..0000000
--- a/README.md
+++ /dev/null
@@ -1,90 +0,0 @@
-# [Apache Log4j 2 Scala API](http://logging.apache.org/log4j/2.x/)
-
-Log4j Scala API is a Scala logging facade based on Log4j 2. This supports
-Scala 2.10, and 2.11 on Java 7 at minimum, and Scala 2.12, 2.13 and 3.x on Java 8 at minimum. 
-Log4j Scala API provides Log4j 2 as its default logging implementation, but this is not strictly
-required (e.g., this API can also be used with Logback or other Log4j 2 API
-provider implementations). Idiomatic Scala features are provided as an
-alternative to using the Log4j 2 Java API.
-
-Note that this Scala API was versioned and released in sync with Log4j up until version 2.8.2, but from now on it will 
-be versioned and released independently, that's why the version was bumped to 11.0. 
-
-[![Jenkins Status](https://builds.apache.org/job/Log4jScala/job/master/badge/icon)](https://builds.apache.org/job/Log4jScala)
-![Build Status](https://github.com/apache/logging-log4j-scala/actions/workflows/ci.yml/badge.svg)
-
-## Usage
-
-SBT users can add the following dependencies to their `build.sbt` file:
-
-```scala
-libraryDependencies ++= Seq(
-  "org.apache.logging.log4j" %% "log4j-api-scala" % "12.1",
-  "org.apache.logging.log4j" % "log4j-api" % "2.18.0",
-  "org.apache.logging.log4j" % "log4j-core" % "2.18.0" % Runtime
-)
-```
-
-Basic usage of the API:
-
-```scala
-import org.apache.logging.log4j.scala.Logging
-import org.apache.logging.log4j.Level
- 
-class MyClass extends BaseClass with Logging {
-  def doStuff(): Unit = {
-    logger.info("Doing stuff")
-  }
-  def doStuffWithLevel(level: Level): Unit = {
-    logger(level, "Doing stuff with arbitrary level")
-  }
-  def doStuffWithUser(user: User): Unit = {
-    logger.info(s"Doing stuff with ${user.getName}.")
-  }
-}
-```
-
-## Documentation
-
-The Log4j Scala API is documented in more detail [in the Log4j 2 manual](https://logging.apache.org/log4j/2.x/manual/scala-api.html)
-and in the [ScalaDocs](https://logging.apache.org/log4j/2.x/log4j-api-scala_2.11/scaladocs/index.html#org.apache.logging.log4j.scala.package).
-
-## Requirements
-
-Log4j Scala API requires at least Java 7 for Scala 2.10/2.11, or Java 8 for
-Scala 2.12/2.13 or 3.x. This also requires Log4j 2 API, but it is specified as transitive dependencies automatically 
-if you are using SBT, Maven, Gradle, or some other similar build system. This also requires Log4j 2 Core 
-(or possibly another implementation of Log4j 2 API) as a runtime dependency. Some Log4j 2 Core features require optional
-dependencies which are documented in the [Log4j 2 manual](https://logging.apache.org/log4j/2.x/manual/index.html).
-
-## License
-
-Apache Log4j 2 is distributed under the [Apache License, version 2.0](https://www.apache.org/licenses/LICENSE-2.0.html).
-
-## Download
-
-[How to download Log4j](https://logging.apache.org/log4j/2.x/download.html),
-and [how to use it from SBT, Maven, Ivy and Gradle](https://logging.apache.org/log4j/2.x/maven-artifacts.html#Scala_API).
-You can access the latest development snapshot by using the Maven repository `https://repository.apache.org/snapshots`, 
-see [Snapshot builds](https://logging.apache.org/log4j/2.x/maven-artifacts.html#Snapshot_builds).
-
-## Issue Tracking
-
-Issues, bugs, and feature requests should be submitted to the 
-[JIRA issue tracking system for this project](https://issues.apache.org/jira/browse/LOG4J2).
-
-Pull request on GitHub are welcome, but please open a ticket in the JIRA issue tracker first, and mention the 
-JIRA issue in the Pull Request.
-
-## Building From Source
-
-Log4j Scala API requires Java 8 to build. To install to your local
-Maven repository, execute the following:
-
-```sh
-sbt "+ publishM2"
-```
-
-## Contributing
-
-We love contributions! Take a look at [our contributing page](https://github.com/apache/logging-log4j-scala/blob/master/src/asciidoctor/contributing.adoc).
diff --git a/build.sbt b/build.sbt
deleted file mode 100644
index f73b49b..0000000
--- a/build.sbt
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-
-import Dependencies._
-import com.typesafe.sbt.osgi.SbtOsgi.autoImport.OsgiKeys._
-
-lazy val metadataSettings = Seq(
-  organization := "org.apache.logging.log4j",
-  projectInfo := ModuleInfo(
-    nameFormal = "Apache Log4j Scala API",
-    description = "Scala logging API facade for Log4j",
-    homepage = Some(url("https://github.com/apache/logging-log4j-scala")),
-    startYear = Some(2016),
-    licenses = Vector("Apache License, Version 2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0.txt")),
-    organizationName = "Apache Software Foundation",
-    organizationHomepage = Some(url("https://www.apache.org/")),
-    scmInfo = Some(ScmInfo(
-      url("https://github.com/apache/logging-log4j-scala.git"),
-      "scm:git:git@github.com:apache/logging-log4j-scala.git",
-      "scm:git:git@github.com:apache/logging-log4j-scala.git"
-    )),
-    developers = Vector(
-      Developer("mikes", "Mikael Ståldal", "mikes@apache.org", null),
-      Developer("mattsicker", "Matt Sicker", "mattsicker@apache.org", null),
-      Developer("ggregory", "Gary Gregory", "ggregory@apache.org", null),
-      Developer("vy", "Volkan Yazıcı", "vy@apache.org", null)
-    )
-  ),
-  pomExtra := {
-    <parent>
-      <groupId>org.apache.logging</groupId>
-      <artifactId>logging-parent</artifactId>
-      <version>10.0.0</version>
-    </parent>
-  }
-)
-
-lazy val compileSettings = Seq(
-  scalacOptions := Seq("-feature", "-unchecked", "-deprecation"),
-  scalaVersion := scala213,
-  crossScalaVersions := Seq(scala210, scala211, scala212, scala213, scala3)
-)
-
-lazy val licensePackagingSettings =
-  for (task <- Seq(packageBin, packageSrc, packageDoc)) yield
-    Compile / task / mappings ++= Seq(
-      (baseDirectory.value / "LICENSE.txt", "META-INF/LICENSE"),
-      (baseDirectory.value / "NOTICE.txt", "META-INF/NOTICE")
-    )
-
-lazy val sourceSettings = Seq(
-    Compile / unmanagedSourceDirectories ++= {
-        (Compile / unmanagedSourceDirectories).value.flatMap { dir =>
-          CrossVersion.partialVersion(scalaVersion.value) match {
-            case Some((3, _)) => Seq(file(dir.getPath ++ "-3"))
-            case Some((2, n11)) if n11 >= 11 => Seq(file(dir.getPath ++ "-2"), file(dir.getPath ++ "-2.11+"))
-            case Some((2, n10)) if n10 <= 10 => Seq(file(dir.getPath ++ "-2"), file(dir.getPath ++ "-2.10"))
-          }
-        }
-    },
-    Compile / unmanagedSourceDirectories ++= {
-      (Compile / unmanagedSourceDirectories).value.map { dir =>
-        CrossVersion.partialVersion(scalaVersion.value) match {
-          case Some((3, _)) => file(dir.getPath ++ "-2.13+")
-          case Some((2, n13)) if n13 >= 13 => file(dir.getPath ++ "-2.13+")
-          case Some((2, n12)) if n12 <= 12 => file(dir.getPath ++ "-2.12-")
-        }
-      }
-    }
-  )
-
-lazy val testSourceSettings = Seq(
-  Test / unmanagedSourceDirectories ++= {
-    (Test / unmanagedSourceDirectories).value.map { dir =>
-      CrossVersion.partialVersion(scalaVersion.value) match {
-        case Some((3, _)) => file(dir.getPath ++ "-3")
-        case Some((2, _)) => file(dir.getPath ++ "-2")
-        case _ => sys.error(s"unexpected `scalaVersion.value`: ${scalaVersion.value}")
-      }
-    }
-  },
-  Compile / unmanagedSourceDirectories ++= {
-    (Compile / unmanagedSourceDirectories).value.map { dir =>
-      CrossVersion.partialVersion(scalaVersion.value) match {
-        case Some((3, _)) => file(dir.getPath ++ "-2.13+")
-        case Some((2, n13)) if n13 >= 13 => file(dir.getPath ++ "-2.13+")
-        case Some((2, n12)) if n12 <= 12 => file(dir.getPath ++ "-2.12-")
-      }
-    }
-  }
-)
-
-lazy val apiDependencies = Seq(
-  libraryDependencies ++= scalaReflect(scalaVersion.value).toSeq ++ Seq(
-    osgiCoreApi,
-    log4jApi,
-    log4jApiTests,
-    junit,
-    scalatest,
-    scalatestFunsuit,
-    scalatestMatcher,
-    scalatestJunit,
-    scalatestMockito,
-    mockito
-  )
-)
-
-lazy val bundleSettings = osgiSettings ++ Seq(
-  bundleSymbolicName := "org.apache.logging.log4j.scala",
-  exportPackage := Seq("org.apache.logging.log4j.scala")
-)
-
-lazy val root = (project in file("."))
-  .settings(name := "log4j-api-scala")
-  .enablePlugins(SbtOsgi)
-  .settings(metadataSettings: _*)
-  .settings(compileSettings: _*)
-  .settings(licensePackagingSettings: _*)
-  .settings(sourceSettings: _*)
-  .settings(testSourceSettings: _*)
-  .settings(apiDependencies: _*)
-  .settings(bundleSettings: _*)
-
-lazy val sample = (project in file("sample"))
-  .settings(metadataSettings: _*)
-  .settings(compileSettings: _*)
-  .settings(
-    name := "log4j-api-scala-sample",
-    libraryDependencies := Seq(log4jApi, log4jCore)
-  )
-  .dependsOn(root)
diff --git a/create-distributions.sh b/create-distributions.sh
deleted file mode 100755
index 8f9ef10..0000000
--- a/create-distributions.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-
-function sign_file() {
-  release_key=${GPG_KEYID:-748F15B2CF9BA8F024155E6ED7C92B70FA1C814D}
-  gpg --detach-sign --armor --user ${release_key} "$1"
-  shasum -a256 "$1" >"$1.sha256"
-  shasum -a512 "$1" >"$1.sha512"
-}
-
-function create_sources_from_tag() {
-  out_format=$1
-  release_version=$2
-  git archive --prefix=apache-log4j-api-scala-${release_version}-src/ -o target/apache-log4j-api-scala-${release_version}-src.${out_format} v${release_version}
-  sign_file target/apache-log4j-api-scala-${release_version}-src.${out_format}
-}
-
-function create_all_sources_from_tag() {
-  create_sources_from_tag zip $1
-  create_sources_from_tag tar.gz $1
-}
-
-function create_sources() {
-  out_format=$1
-  git archive --prefix=apache-log4j-api-scala-SNAPSHOT-src/ -o target/apache-log4j-api-scala-SNAPSHOT-src.${out_format} HEAD
-}
-
-function create_all_sources() {
-  create_sources zip
-  create_sources tar.gz
-}
-
-function create_all_binaries() {
-  ./sbt -batch "; + package; packageDistributions"
-}
-
-function create_all() {
-  create_all_sources
-  create_all_binaries
-}
-
-function main() {
-  case $1 in
-    SNAPSHOT) create_all;;
-    *) create_all_sources_from_tag $1; create_all_binaries;;
-  esac
-}
-
-tag=${1:-SNAPSHOT}
-
-main ${tag}
diff --git a/log4j-api-scala_2.10/pom.xml b/log4j-api-scala_2.10/pom.xml
index f919f05..d431f7b 100644
--- a/log4j-api-scala_2.10/pom.xml
+++ b/log4j-api-scala_2.10/pom.xml
@@ -16,10 +16,11 @@
   ~ limitations under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.logging</groupId>
+    <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j-api-scala-parent</artifactId>
     <version>${revision}</version>
     <relativePath>../pom.xml</relativePath>
@@ -99,6 +100,7 @@
 
   <build>
     <plugins>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-toolchains-plugin</artifactId>
@@ -108,6 +110,7 @@
         <groupId>net.alchim31.maven</groupId>
         <artifactId>scala-maven-plugin</artifactId>
       </plugin>
+
     </plugins>
   </build>
 
diff --git a/log4j-api-scala_2.11/pom.xml b/log4j-api-scala_2.11/pom.xml
index fa34b7f..9dcf32e 100644
--- a/log4j-api-scala_2.11/pom.xml
+++ b/log4j-api-scala_2.11/pom.xml
@@ -16,10 +16,11 @@
   ~ limitations under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.logging</groupId>
+    <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j-api-scala-parent</artifactId>
     <version>${revision}</version>
     <relativePath>../pom.xml</relativePath>
diff --git a/log4j-api-scala_2.12/pom.xml b/log4j-api-scala_2.12/pom.xml
index 477427e..8b177ab 100644
--- a/log4j-api-scala_2.12/pom.xml
+++ b/log4j-api-scala_2.12/pom.xml
@@ -16,10 +16,11 @@
   ~ limitations under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.logging</groupId>
+    <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j-api-scala-parent</artifactId>
     <version>${revision}</version>
     <relativePath>../pom.xml</relativePath>
diff --git a/log4j-api-scala_2.13/pom.xml b/log4j-api-scala_2.13/pom.xml
index c5d7d08..e99b629 100644
--- a/log4j-api-scala_2.13/pom.xml
+++ b/log4j-api-scala_2.13/pom.xml
@@ -16,10 +16,11 @@
   ~ limitations under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.logging</groupId>
+    <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j-api-scala-parent</artifactId>
     <version>${revision}</version>
     <relativePath>../pom.xml</relativePath>
diff --git a/log4j-api-scala_3/pom.xml b/log4j-api-scala_3/pom.xml
index 3dc55b3..40cf3f5 100644
--- a/log4j-api-scala_3/pom.xml
+++ b/log4j-api-scala_3/pom.xml
@@ -16,10 +16,11 @@
   ~ limitations under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.logging</groupId>
+    <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j-api-scala-parent</artifactId>
     <version>${revision}</version>
     <relativePath>../pom.xml</relativePath>
diff --git a/pom.xml b/pom.xml
index 851f387..f956dda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,14 +22,65 @@
   <parent>
     <groupId>org.apache.logging</groupId>
     <artifactId>logging-parent</artifactId>
-    <version>10.0.0</version>
+    <version>10.1.0</version>
     <relativePath />
   </parent>
 
+  <groupId>org.apache.logging.log4j</groupId>
   <artifactId>log4j-api-scala-parent</artifactId>
   <version>${revision}</version>
   <packaging>pom</packaging>
 
+  <url>https://logging.apache.org/log4j/scala/</url>
+
+  <developers>
+
+    <developer>
+      <id>ggregory</id>
+      <name>Gary Gregory</name>
+      <email>ggregory@apache.org</email>
+      <url>https://www.garygregory.com</url>
+      <organization>The Apache Software Foundation</organization>
+      <organizationUrl>https://www.apache.org/</organizationUrl>
+      <roles>
+        <role>PMC Member</role>
+      </roles>
+      <timezone>America/New_York</timezone>
+    </developer>
+
+    <developer>
+      <id>mattsicker</id>
+      <name>Matt Sicker</name>
+      <email>mattsicker@apache.org</email>
+      <organization>Apple</organization>
+      <roles>
+        <role>PMC Member</role>
+      </roles>
+      <timezone>America/Chicago</timezone>
+    </developer>
+
+    <developer>
+      <id>pkarwasz</id>
+      <name>Piotr P. Karwasz</name>
+      <email>pkarwasz@apache.org</email>
+      <roles>
+        <role>PMC Member</role>
+      </roles>
+      <timezone>Europe/Warsaw</timezone>
+    </developer>
+
+    <developer>
+      <id>vy</id>
+      <name>Volkan Yazıcı</name>
+      <email>vy@apache.org</email>
+      <roles>
+        <role>PMC Chair</role>
+      </roles>
+      <timezone>Europe/Amsterdam</timezone>
+    </developer>
+
+  </developers>
+
   <modules>
     <module>log4j-api-scala_2.10</module>
     <module>log4j-api-scala_2.11</module>
@@ -38,6 +89,23 @@
     <module>log4j-api-scala_3</module>
   </modules>
 
+  <scm>
+    <connection>scm:git:git@github.com:apache/logging-log4j-scala.git</connection>
+    <developerConnection>scm:git:git@github.com:apache/logging-log4j-scala.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://github.com/apache/logging-log4j-scala</url>
+  </scm>
+
+  <issueManagement>
+    <system>GitHub Issues</system>
+    <url>https://github.com/apache/logging-log4j-scala/issues</url>
+  </issueManagement>
+
+  <ciManagement>
+    <system>GitHub Actions</system>
+    <url>https://github.com/apache/logging-log4j-scala/actions</url>
+  </ciManagement>
+
   <properties>
 
     <!-- project version -->
@@ -46,15 +114,17 @@
     <!-- javac version (should work with the minimum `scala.version`!) -->
     <minimalJavaBuildVersion>[17,18)</minimalJavaBuildVersion>
 
-    <!-- scala version (to be overridden by modules!) -->
+    <!-- Scala version (to be overridden by modules!) -->
     <scala.version.group>2.10</scala.version.group>
     <scala.version>${scala.version.group}.7</scala.version>
 
-    <!-- JDK 8 does not support -release -->
+    <!-- JDK 8 does not support `-release` flag -->
     <maven.compiler.source>8</maven.compiler.source>
     <maven.compiler.target>8</maven.compiler.target>
     <maven.compiler.release>8</maven.compiler.release>
 
+    <bnd-module-name>${groupId}.api_scala</bnd-module-name>
+
     <!-- disable `maven-site-plugin`-->
     <maven.site.skip>true</maven.site.skip>
     <maven.site.deploy.skip>true</maven.site.deploy.skip>
@@ -68,9 +138,9 @@
     <mockito.version>4.11.0</mockito.version>
     <scalatest.version>3.2.10</scalatest.version>
     <scalatestplus.version>3.2.10.0</scalatestplus.version>
-    <spotbugs-annotations.version>4.7.3</spotbugs-annotations.version>
 
     <!-- plugin versions -->
+    <maven-toolchains-plugin.version>3.1.0</maven-toolchains-plugin.version>
     <!-- Last one that runs on JDK 8 -->
     <spotless-maven-plugin.version>2.30.0</spotless-maven-plugin.version>
     <scala-maven-plugin.version>4.8.1</scala-maven-plugin.version>
@@ -130,12 +200,6 @@
         <version>${scalatestplus.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>com.github.spotbugs</groupId>
-        <artifactId>spotbugs-annotations</artifactId>
-        <version>${spotbugs-annotations.version}</version>
-      </dependency>
-
     </dependencies>
   </dependencyManagement>
 
@@ -167,19 +231,20 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-toolchains-plugin</artifactId>
-          <version>3.1.0</version>
-          <configuration>
-            <toolchains>
-              <jdk>
-                <version>[1.8,9)</version>
-              </jdk>
-            </toolchains>
-          </configuration>
+          <version>${maven-toolchains-plugin.version}</version>
           <executions>
             <execution>
+              <id>java-8</id>
               <goals>
                 <goal>toolchain</goal>
               </goals>
+              <configuration>
+                <toolchains>
+                  <jdk>
+                    <version>[1.8,9)</version>
+                  </jdk>
+                </toolchains>
+              </configuration>
             </execution>
           </executions>
         </plugin>
@@ -187,21 +252,6 @@
       </plugins>
     </pluginManagement>
 
-    <plugins>
-
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-        <configuration>
-          <excludes combine.children="append">
-            <!-- Unrecognized BSD license -->
-            <exclude>sbt</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-
-    </plugins>
-
     <sourceDirectory>src/main/scala</sourceDirectory>
 
     <testSourceDirectory>src/test/scala</testSourceDirectory>
diff --git a/project/AsciidocPlugin.scala b/project/AsciidocPlugin.scala
deleted file mode 100644
index 0ed5ac7..0000000
--- a/project/AsciidocPlugin.scala
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-import java.util
-
-import com.typesafe.sbt.site.SitePlugin
-import com.typesafe.sbt.site.SitePlugin.autoImport.siteSubdirName
-import com.typesafe.sbt.site.util.SiteHelpers
-import org.asciidoctor.Asciidoctor.Factory
-import org.asciidoctor.{DirectoryWalker, Options, SafeMode}
-import sbt.Keys._
-import sbt._
-
-import scala.collection.JavaConverters._
-
-/** Asciidoctor generator. */
-object AsciidocPlugin extends AutoPlugin {
-  override lazy val requires = SitePlugin
-  override lazy val trigger = allRequirements
-
-  object autoImport {
-    val Asciidoc = config("asciidoctor")
-    val siteProperties = settingKey[Seq[(String, AnyRef)]]("Properties to filter through asciidoc")
-  }
-
-  import autoImport._
-
-  override def projectSettings = asciidoctorSettings(Asciidoc)
-
-  /** Creates settings necessary for running Asciidoctor in the given configuration. */
-  def asciidoctorSettings(config: Configuration): Seq[Setting[_]] =
-    inConfig(config)(
-      Seq(
-        includeFilter := AllPassFilter,
-        unmanagedSources := (sourceDirectory.value ** "*.adoc").get,
-        managedSources := Seq(),
-        sources := unmanagedSources.value ++ managedSources.value,
-        siteProperties := Seq("project-version" -> version.value),
-        mappings := generate(sources.value, target.value, includeFilter.value, siteProperties.value),
-        siteSubdirName := ""
-      )
-    ) ++
-      SiteHelpers.directorySettings(config) ++
-      SiteHelpers.watchSettings(config) ++
-      SiteHelpers.addMappingsToSiteDir(mappings in config, siteSubdirName in config)
-
-  /** Run asciidoctor in new ClassLoader. */
-  private def generate(inputs: Seq[File], outputDirectory: File, includeFilter: FileFilter, props: Seq[(String, AnyRef)])
-  : Seq[(File, String)] = {
-    val oldContextClassLoader = Thread.currentThread().getContextClassLoader
-    Thread.currentThread().setContextClassLoader(this.getClass.getClassLoader)
-    try {
-      val asciidoctor = Factory.create()
-      if (!outputDirectory.exists()) outputDirectory.mkdirs()
-      val options = new Options
-      options.setToDir(outputDirectory.getAbsolutePath)
-      options.setDestinationDir(outputDirectory.getAbsolutePath)
-      options.setSafe(SafeMode.UNSAFE)
-      // need to do this explicitly through HashMap because otherwise JRuby complains
-      val attributes = new util.HashMap[String, AnyRef]
-      for ((key, value) <- props) attributes.put(key, value)
-      options.setAttributes(attributes)
-      val walker = new DirectoryWalker {
-        override def scan(): util.List[File] = inputs.asJava
-      }
-      asciidoctor.renderDirectory(walker, options)
-    } finally {
-      Thread.currentThread().setContextClassLoader(oldContextClassLoader)
-    }
-    outputDirectory ** includeFilter --- outputDirectory pair Path.relativeTo(outputDirectory)
-  }
-}
\ No newline at end of file
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
deleted file mode 100644
index 3095523..0000000
--- a/project/Dependencies.scala
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-import sbt._
-
-object Dependencies {
-  val scala210 = "2.10.7"
-  val scala211 = "2.11.12"
-  val scala212 = "2.12.15"
-  val scala213 = "2.13.8"
-  val scala3 = "3.0.2"
-
-  def scalaReflect(version: String) =
-    if (version.startsWith("3")) None else Some("org.scala-lang" % "scala-reflect" % version)
-
-  private val log4jV = "2.18.0"
-  val osgiCoreApi      = "org.osgi" % "org.osgi.core" % "6.0.0" % Provided
-  val log4jApi         = "org.apache.logging.log4j" % "log4j-api" % log4jV
-  val log4jApiTests    = "org.apache.logging.log4j" % "log4j-api" % log4jV % Test classifier "tests"
-  val log4jCore        = "org.apache.logging.log4j" % "log4j-core" % log4jV % Runtime
-  val junit            = "junit" % "junit" % "4.12" % Test
-  val scalactic        = "org.scalactic" %% "scalactic" % "3.2.10" % Compile
-  val scalatest        = "org.scalatest" %% "scalatest" % "3.2.10" % Test
-  val scalatestFunsuit = "org.scalatest" %% "scalatest-funsuite" % "3.2.10" % Test
-  val scalatestMatcher = "org.scalatest" %% "scalatest-matchers-core" % "3.2.10" % Test
-  val scalatestJunit   = "org.scalatestplus" %% "junit-4-13" % "3.2.10.0" % Test
-  val scalatestMockito = "org.scalatestplus" %% "mockito-3-12" % "3.2.10.0" % Test
-  val mockito          = "org.mockito" % "mockito-core" % "4.2.0" % Test
-}
diff --git a/project/Distributions.scala b/project/Distributions.scala
deleted file mode 100644
index 25b4b5a..0000000
--- a/project/Distributions.scala
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-import java.io.FileOutputStream
-import java.util.zip.GZIPOutputStream
-
-import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream
-import sbt.{Def, _}
-import sbt.plugins.JvmPlugin
-
-object Distributions extends AutoPlugin {
-  override lazy val trigger = allRequirements
-
-  override lazy val requires = JvmPlugin
-
-  object autoImport {
-    // run this task after "+ package" to get all versions included
-    val packageDistributions = taskKey[Seq[File]]("Packages zip and tar.gz binary distributions")
-    val packageZip = packageDistributionTask("zip")
-    val packageTarGz = packageDistributionTask("tar.gz")
-  }
-
-  import autoImport._
-
-  override def projectSettings: Seq[Def.Setting[_]] = Seq(
-    packageDistributions := Seq(
-      packageZip.value,
-      packageTarGz.value
-    )
-  )
-
-  private val classified = "-([a-z]+)\\.jar".r
-
-  def packageDistributionTask(ext: String): Def.Initialize[Task[File]] = Def.task {
-    val target = Keys.target.value
-    val binaries = target * "scala-*" ** "log4j-api-scala*.jar" pair { file =>
-      file.name match {
-        case classified(_) => None
-        case _ => Some(file.name)
-      }
-    }
-    val base = Keys.baseDirectory.value
-    val inputs = binaries ++ Seq(
-      (base / "LICENSE.txt", "LICENSE"),
-      (base / "NOTICE.txt", "NOTICE")
-    )
-    val version = Keys.version.value
-    val output = target / s"apache-log4j-api-scala-$version-bin.$ext"
-    ext match {
-      case "zip" => makeZip(inputs, output)
-      case "tar.gz" => makeTarGz(inputs, output)
-      case _ => sys.error(s"Unknown distribution extension: $ext")
-    }
-    output
-  }
-
-  def tarGz(sources: Traversable[(File, String)], output: File): Unit = {
-    val out = new TarArchiveOutputStream(new GZIPOutputStream(new FileOutputStream(output)))
-    for ((f, name) <- sources) {
-      out.putArchiveEntry(out.createArchiveEntry(f, name))
-      IO.transfer(f, out)
-      out.closeArchiveEntry()
-    }
-    out.finish()
-    out.close()
-  }
-
-  def makeTarGz(inputs: Traversable[(File, String)], output: File): Unit = {
-    val out = output.getAbsoluteFile
-    if (out.exists()) {
-      if (out.isFile) out.delete() else sys.error(s"Cannot write to file $out as it is not a file")
-    }
-    tarGz(inputs, out)
-  }
-
-  def makeZip(inputs: Traversable[(File, String)], output: File): Unit = {
-    val out = output.getAbsoluteFile
-    if (out.exists()) {
-      if (out.isFile) out.delete() else sys.error(s"Cannot write to file $out as it is not a file")
-    }
-    IO.zip(inputs, out)
-  }
-}
diff --git a/sample/src/main/resources/log4j2.xml b/sample/src/main/resources/log4j2.xml
deleted file mode 100644
index 1c8703b..0000000
--- a/sample/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<Configuration name="ScalaApiSample" status="error">
-    <Appenders>
-        <Console name="Console">
-            <PatternLayout>
-                <Pattern>%d [%X{correlationId}] %5p %c{1} %X %F:%L - %m%n</Pattern>
-            </PatternLayout>
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Root level="TRACE">
-            <AppenderRef ref="Console"/>
-        </Root>
-    </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/sample/src/main/scala/org/apache/logging/log4j/scala/sample/LoggingApp.scala b/sample/src/main/scala/org/apache/logging/log4j/scala/sample/LoggingApp.scala
deleted file mode 100644
index c071673..0000000
--- a/sample/src/main/scala/org/apache/logging/log4j/scala/sample/LoggingApp.scala
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.scala.sample
-
-import java.util.UUID
-
-import org.apache.logging.log4j.Level
-import org.apache.logging.log4j.message.MessageFactory2
-import org.apache.logging.log4j.scala.{Logging, LoggingContext}
-
-object LoggingApp extends App with Logging {
-
-  val s1 = "foo"
-  val s2 = "bar"
-  val t = new RuntimeException("error")
-
-  logger.info(s"Hello, world: $s1 $s2")
-
-  logger.traceEntry()
-  logger.traceEntry(s1, s2)
-  val entryMessage = logger.traceEntry(logger.delegate.getMessageFactory.asInstanceOf[MessageFactory2].newMessage("foobar": CharSequence))
-
-  logger.traceExit()
-  logger.traceExit(s2)
-  logger.traceExit(entryMessage)
-  logger.traceExit(entryMessage, s2)
-  logger.traceExit(logger.delegate.getMessageFactory.asInstanceOf[MessageFactory2].newMessage("bonsai": CharSequence), s2)
-
-  logger.throwing(t)
-  logger.throwing(Level.INFO, t)
-
-  logger.catching(t)
-  logger.catching(Level.INFO, t)
-
-  LoggingContext("correlationId") = UUID.randomUUID().toString
-  logger.info("Logging with a correlation ID set")
-  LoggingContext.clear()
-  logger.info("Logging without the correlation ID")
-
-}
\ No newline at end of file
diff --git a/sbt b/sbt
deleted file mode 100755
index 631f707..0000000
--- a/sbt
+++ /dev/null
@@ -1,664 +0,0 @@
-#!/usr/bin/env bash
-#
-# A more capable sbt runner, coincidentally also called sbt.
-# Author: Paul Phillips <pa...@improving.org>
-# https://github.com/paulp/sbt-extras
-#
-# Generated from http://www.opensource.org/licenses/bsd-license.php
-# Copyright (c) 2011, Paul Phillips. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#     * Neither the name of the author nor the names of its contributors
-# may be used to endorse or promote products derived from this software
-# without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-set -o pipefail
-
-declare -r sbt_release_version="1.9.5"
-declare -r sbt_unreleased_version="1.9.5"
-
-declare -r latest_213="2.13.12"
-declare -r latest_212="2.12.18"
-declare -r latest_211="2.11.12"
-declare -r latest_210="2.10.7"
-declare -r latest_29="2.9.3"
-declare -r latest_28="2.8.2"
-
-declare -r buildProps="project/build.properties"
-
-declare -r sbt_launch_ivy_release_repo="https://repo.typesafe.com/typesafe/ivy-releases"
-declare -r sbt_launch_ivy_snapshot_repo="https://repo.scala-sbt.org/scalasbt/ivy-snapshots"
-declare -r sbt_launch_mvn_release_repo="https://repo1.maven.org/maven2"
-declare -r sbt_launch_mvn_snapshot_repo="https://repo.scala-sbt.org/scalasbt/maven-snapshots"
-
-declare -r default_jvm_opts_common="-Xms512m -Xss2m -XX:MaxInlineLevel=18"
-declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy -Dsbt.coursier.home=project/.coursier"
-
-declare sbt_jar sbt_dir sbt_create sbt_version sbt_script sbt_new
-declare sbt_explicit_version
-declare verbose noshare batch trace_level
-
-declare java_cmd="java"
-declare sbt_launch_dir="$HOME/.sbt/launchers"
-declare sbt_launch_repo
-
-# pull -J and -D options to give to java.
-declare -a java_args scalac_args sbt_commands residual_args
-
-# args to jvm/sbt via files or environment variables
-declare -a extra_jvm_opts extra_sbt_opts
-
-echoerr() { echo >&2 "$@"; }
-vlog()    { [[ -n "$verbose" ]] && echoerr "$@"; }
-die()     {
-  echo "Aborting: $*"
-  exit 1
-}
-
-setTrapExit() {
-  # save stty and trap exit, to ensure echo is re-enabled if we are interrupted.
-  SBT_STTY="$(stty -g 2>/dev/null)"
-  export SBT_STTY
-
-  # restore stty settings (echo in particular)
-  onSbtRunnerExit() {
-    [ -t 0 ] || return
-    vlog ""
-    vlog "restoring stty: $SBT_STTY"
-    stty "$SBT_STTY"
-  }
-
-  vlog "saving stty: $SBT_STTY"
-  trap onSbtRunnerExit EXIT
-}
-
-# this seems to cover the bases on OSX, and someone will
-# have to tell me about the others.
-get_script_path() {
-  local path="$1"
-  [[ -L "$path" ]] || {
-    echo "$path"
-    return
-  }
-
-  local -r target="$(readlink "$path")"
-  if [[ "${target:0:1}" == "/" ]]; then
-    echo "$target"
-  else
-    echo "${path%/*}/$target"
-  fi
-}
-
-script_path="$(get_script_path "${BASH_SOURCE[0]}")"
-declare -r script_path
-script_name="${script_path##*/}"
-declare -r script_name
-
-init_default_option_file() {
-  local overriding_var="${!1}"
-  local default_file="$2"
-  if [[ ! -r "$default_file" && "$overriding_var" =~ ^@(.*)$ ]]; then
-    local envvar_file="${BASH_REMATCH[1]}"
-    if [[ -r "$envvar_file" ]]; then
-      default_file="$envvar_file"
-    fi
-  fi
-  echo "$default_file"
-}
-
-sbt_opts_file="$(init_default_option_file SBT_OPTS .sbtopts)"
-sbtx_opts_file="$(init_default_option_file SBTX_OPTS .sbtxopts)"
-jvm_opts_file="$(init_default_option_file JVM_OPTS .jvmopts)"
-
-build_props_sbt() {
-  [[ -r "$buildProps" ]] &&
-    grep '^sbt\.version' "$buildProps" | tr '=\r' ' ' | awk '{ print $2; }'
-}
-
-set_sbt_version() {
-  sbt_version="${sbt_explicit_version:-$(build_props_sbt)}"
-  [[ -n "$sbt_version" ]] || sbt_version=$sbt_release_version
-  export sbt_version
-}
-
-url_base() {
-  local version="$1"
-
-  case "$version" in
-    0.7.*)     echo "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/simple-build-tool" ;;
-    0.10.*)    echo "$sbt_launch_ivy_release_repo" ;;
-    0.11.[12]) echo "$sbt_launch_ivy_release_repo" ;;
-    0.*-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9][0-9][0-9]) # ie "*-yyyymmdd-hhMMss"
-      echo          "$sbt_launch_ivy_snapshot_repo" ;;
-    0.*)       echo "$sbt_launch_ivy_release_repo" ;;
-    *-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]T[0-9][0-9][0-9][0-9][0-9][0-9]) # ie "*-yyyymmddThhMMss"
-      echo          "$sbt_launch_mvn_snapshot_repo" ;;
-    *)         echo "$sbt_launch_mvn_release_repo" ;;
-  esac
-}
-
-make_url() {
-  local version="$1"
-
-  local base="${sbt_launch_repo:-$(url_base "$version")}"
-
-  case "$version" in
-    0.7.*)     echo "$base/sbt-launch-0.7.7.jar" ;;
-    0.10.*)    echo "$base/org.scala-tools.sbt/sbt-launch/$version/sbt-launch.jar" ;;
-    0.11.[12]) echo "$base/org.scala-tools.sbt/sbt-launch/$version/sbt-launch.jar" ;;
-    0.*)       echo "$base/org.scala-sbt/sbt-launch/$version/sbt-launch.jar" ;;
-    *)         echo "$base/org/scala-sbt/sbt-launch/$version/sbt-launch-${version}.jar" ;;
-  esac
-}
-
-addJava()      {
-  vlog "[addJava] arg = '$1'"
-  java_args+=("$1")
-}
-addSbt()       {
-  vlog "[addSbt] arg = '$1'"
-  sbt_commands+=("$1")
-}
-addScalac()    {
-  vlog "[addScalac] arg = '$1'"
-  scalac_args+=("$1")
-}
-addResidual()  {
-  vlog "[residual] arg = '$1'"
-  residual_args+=("$1")
-}
-
-addResolver() { addSbt "set resolvers += $1"; }
-
-addDebugger() { addJava "-Xdebug" && addJava "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=$1"; }
-
-setThisBuild() {
-  vlog "[addBuild] args = '$*'"
-  local key="$1" && shift
-  addSbt "set $key in ThisBuild := $*"
-}
-setScalaVersion() {
-  [[ "$1" == *"-SNAPSHOT" ]] && addResolver 'Resolver.sonatypeRepo("snapshots")'
-  addSbt "++ $1"
-}
-setJavaHome() {
-  java_cmd="$1/bin/java"
-  setThisBuild javaHome "_root_.scala.Some(file(\"$1\"))"
-  export JAVA_HOME="$1"
-  export JDK_HOME="$1"
-  export PATH="$JAVA_HOME/bin:$PATH"
-}
-
-getJavaVersion() {
-  local -r str=$("$1" -version 2>&1 | grep -E -e '(java|openjdk) version' | awk '{ print $3 }' | tr -d '"')
-
-  # java -version on java8 says 1.8.x
-  # but on 9 and 10 it's 9.x.y and 10.x.y.
-  if [[ "$str" =~ ^1\.([0-9]+)(\..*)?$ ]]; then
-    echo "${BASH_REMATCH[1]}"
-  # Fixes https://github.com/dwijnand/sbt-extras/issues/326
-  elif [[ "$str" =~ ^([0-9]+)(\..*)?(-ea)?$ ]]; then
-    echo "${BASH_REMATCH[1]}"
-  elif [[ -n "$str" ]]; then
-    echoerr "Can't parse java version from: $str"
-  fi
-}
-
-checkJava() {
-  # Warn if there is a Java version mismatch between PATH and JAVA_HOME/JDK_HOME
-
-  [[ -n "$JAVA_HOME" && -e "$JAVA_HOME/bin/java"    ]] && java="$JAVA_HOME/bin/java"
-  [[ -n "$JDK_HOME" && -e "$JDK_HOME/lib/tools.jar" ]] && java="$JDK_HOME/bin/java"
-
-  if [[ -n "$java" ]]; then
-    pathJavaVersion=$(getJavaVersion java)
-    homeJavaVersion=$(getJavaVersion "$java")
-    if [[ "$pathJavaVersion" != "$homeJavaVersion" ]]; then
-      echoerr "Warning: Java version mismatch between PATH and JAVA_HOME/JDK_HOME, sbt will use the one in PATH"
-      echoerr "  Either: fix your PATH, remove JAVA_HOME/JDK_HOME or use -java-home"
-      echoerr "  java version from PATH:               $pathJavaVersion"
-      echoerr "  java version from JAVA_HOME/JDK_HOME: $homeJavaVersion"
-    fi
-  fi
-}
-
-java_version() {
-  local -r version=$(getJavaVersion "$java_cmd")
-  vlog "Detected Java version: $version"
-  echo "$version"
-}
-
-is_apple_silicon() { [[ "$(uname -s)" == "Darwin" && "$(uname -m)" == "arm64" ]]; }
-
-# MaxPermSize critical on pre-8 JVMs but incurs noisy warning on 8+
-default_jvm_opts() {
-  local -r v="$(java_version)"
-  if [[ $v -ge 17 ]]; then
-    echo "$default_jvm_opts_common"
-  elif [[ $v -ge 10 ]]; then
-    if is_apple_silicon; then
-      # As of Dec 2020, JVM for Apple Silicon (M1) doesn't support JVMCI
-      echo "$default_jvm_opts_common"
-    else
-      echo "$default_jvm_opts_common -XX:+UnlockExperimentalVMOptions -XX:+UseJVMCICompiler"
-    fi
-  elif [[ $v -ge 8 ]]; then
-    echo "$default_jvm_opts_common"
-  else
-    echo "-XX:MaxPermSize=384m $default_jvm_opts_common"
-  fi
-}
-
-execRunner() {
-  # print the arguments one to a line, quoting any containing spaces
-  vlog "# Executing command line:" && {
-    for arg; do
-      if [[ -n "$arg" ]]; then
-        if printf "%s\n" "$arg" | grep -q ' '; then
-          printf >&2 "\"%s\"\n" "$arg"
-        else
-          printf >&2 "%s\n" "$arg"
-        fi
-      fi
-    done
-    vlog ""
-  }
-
-  setTrapExit
-
-  if [[ -n "$batch" ]]; then
-    "$@" </dev/null
-  else
-    "$@"
-  fi
-}
-
-jar_url() { make_url "$1"; }
-
-is_cygwin() { [[ "$(uname -a)" == "CYGWIN"* ]]; }
-
-jar_file() {
-  is_cygwin &&
-    cygpath -w "$sbt_launch_dir/$1/sbt-launch.jar" ||
-    echo "$sbt_launch_dir/$1/sbt-launch.jar"
-}
-
-download_url() {
-  local url="$1"
-  local jar="$2"
-
-  mkdir -p "${jar%/*}" && {
-    if command -v curl >/dev/null 2>&1; then
-      curl --fail --silent --location "$url" --output "$jar"
-    elif command -v wget >/dev/null 2>&1; then
-      wget -q -O "$jar" "$url"
-    fi
-  } && [[ -r "$jar" ]]
-}
-
-acquire_sbt_jar() {
-  {
-    sbt_jar="$(jar_file "$sbt_version")"
-    [[ -r "$sbt_jar" ]]
-  } || {
-    sbt_jar="$HOME/.ivy2/local/org.scala-sbt/sbt-launch/$sbt_version/jars/sbt-launch.jar"
-    [[ -r "$sbt_jar" ]]
-  } || {
-    sbt_jar="$(jar_file "$sbt_version")"
-    jar_url="$(make_url "$sbt_version")"
-
-    echoerr "Downloading sbt launcher for ${sbt_version}:"
-    echoerr "  From  ${jar_url}"
-    echoerr "    To  ${sbt_jar}"
-
-    download_url "${jar_url}" "${sbt_jar}"
-
-    case "${sbt_version}" in
-      0.*)
-        vlog "SBT versions < 1.0 do not have published MD5 checksums, skipping check"
-        echo ""
-        ;;
-      *)   verify_sbt_jar "${sbt_jar}" ;;
-    esac
-  }
-}
-
-verify_sbt_jar() {
-  local jar="${1}"
-  local md5="${jar}.md5"
-  md5url="$(make_url "${sbt_version}").md5"
-
-  echoerr "Downloading sbt launcher ${sbt_version} md5 hash:"
-  echoerr "  From  ${md5url}"
-  echoerr "    To  ${md5}"
-
-  download_url "${md5url}" "${md5}" >/dev/null 2>&1
-
-  if command -v md5sum >/dev/null 2>&1; then
-    if echo "$(cat "${md5}")  ${jar}" | md5sum -c -; then
-      rm -rf "${md5}"
-      return 0
-    else
-      echoerr "Checksum does not match"
-      return 1
-    fi
-  elif command -v md5 >/dev/null 2>&1; then
-    if [ "$(md5 -q "${jar}")" == "$(cat "${md5}")" ]; then
-      rm -rf "${md5}"
-      return 0
-    else
-      echoerr "Checksum does not match"
-      return 1
-    fi
-  elif command -v openssl >/dev/null 2>&1; then
-    if [ "$(openssl md5 -r "${jar}" | awk '{print $1}')" == "$(cat "${md5}")" ]; then
-      rm -rf "${md5}"
-      return 0
-    else
-      echoerr "Checksum does not match"
-      return 1
-    fi
-  else
-    echoerr "Could not find an MD5 command"
-    return 1
-  fi
-}
-
-usage() {
-  set_sbt_version
-  cat <<EOM
-Usage: $script_name [options]
-
-Note that options which are passed along to sbt begin with -- whereas
-options to this runner use a single dash. Any sbt command can be scheduled
-to run first by prefixing the command with --, so --warn, --error and so on
-are not special.
-
-  -h | -help         print this message
-  -v                 verbose operation (this runner is chattier)
-  -d, -w, -q         aliases for --debug, --warn, --error (q means quiet)
-  -x                 debug this script
-  -trace <level>     display stack traces with a max of <level> frames (default: -1, traces suppressed)
-  -debug-inc         enable debugging log for the incremental compiler
-  -no-colors         disable ANSI color codes
-  -sbt-create        start sbt even if current directory contains no sbt project
-  -sbt-dir   <path>  path to global settings/plugins directory (default: ~/.sbt/<version>)
-  -sbt-boot  <path>  path to shared boot directory (default: ~/.sbt/boot in 0.11+)
-  -ivy       <path>  path to local Ivy repository (default: ~/.ivy2)
-  -no-share          use all local caches; no sharing
-  -offline           put sbt in offline mode
-  -jvm-debug <port>  Turn on JVM debugging, open at the given port.
-  -batch             Disable interactive mode
-  -prompt <expr>     Set the sbt prompt; in expr, 's' is the State and 'e' is Extracted
-  -script <file>     Run the specified file as a scala script
-
-  # sbt version (default: sbt.version from $buildProps if present, otherwise $sbt_release_version)
-  -sbt-version <version>  use the specified version of sbt (default: $sbt_release_version)
-  -sbt-force-latest       force the use of the latest release of sbt: $sbt_release_version
-  -sbt-dev                use the latest pre-release version of sbt: $sbt_unreleased_version
-  -sbt-jar      <path>    use the specified jar as the sbt launcher
-  -sbt-launch-dir <path>  directory to hold sbt launchers (default: $sbt_launch_dir)
-  -sbt-launch-repo <url>  repo url for downloading sbt launcher jar (default: $(url_base "$sbt_version"))
-
-  # scala version (default: as chosen by sbt)
-  -28                        use $latest_28
-  -29                        use $latest_29
-  -210                       use $latest_210
-  -211                       use $latest_211
-  -212                       use $latest_212
-  -213                       use $latest_213
-  -scala-home <path>         use the scala build at the specified directory
-  -scala-version <version>   use the specified version of scala
-  -binary-version <version>  use the specified scala version when searching for dependencies
-
-  # java version (default: java from PATH, currently $(java -version 2>&1 | grep version))
-  -java-home <path>          alternate JAVA_HOME
-
-  # passing options to the jvm - note it does NOT use JAVA_OPTS due to pollution
-  # The default set is used if JVM_OPTS is unset and no -jvm-opts file is found
-  <default>         $(default_jvm_opts)
-  JVM_OPTS          environment variable holding either the jvm args directly, or
-                    the reference to a file containing jvm args if given path is prepended by '@' (e.g. '@/etc/jvmopts')
-                    Note: "@"-file is overridden by local '.jvmopts' or '-jvm-opts' argument.
-  -jvm-opts <path>  file containing jvm args (if not given, .jvmopts in project root is used if present)
-  -Dkey=val         pass -Dkey=val directly to the jvm
-  -J-X              pass option -X directly to the jvm (-J is stripped)
-
-  # passing options to sbt, OR to this runner
-  SBT_OPTS          environment variable holding either the sbt args directly, or
-                    the reference to a file containing sbt args if given path is prepended by '@' (e.g. '@/etc/sbtopts')
-                    Note: "@"-file is overridden by local '.sbtopts' or '-sbt-opts' argument.
-  -sbt-opts <path>  file containing sbt args (if not given, .sbtopts in project root is used if present)
-  -S-X              add -X to sbt's scalacOptions (-S is stripped)
-
-  # passing options exclusively to this runner
-  SBTX_OPTS         environment variable holding either the sbt-extras args directly, or
-                    the reference to a file containing sbt-extras args if given path is prepended by '@' (e.g. '@/etc/sbtxopts')
-                    Note: "@"-file is overridden by local '.sbtxopts' or '-sbtx-opts' argument.
-  -sbtx-opts <path> file containing sbt-extras args (if not given, .sbtxopts in project root is used if present)
-EOM
-  exit 0
-}
-
-process_args() {
-  require_arg() {
-    local type="$1"
-    local opt="$2"
-    local arg="$3"
-
-    if [[ -z "$arg" ]] || [[ "${arg:0:1}" == "-" ]]; then
-      die "$opt requires <$type> argument"
-    fi
-  }
-  while [[ $# -gt 0 ]]; do
-    case "$1" in
-      -h |   -help) usage ;;
-      -v)           verbose=true && shift ;;
-      -d)           addSbt "--debug" && shift ;;
-      -w)           addSbt "--warn"  && shift ;;
-      -q)           addSbt "--error" && shift ;;
-      -x)           shift ;; # currently unused
-      -trace)       require_arg integer "$1" "$2" && trace_level="$2" && shift 2 ;;
-      -debug-inc)   addJava "-Dxsbt.inc.debug=true" && shift ;;
-
-      -no-colors)   addJava "-Dsbt.log.noformat=true" && addJava "-Dsbt.color=false" && shift ;;
-      -sbt-create)  sbt_create=true && shift ;;
-      -sbt-dir)     require_arg path "$1" "$2" && sbt_dir="$2" && shift 2 ;;
-      -sbt-boot)    require_arg path "$1" "$2" && addJava "-Dsbt.boot.directory=$2" && shift 2 ;;
-      -ivy)         require_arg path "$1" "$2" && addJava "-Dsbt.ivy.home=$2" && shift 2 ;;
-      -no-share)    noshare=true && shift ;;
-      -offline)     addSbt "set offline in Global := true" && shift ;;
-      -jvm-debug)   require_arg port "$1" "$2" && addDebugger "$2" && shift 2 ;;
-      -batch)       batch=true && shift ;;
-      -prompt)      require_arg "expr" "$1" "$2" && setThisBuild shellPrompt "(s => { val e = Project.extract(s) ; $2 })" && shift 2 ;;
-      -script)      require_arg file "$1" "$2" && sbt_script="$2" && addJava "-Dsbt.main.class=sbt.ScriptMain" && shift 2 ;;
-
-      -sbt-version) require_arg version "$1" "$2" && sbt_explicit_version="$2" && shift 2 ;;
-      -sbt-force-latest) sbt_explicit_version="$sbt_release_version" && shift ;;
-      -sbt-dev)     sbt_explicit_version="$sbt_unreleased_version" && shift ;;
-      -sbt-jar)     require_arg path "$1" "$2" && sbt_jar="$2" && shift 2 ;;
-      -sbt-launch-dir) require_arg path "$1" "$2" && sbt_launch_dir="$2" && shift 2 ;;
-      -sbt-launch-repo) require_arg path "$1" "$2" && sbt_launch_repo="$2" && shift 2 ;;
-
-      -28)          setScalaVersion "$latest_28"  && shift ;;
-      -29)          setScalaVersion "$latest_29"  && shift ;;
-      -210)         setScalaVersion "$latest_210" && shift ;;
-      -211)         setScalaVersion "$latest_211" && shift ;;
-      -212)         setScalaVersion "$latest_212" && shift ;;
-      -213)         setScalaVersion "$latest_213" && shift ;;
-
-      -scala-version) require_arg version "$1" "$2" && setScalaVersion "$2" && shift 2 ;;
-      -binary-version) require_arg version "$1" "$2" && setThisBuild scalaBinaryVersion "\"$2\"" && shift 2 ;;
-      -scala-home)  require_arg path "$1" "$2" && setThisBuild scalaHome "_root_.scala.Some(file(\"$2\"))" && shift 2 ;;
-      -java-home)   require_arg path "$1" "$2" && setJavaHome "$2" && shift 2 ;;
-      -sbt-opts)    require_arg path "$1" "$2" && sbt_opts_file="$2" && shift 2 ;;
-      -sbtx-opts) require_arg path "$1" "$2" && sbtx_opts_file="$2" && shift 2 ;;
-      -jvm-opts)    require_arg path "$1" "$2" && jvm_opts_file="$2" && shift 2 ;;
-
-      -D*)          addJava "$1" && shift ;;
-      -J*)          addJava "${1:2}" && shift ;;
-      -S*)          addScalac "${1:2}" && shift ;;
-
-      new)          sbt_new=true && : ${sbt_explicit_version:=$sbt_release_version} && addResidual "$1" && shift ;;
-
-      *)            addResidual "$1" && shift ;;
-    esac
-  done
-}
-
-# process the direct command line arguments
-process_args "$@"
-
-# skip #-styled comments and blank lines
-readConfigFile() {
-  local end=false
-  until $end; do
-    read -r || end=true
-    [[ $REPLY =~ ^# ]] || [[ -z $REPLY ]] || echo "$REPLY"
-  done <"$1"
-}
-
-# if there are file/environment sbt_opts, process again so we
-# can supply args to this runner
-if [[ -r "$sbt_opts_file" ]]; then
-  vlog "Using sbt options defined in file $sbt_opts_file"
-  while read -r opt; do extra_sbt_opts+=("$opt"); done < <(readConfigFile "$sbt_opts_file")
-elif [[ -n "$SBT_OPTS" && ! ("$SBT_OPTS" =~ ^@.*) ]]; then
-  vlog "Using sbt options defined in variable \$SBT_OPTS"
-  IFS=" " read -r -a extra_sbt_opts <<<"$SBT_OPTS"
-else
-  vlog "No extra sbt options have been defined"
-fi
-
-# if there are file/environment sbtx_opts, process again so we
-# can supply args to this runner
-if [[ -r "$sbtx_opts_file" ]]; then
-  vlog "Using sbt options defined in file $sbtx_opts_file"
-  while read -r opt; do extra_sbt_opts+=("$opt"); done < <(readConfigFile "$sbtx_opts_file")
-elif [[ -n "$SBTX_OPTS" && ! ("$SBTX_OPTS" =~ ^@.*) ]]; then
-  vlog "Using sbt options defined in variable \$SBTX_OPTS"
-  IFS=" " read -r -a extra_sbt_opts <<<"$SBTX_OPTS"
-else
-  vlog "No extra sbt options have been defined"
-fi
-
-[[ -n "${extra_sbt_opts[*]}" ]] && process_args "${extra_sbt_opts[@]}"
-
-# reset "$@" to the residual args
-set -- "${residual_args[@]}"
-argumentCount=$#
-
-# set sbt version
-set_sbt_version
-
-checkJava
-
-# only exists in 0.12+
-setTraceLevel() {
-  case "$sbt_version" in
-    "0.7."* | "0.10."* | "0.11."*) echoerr "Cannot set trace level in sbt version $sbt_version" ;;
-    *)                             setThisBuild traceLevel "$trace_level" ;;
-  esac
-}
-
-# set scalacOptions if we were given any -S opts
-[[ ${#scalac_args[@]} -eq 0 ]] || addSbt "set scalacOptions in ThisBuild += \"${scalac_args[*]}\""
-
-[[ -n "$sbt_explicit_version" && -z "$sbt_new" ]] && addJava "-Dsbt.version=$sbt_explicit_version"
-vlog "Detected sbt version $sbt_version"
-
-if [[ -n "$sbt_script" ]]; then
-  residual_args=("$sbt_script" "${residual_args[@]}")
-else
-  # no args - alert them there's stuff in here
-  ((argumentCount > 0)) || {
-    vlog "Starting $script_name: invoke with -help for other options"
-    residual_args=(shell)
-  }
-fi
-
-# verify this is an sbt dir, -create was given or user attempts to run a scala script
-[[ -r ./build.sbt || -d ./project || -n "$sbt_create" || -n "$sbt_script" || -n "$sbt_new" ]] || {
-  cat <<EOM
-$(pwd) doesn't appear to be an sbt project.
-If you want to start sbt anyway, run:
-  $0 -sbt-create
-
-EOM
-  exit 1
-}
-
-# pick up completion if present; todo
-# shellcheck disable=SC1091
-[[ -r .sbt_completion.sh ]] && source .sbt_completion.sh
-
-# directory to store sbt launchers
-[[ -d "$sbt_launch_dir" ]] || mkdir -p "$sbt_launch_dir"
-[[ -w "$sbt_launch_dir" ]] || sbt_launch_dir="$(mktemp -d -t sbt_extras_launchers.XXXXXX)"
-
-# no jar? download it.
-[[ -r "$sbt_jar" ]] || acquire_sbt_jar || {
-  # still no jar? uh-oh.
-  echo "Could not download and verify the launcher. Obtain the jar manually and place it at $sbt_jar"
-  exit 1
-}
-
-if [[ -n "$noshare" ]]; then
-  for opt in ${noshare_opts}; do
-    addJava "$opt"
-  done
-else
-  case "$sbt_version" in
-    "0.7."* | "0.10."* | "0.11."* | "0.12."*)
-      [[ -n "$sbt_dir" ]] || {
-        sbt_dir="$HOME/.sbt/$sbt_version"
-        vlog "Using $sbt_dir as sbt dir, -sbt-dir to override."
-      }
-      ;;
-  esac
-
-  if [[ -n "$sbt_dir" ]]; then
-    addJava "-Dsbt.global.base=$sbt_dir"
-  fi
-fi
-
-if [[ -r "$jvm_opts_file" ]]; then
-  vlog "Using jvm options defined in file $jvm_opts_file"
-  while read -r opt; do extra_jvm_opts+=("$opt"); done < <(readConfigFile "$jvm_opts_file")
-elif [[ -n "$JVM_OPTS" && ! ("$JVM_OPTS" =~ ^@.*) ]]; then
-  vlog "Using jvm options defined in \$JVM_OPTS variable"
-  IFS=" " read -r -a extra_jvm_opts <<<"$JVM_OPTS"
-else
-  vlog "Using default jvm options"
-  IFS=" " read -r -a extra_jvm_opts <<<"$( default_jvm_opts)"
-fi
-
-# traceLevel is 0.12+
-[[ -n "$trace_level" ]] && setTraceLevel
-
-execRunner "$java_cmd" \
-  "${extra_jvm_opts[@]}" \
-  "${java_args[@]}" \
-  -jar "$sbt_jar" \
-  "${sbt_commands[@]}" \
-  "${residual_args[@]}"
diff --git a/src/asciidoctor/build.adoc b/src/asciidoctor/build.adoc
deleted file mode 100644
index 955501c..0000000
--- a/src/asciidoctor/build.adoc
+++ /dev/null
@@ -1,32 +0,0 @@
-////
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-////
-== Building From Source
-
-NOTE: The following information is for developers who wish to modify Log4j Scala API or contribute.
-If your goal is to add logging to your application, then you can use the link:build.html[pre-built binaries] instead.
-
-.Auditing
-[source,bash]
-----
-./sbt auditCheck
-----
-
-.Building
-[source,bash]
-----
-./sbt "+ package"
-----
diff --git a/src/asciidoctor/changes.adoc b/src/asciidoctor/changes.adoc
deleted file mode 100644
index 5e8a6e7..0000000
--- a/src/asciidoctor/changes.adoc
+++ /dev/null
@@ -1,55 +0,0 @@
-////
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-////
-== ChangeLog
-
-=== Version 12.1
-
-[vertical]
-New Features::
-[horizontal]
-LOG4J2-3184::: Add support for Scala 3.0.
-
-=== Version 12.0
-
-[vertical]
-New Features::
-[horizontal]
-LOG4J2-1882::: Migrate log4j-api-scala to sbt.
-LOG4J2-2303::: Add release distribution script.
-LOG4J2-2295::: Add OSGi metadata to release jars.
-LOG4J2-2294::: Add release audit information to build.
-LOG4J2-2298::: Add changelog to site.
-LOG4J2-2293::: Add required license files to sbt output artifacts.
-LOG4J2-2296::: Add sbt-site plugin and website configuration.
-LOG4J2-2291::: Add Jenkins pipeline for sbt build.
-LOG4J2-2668::: Add support for Scala 2.13.
-
-[vertical]
-Bug Fixes:: None.
-
-[vertical]
-Changes::
-[horizontal]
-LOG4J2-2309::: Update Log4j Scala API for 2.13 from 2.13.0-M2 to 2.13.0-M3.
-LOG4J2-2290::: Update Log4j from 2.9.1 to 2.13.2.
-LOG4J2-1995::: Update log4j-api-scala_2.11 from Scala 2.11.8 to 2.11.11.
-LOG4J2-1996::: Update log4j-api-scala_2.12 from Scala 2.12.1 to 2.12.3.
-LOG4J2-2115::: Update Log4j dependency from 2.8.1 to 2.9.1.
-LOG4J2-2116::: Update log4j-api-scala_2.12 from Scala 2.12.3 to 2.12.4.
-
-[vertical]
-Removed:: None.
diff --git a/src/asciidoctor/contributing.adoc b/src/asciidoctor/contributing.adoc
deleted file mode 100644
index 4730d54..0000000
--- a/src/asciidoctor/contributing.adoc
+++ /dev/null
@@ -1,66 +0,0 @@
-////
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-////
-== Contributing
-
-You have found a bug or you have an idea for a cool new feature?
-Contributing code is a great way to give something back to the open source community.
-Before you dig right into the code there are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
-
-=== Getting Started
-
-* Make sure you have a https://issues.apache.org/jira/[Jira account].
-* Make sure you have a https://github.com/signup/free[GitHub account].
-* If you're planning to implement a new feature it makes sense to discuss your changes on the https://logging.apache.org/log4j/2.x/mail-lists.html[dev list] first.
-  This way you can make sure you're not wasting your time on something that isn't considered to be in Apache Log4j's scope.
-* Submit a ticket for your issue, assuming one does not already exist.
-  * Clearly describe the issue including steps to reproduce when it is a bug.
-  * Make sure you fill in the earliest version that you know has the issue.
-* Fork the repository on GitHub.
-
-=== Making Changes
-
-* Create a topic branch from where you want to base your work (this is usually the master branch).
-* Make commits of logical units.
-* Respect the original code style:
-  * Only use spaces for indentation.
-  * Create minimal diffs - disable on save actions like reformat source code or organize imports.
-    If you feel the source code should be reformatted create a separate PR for this change.
-  * Check for unnecessary whitespace with `git diff --check` before committing.
-* Make sure your commit messages are in the proper format.
-  Your commit message should contain the key of the Jira issue.
-* Make sure you have added the necessary tests for your changes.
-* Run all the tests with `sbt "+ test"` to assure nothing else was accidentally broken.
-
-=== Making Trivial Changes
-
-For changes of a trivial nature to comments and documentation, it is not always necessary to create a new ticket in JIRA.
-In this case, it is appropriate to start the first line of a commit with '(doc)' instead of a ticket number.
-
-=== Submitting Changes
-
-* Sign the https://www.apache.org/licenses/#clas[Contributor License Agreement] if you haven't already.
-* Push your changes to a topic branch in your fork of the repository.
-* Submit a pull request to the repository in the apache organization.
-* Update your Jira ticket and include a link to the pull request in the ticket.
-
-=== Additional Resources
-
-* https://issues.apache.org/jira/browse/LOG4J2[Apache Log4j 2 Jira project page]
-* https://www.apache.org/licenses/#clas[Contributor License Agreement]
-* https://help.github.com/[General GitHub documentation]
-* https://help.github.com/send-pull-requests/[GitHub pull request documentation]
-
diff --git a/src/asciidoctor/download.adoc b/src/asciidoctor/download.adoc
deleted file mode 100644
index e096815..0000000
--- a/src/asciidoctor/download.adoc
+++ /dev/null
@@ -1,82 +0,0 @@
-////
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-////
-== Download
-
-Apache Log4j Scala API is distributed under the https://www.apache.org/licenses/LICENSE-2.0.html[Apache License, version 2.0].
-The link in the Mirrors column should display a list of available mirrors with a default selection based on your inferred location.
-If you do not see that page, try a different browser.
-The checksum and signature are links to the originals on the main distribution server.
-
-|===
-|Distribution |Mirrors |Signature |SHA-256 |SHA-512
-
-|Apache Log4j Scala API binary (tar.gz)
-|https://www.apache.org/dyn/closer.lua/logging/log4j/scala/{project-version}/apache-log4j-scala-{project-version}-bin.tar.gz[apache-log4j-scala-{project-version}-bin.tar.gz]
-|https://www.apache.org/dist/logging/log4j/scala/{project-version}/apache-log4j-scala-{project-version}-bin.tar.gz.asc[apache-log4j-scala-{project-version}-bin.tar.gz.asc]
-|https://www.apache.org/dist/logging/log4j/scala/{project-version}/apache-log4j-scala-{project-version}-bin.tar.gz.sha256[apache-log4j-scala-{project-version}-bin.tar.gz.sha256]
-|https://www.apache.org/dist/logging/log4j/scala/{project-version}/apache-log4j-scala-{project-version}-bin.tar.gz.sha512[apache-log4j-scala-{project-version}-bin.tar.gz.sha512]
-
-|Apache Log4j Scala API binary (zip)
-|https://www.apache.org/dyn/closer.lua/logging/log4j/scala/{project-version}/apache-log4j-scala-{project-version}-bin.zip[apache-log4j-scala-{project-version}-bin.zip]
-|https://www.apache.org/dist/logging/log4j/scala/{project-version}/apache-log4j-scala-{project-version}-bin.zip.asc[apache-log4j-scala-{project-version}-bin.zip.asc]
-|https://www.apache.org/dist/logging/log4j/scala/{project-version}/apache-log4j-scala-{project-version}-bin.zip.sha256[apache-log4j-scala-{project-version}-bin.zip.sha256]
-|https://www.apache.org/dist/logging/log4j/scala/{project-version}/apache-log4j-scala-{project-version}-bin.zip.asc[apache-log4j-scala-{project-version}-bin.zip.asc]
-
-|Apache Log4j Scala API source (tar.gz)
-|https://www.apache.org/dyn/closer.lua/logging/log4j/scala/{project-version}/apache-log4j-scala-{project-version}-src.tar.gz[apache-log4j-scala-{project-version}-src.tar.gz]
-|https://www.apache.org/dist/logging/log4j/scala/{project-version}/apache-log4j-scala-{project-version}-src.tar.gz.asc[apache-log4j-scala-{project-version}-src.tar.gz.asc]
-|https://www.apache.org/dist/logging/log4j/scala/{project-version}/apache-log4j-scala-{project-version}-src.tar.gz.sha256[apache-log4j-scala-{project-version}-src.tar.gz.sha256]
-|https://www.apache.org/dist/logging/log4j/scala/{project-version}/apache-log4j-scala-{project-version}-src.tar.gz.asc[apache-log4j-scala-{project-version}-src.tar.gz.asc]
-
-|Apache Log4j Scala API source (zip)
-|https://www.apache.org/dyn/closer.lua/logging/log4j/scala/{project-version}/apache-log4j-scala-{project-version}-src.zip[apache-log4j-scala-{project-version}-src.zip]
-|https://www.apache.org/dist/logging/log4j/scala/{project-version}/apache-log4j-scala-{project-version}-src.zip.asc[apache-log4j-scala-{project-version}-src.zip.asc]
-|https://www.apache.org/dist/logging/log4j/scala/{project-version}/apache-log4j-scala-{project-version}-src.zip.sha256[apache-log4j-scala-{project-version}-src.zip.sha256]
-|https://www.apache.org/dist/logging/log4j/scala/{project-version}/apache-log4j-scala-{project-version}-src.zip.asc[apache-log4j-scala-{project-version}-src.zip.asc]
-|===
-
-It is essential that you verify the integrity of the downloaded files using the PGP signatures or the SHA-2 checksum files (SHA-256 or SHA-512).
-Please read https://httpd.apache.org/dev/verification.html[Verifying Apache HTTP Server Releases] for more information on why you should verify our releases.
-
-The PGP signatures can be verified using PGP or GPG.
-First download the https://www.apache.org/dist/logging/KEYS[KEYS] as well as the asc signature file for the relevant distribution.
-Make sure you get these files from the https://www.apache.org/dist/logging/[main distribution directory], rather than from a mirror.
-Then verify the signatures using:
-
-[source,sh,subs=attributes]
-----
-gpg --import KEYS
-gpg --verify apache-log4j-scala-{project-version}-bin.tar.gz.asc apache-log4j-scala-{project-version}-bin.tar.gz
-gpg --verify apache-log4j-scala-{project-version}-bin.zip.asc apache-log4j-scala-{project-version}-bin.zip
-gpg --verify apache-log4j-scala-{project-version}-src.tar.gz.asc apache-log4j-scala-{project-version}-src.tar.gz
-gpg --verify apache-log4j-scala-{project-version}-src.zip.asc apache-log4j-scala-{project-version}-src.zip
-----
-
-Log4j Scala API requires https://logging.apache.org/log4j/2.x/download.html[Log4j API].
-
-=== Using SBT
-
-How to add Log4j Scala API to your project using Log4j 2:
-
-.build.sbt
-[source,scala,subs=attributes]
-----
-libraryDependencies ++= Seq(
-  "org.apache.logging.log4j" %% "log4j-api-scala" % "{project-version}",
-  "org.apache.logging.log4j" % "log4j-core" % "2.18.0" % Runtime
-)
-----
diff --git a/src/asciidoctor/index.adoc b/src/asciidoctor/index.adoc
deleted file mode 100644
index b1c80dc..0000000
--- a/src/asciidoctor/index.adoc
+++ /dev/null
@@ -1,42 +0,0 @@
-////
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-////
-= Apache Log4j Scala API
-:toc: left
-
-Log4j Scala API is a https://www.scala-lang.org/[Scala] logging facade based on https://logging.apache.org/log4j/2.x/[Log4j 2].
-Support for Scala versions 2.10, 2.11, and 2.12 is provided, and experimental support for pre-release versions of 2.13 is also provided.
-Log4j Scala API uses Log4j 2.x as its logging backend by default, but this can also be replaced with compatible libraries (e.g., https://logback.qos.ch/[Logback]).
-While this library is not required to use Log4j API in Scala, it does provide idiomatic Scala APIs which are friendlier to use in Scala programs than the Java APIs.
-
-include::usage.adoc[]
-
-include::download.adoc[]
-
-include::changes.adoc[]
-
-include::build.adoc[]
-
-include::contributing.adoc[]
-
-include::../../target/rat.adoc[]
-
-////
-TODO:
-* Apache logo
-* Project links
-* Dependency report
-////
\ No newline at end of file
diff --git a/src/asciidoctor/usage.adoc b/src/asciidoctor/usage.adoc
deleted file mode 100644
index bfee882..0000000
--- a/src/asciidoctor/usage.adoc
+++ /dev/null
@@ -1,80 +0,0 @@
-////
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-////
-== Usage
-
-Using the Scala API is as simple as mixing in the https://logging.apache.org/log4j/scala/log4j-api-scala_2.12/scaladocs/org/apache/logging/log4j/scala/[`Logging`] trait to your class. Example:
-
-[source,scala]
-----
-import org.apache.logging.log4j.scala.Logging
-import org.apache.logging.log4j.Level
-
-class MyClass extends BaseClass with Logging {
-  def doStuff(): Unit = {
-    logger.info("Doing stuff")
-  }
-  def doStuffWithLevel(level: Level): Unit = {
-    logger(level, "Doing stuff with arbitrary level")
-  }
-  def doStuffWithUser(user: User): Unit = {
-    logger.info(s"Doing stuff with ${user.getName}.")
-  }
-}
-----
-
-=== API Documentation
-
-|===
-|Scala Version |API Link
-
-|Scala 2.10
-|link:api/2.10/[ScalaDocs]
-
-|Scala 2.11
-|link:api/2.11/[ScalaDocs]
-
-|Scala 2.12
-|link:api/2.12/[ScalaDocs]
-
-|Scala 2.13
-|link:api/2.13/[ScalaDocs]
-
-|Scala 3
-|link:api/3/docs/[ScalaDocs]
-|===
-
-=== Configuration
-
-Log4j Scala API uses https://logging.apache.org/log4j/2.x/manual/configuration.html[Log4j configuration] by default.
-This supports XML, properties files, and Java-based builders, as well as JSON and YAML with additional dependencies.
-
-=== Substituting Parameters
-
-Unlike in Java, Scala provides native functionality for string interpolation https://docs.scala-lang.org/overviews/core/string-interpolation.html[beginning in Scala 2.10].
-As all logger calls are implemented as macros, using string interpolation directly does not require additional if checks.
-For example:
-
-[source,scala]
-----
-logger.debug(s"Logging in user ${user.getName} with birthday ${user.calcBirthday}")
-----
-
-=== Logger Names
-
-Most logging implementations use a hierarchical scheme for matching logger names with logging configuration.
-In this scheme the logger name hierarchy is represented by '.' characters in the logger name, in a fashion very similar to the hierarchy used for Java/Scala package names.
-The `Logger` property added by the `Logging` trait follows this convention: the trait ensures the `Logger` is automatically named according to the class it is being used in.
diff --git a/src/changelog/.13.x.x/.release-notes.adoc.ftl b/src/changelog/.13.x.x/.release-notes.adoc.ftl
new file mode 100644
index 0000000..8ffd747
--- /dev/null
+++ b/src/changelog/.13.x.x/.release-notes.adoc.ftl
@@ -0,0 +1,43 @@
+////
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+////
+
+////
+    ██     ██  █████  ██████  ███    ██ ██ ███    ██  ██████  ██
+    ██     ██ ██   ██ ██   ██ ████   ██ ██ ████   ██ ██       ██
+    ██  █  ██ ███████ ██████  ██ ██  ██ ██ ██ ██  ██ ██   ███ ██
+    ██ ███ ██ ██   ██ ██   ██ ██  ██ ██ ██ ██  ██ ██ ██    ██
+     ███ ███  ██   ██ ██   ██ ██   ████ ██ ██   ████  ██████  ██
+
+    IF THIS FILE DOESN'T HAVE A `.ftl` SUFFIX, IT IS AUTO-GENERATED, DO NOT EDIT IT!
+
+    Version-specific release notes (`7.8.0.adoc`, etc.) are generated from `src/changelog/*/.release-notes.adoc.ftl`.
+    Auto-generation happens during `generate-sources` phase of Maven.
+    Hence, you must always
+
+    1. Find and edit the associated `.release-notes.adoc.ftl`
+    2. Run `./mvnw generate-sources`
+    3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
+////
+
+[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
+=== ${release.version}
+
+<#if release.date?has_content>Release date:: ${release.date}</#if>
+
+This minor release contains various bug fixes and improvements.
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/.13.x.x/LOG4J2-3184_add-scala-3.xml b/src/changelog/.13.x.x/LOG4J2-3184_add-scala-3.xml
new file mode 100644
index 0000000..4ba3b8b
--- /dev/null
+++ b/src/changelog/.13.x.x/LOG4J2-3184_add-scala-3.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       type="added">
+  <issue id="LOG4J2-3184" link="https://issues.apache.org/jira/browse/LOG4J2-3184"/>
+  <author id="github:pjfanning"/>
+  <author id="github:jvz"/>
+  <description format="asciidoc">Added support for Scala 3</description>
+</entry>
diff --git a/src/changelog/.13.x.x/java-17.xml b/src/changelog/.13.x.x/java-17.xml
new file mode 100644
index 0000000..32c5b1d
--- /dev/null
+++ b/src/changelog/.13.x.x/java-17.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       type="changed">
+  <author id="github:ppkarwasz"/>
+  <author id="github:vy"/>
+  <description format="asciidoc">Bumped the Java version to 17 (Scala 2.10 and 2.11 targets still require Java 8 that build switches to using `maven-toolchains-plugin`) </description>
+</entry>
diff --git a/src/changelog/.13.x.x/switch-to-github-actions.xml b/src/changelog/.13.x.x/switch-to-github-actions.xml
new file mode 100644
index 0000000..4d9ab44
--- /dev/null
+++ b/src/changelog/.13.x.x/switch-to-github-actions.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       type="changed">
+  <author id="github:vy"/>
+  <description format="asciidoc">Switch the CI to GitHub Actions</description>
+</entry>
diff --git a/src/changelog/.13.x.x/switch-to-maven.xml b/src/changelog/.13.x.x/switch-to-maven.xml
new file mode 100644
index 0000000..f6ce465
--- /dev/null
+++ b/src/changelog/.13.x.x/switch-to-maven.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       type="changed">
+  <author id="github:vy"/>
+  <description format="asciidoc">Switched from `sbt` to Maven to take advantage of `logging-parent` conveniences</description>
+</entry>
diff --git a/src/changelog/.13.x.x/switch-to-semver.xml b/src/changelog/.13.x.x/switch-to-semver.xml
new file mode 100644
index 0000000..e39fa90
--- /dev/null
+++ b/src/changelog/.13.x.x/switch-to-semver.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       type="changed">
+  <author id="github:vy"/>
+  <description format="asciidoc">Switched to semantic versioning</description>
+</entry>
diff --git a/src/changelog/.13.x.x/update_org_apache_logging_log4j_log4j_api.xml b/src/changelog/.13.x.x/update_org_apache_logging_log4j_log4j_api.xml
new file mode 100644
index 0000000..d577051
--- /dev/null
+++ b/src/changelog/.13.x.x/update_org_apache_logging_log4j_log4j_api.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       type="changed">
+  <author id="github:vy"/>
+  <description format="asciidoc">Updated `org.apache.logging.log4j:log4j-api` version to `2.20.0`</description>
+</entry>
diff --git a/src/changelog/.13.x.x/update_org_apache_logging_logging_parent.xml b/src/changelog/.13.x.x/update_org_apache_logging_logging_parent.xml
new file mode 100644
index 0000000..970c1a7
--- /dev/null
+++ b/src/changelog/.13.x.x/update_org_apache_logging_logging_parent.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to you under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
+       type="changed">
+  <author id="github:vy"/>
+  <description format="asciidoc">Update `org.apache.logging:logging-parent` to version `10.1.0`</description>
+</entry>
diff --git a/src/changelog/.13.x.x/use-changelog.xml b/src/changelog/.13.x.x/use-changelog.xml
new file mode 100644
index 0000000..04049f4
--- /dev/null
+++ b/src/changelog/.13.x.x/use-changelog.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to you under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       type="changed">
+  <author id="github:vy"/>
+  <description format="asciidoc">Started using `log4j-changelog`</description>
+</entry>
diff --git a/src/changelog/.changelog.adoc.ftl b/src/changelog/.changelog.adoc.ftl
new file mode 100644
index 0000000..ebd41f0
--- /dev/null
+++ b/src/changelog/.changelog.adoc.ftl
@@ -0,0 +1,26 @@
+<#--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to you under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<#if entriesByType?size gt 0>
+<#list entriesByType as entryType, entries>
+
+==== ${entryType?capitalize}
+
+<#list entries as entry>
+* ${entry.description.text?replace("\\s+", " ", "r")}<#if entry.issues?has_content> (<#list entry.issues as issue>${issue.link}[${issue.id}]<#if issue?has_next>, </#if></#list>)</#if>
+</#list>
+</#list>
+</#if>
diff --git a/src/changelog/.index.adoc.ftl b/src/changelog/.index.adoc.ftl
new file mode 100644
index 0000000..8c4ff21
--- /dev/null
+++ b/src/changelog/.index.adoc.ftl
@@ -0,0 +1,41 @@
+////
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+////
+
+////
+    ██     ██  █████  ██████  ███    ██ ██ ███    ██  ██████  ██
+    ██     ██ ██   ██ ██   ██ ████   ██ ██ ████   ██ ██       ██
+    ██  █  ██ ███████ ██████  ██ ██  ██ ██ ██ ██  ██ ██   ███ ██
+    ██ ███ ██ ██   ██ ██   ██ ██  ██ ██ ██ ██  ██ ██ ██    ██
+     ███ ███  ██   ██ ██   ██ ██   ████ ██ ██   ████  ██████  ██
+
+    IF THIS FILE IS CALLED `index.adoc`, IT IS AUTO-GENERATED, DO NOT EDIT IT!
+
+    Release notes `index.adoc` is generated from `src/changelog/.index.adoc.ftl`.
+    Auto-generation happens during `generate-sources` phase of Maven.
+    Hence, you must always
+
+    1. Edit `.index.adoc.ftl`
+    2. Run `./mvnw generate-sources`
+    3. Commit both `.index.adoc.ftl` and the generated `.index.adoc`
+////
+
+[#release-notes]
+== Release Notes
+
+<#list releases as release><#if release.changelogEntryCount gt 0>
+include::_release-notes/_${release.version}.adoc[]
+</#if></#list>
diff --git a/src/changelog/12.0/.release-notes.adoc.ftl b/src/changelog/12.0/.release-notes.adoc.ftl
new file mode 100644
index 0000000..a3c917c
--- /dev/null
+++ b/src/changelog/12.0/.release-notes.adoc.ftl
@@ -0,0 +1,43 @@
+////
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+////
+
+////
+    ██     ██  █████  ██████  ███    ██ ██ ███    ██  ██████  ██
+    ██     ██ ██   ██ ██   ██ ████   ██ ██ ████   ██ ██       ██
+    ██  █  ██ ███████ ██████  ██ ██  ██ ██ ██ ██  ██ ██   ███ ██
+    ██ ███ ██ ██   ██ ██   ██ ██  ██ ██ ██ ██  ██ ██ ██    ██
+     ███ ███  ██   ██ ██   ██ ██   ████ ██ ██   ████  ██████  ██
+
+    IF THIS FILE DOESN'T HAVE A `.ftl` SUFFIX, IT IS AUTO-GENERATED, DO NOT EDIT IT!
+
+    Version-specific release notes (`7.8.0.adoc`, etc.) are generated from `src/changelog/*/.release-notes.adoc.ftl`.
+    Auto-generation happens during `generate-sources` phase of Maven.
+    Hence, you must always
+
+    1. Find and edit the associated `.release-notes.adoc.ftl`
+    2. Run `./mvnw generate-sources`
+    3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
+////
+
+[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
+=== ${release.version}
+
+<#if release.date?has_content>Release date:: ${release.date}</#if>
+
+This is the first release of the project.
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/12.0/.release.xml b/src/changelog/12.0/.release.xml
new file mode 100644
index 0000000..cbe6425
--- /dev/null
+++ b/src/changelog/12.0/.release.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to you under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<release xmlns="http://logging.apache.org/log4j/changelog"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+         date="2020-05-03" version="12.0"/>
diff --git a/src/changelog/12.0/LOG4J2-1882_migrate-to-sbt.xml b/src/changelog/12.0/LOG4J2-1882_migrate-to-sbt.xml
new file mode 100644
index 0000000..384bb36
--- /dev/null
+++ b/src/changelog/12.0/LOG4J2-1882_migrate-to-sbt.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       type="changed">
+  <issue id="LOG4J2-1882" link="https://issues.apache.org/jira/browse/LOG4J2-1882"/>
+  <author id="github:vy"/>
+  <description format="asciidoc">Switched from `sbt` to Maven to take advantage of `logging-parent` conveniences</description>
+</entry>
diff --git a/src/changelog/12.0/LOG4J2-2291_add-Jenkins.xml b/src/changelog/12.0/LOG4J2-2291_add-Jenkins.xml
new file mode 100644
index 0000000..4c7c0d2
--- /dev/null
+++ b/src/changelog/12.0/LOG4J2-2291_add-Jenkins.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       type="added">
+  <issue id="LOG4J2-2291" link="https://issues.apache.org/jira/browse/LOG4J2-2291"/>
+  <author id="github:jvz"/>
+  <description format="asciidoc">Added Jenkins pipeline for `sbt` build</description>
+</entry>
diff --git a/src/changelog/12.0/LOG4J2-2293_add-license-files.xml b/src/changelog/12.0/LOG4J2-2293_add-license-files.xml
new file mode 100644
index 0000000..2fef1a3
--- /dev/null
+++ b/src/changelog/12.0/LOG4J2-2293_add-license-files.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       type="added">
+  <issue id="LOG4J2-2293" link="https://issues.apache.org/jira/browse/LOG4J2-2293"/>
+  <author id="github:jvz"/>
+  <description format="asciidoc">Added required license files to `sbt` output artifacts</description>
+</entry>
diff --git a/src/changelog/12.0/LOG4J2-2294_rat-plugin.xml b/src/changelog/12.0/LOG4J2-2294_rat-plugin.xml
new file mode 100644
index 0000000..5b63805
--- /dev/null
+++ b/src/changelog/12.0/LOG4J2-2294_rat-plugin.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       type="added">
+  <issue id="LOG4J2-2294" link="https://issues.apache.org/jira/browse/LOG4J2-2294"/>
+  <author id="github:jvz"/>
+  <description format="asciidoc">Added `apache-rat-plugin` reports</description>
+</entry>
diff --git a/src/changelog/12.0/LOG4J2-2295_add-osgi-descriptor.xml b/src/changelog/12.0/LOG4J2-2295_add-osgi-descriptor.xml
new file mode 100644
index 0000000..4fc72b6
--- /dev/null
+++ b/src/changelog/12.0/LOG4J2-2295_add-osgi-descriptor.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       type="added">
+  <issue id="LOG4J2-2295" link="https://issues.apache.org/jira/browse/LOG4J2-2295"/>
+  <author id="github:jvz"/>
+  <description format="asciidoc">Added OSGi descriptors</description>
+</entry>
diff --git a/src/changelog/12.0/LOG4J2-2296_add-site.xml b/src/changelog/12.0/LOG4J2-2296_add-site.xml
new file mode 100644
index 0000000..e7658e9
--- /dev/null
+++ b/src/changelog/12.0/LOG4J2-2296_add-site.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       type="added">
+  <issue id="LOG4J2-2296" link="https://issues.apache.org/jira/browse/LOG4J2-2296"/>
+  <author id="github:jvz"/>
+  <description format="asciidoc">Added `sbt-site` plugin and website configuration</description>
+</entry>
diff --git a/src/changelog/12.0/LOG4J2-2298_add-changelog.xml b/src/changelog/12.0/LOG4J2-2298_add-changelog.xml
new file mode 100644
index 0000000..65400be
--- /dev/null
+++ b/src/changelog/12.0/LOG4J2-2298_add-changelog.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       type="added">
+  <issue id="LOG4J2-2298" link="https://issues.apache.org/jira/browse/LOG4J2-2298"/>
+  <author id="github:jvz"/>
+  <description format="asciidoc">Added changelog to site</description>
+</entry>
diff --git a/src/changelog/12.0/LOG4J2-2303_release-distribution-script.xml b/src/changelog/12.0/LOG4J2-2303_release-distribution-script.xml
new file mode 100644
index 0000000..4a9e7b5
--- /dev/null
+++ b/src/changelog/12.0/LOG4J2-2303_release-distribution-script.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       type="changed">
+  <issue id="LOG4J2-2303" link="https://issues.apache.org/jira/browse/LOG4J2-2303"/>
+  <author id="github:jvz"/>
+  <description format="asciidoc">Added release distribution script</description>
+</entry>
diff --git a/src/changelog/12.0/LOG4J2-2668_add-scala-2_13.xml b/src/changelog/12.0/LOG4J2-2668_add-scala-2_13.xml
new file mode 100644
index 0000000..1899eb5
--- /dev/null
+++ b/src/changelog/12.0/LOG4J2-2668_add-scala-2_13.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+       type="added">
+  <issue id="LOG4J2-2668" link="https://issues.apache.org/jira/browse/LOG4J2-2668"/>
+  <author id="github:jvz"/>
+  <description format="asciidoc">Added support for Scala 2.13</description>
+</entry>
diff --git a/src/main/scala-2.10/org/apache/logging/log4j/scala/LoggerMacro.scala b/src/main/scala-2.10/org/apache/logging/log4j/scala/LoggerMacro.scala
deleted file mode 100644
index c30dfee..0000000
--- a/src/main/scala-2.10/org/apache/logging/log4j/scala/LoggerMacro.scala
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.scala
-
-import org.apache.logging.log4j.message.Message
-import org.apache.logging.log4j.{Level, Marker}
-
-import scala.language.experimental.macros
-import scala.reflect.macros.Context
-
-/**
-  * Inspired from [[https://github.com/typesafehub/scalalogging ScalaLogging]].
-  */
-private object LoggerMacro {
-
-  type LoggerContext = Context {type PrefixType = Logger}
-
-
-  def fatalMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) =
-    logMarkerMsg(c)(c.universe.reify(Level.FATAL), marker, message)
-
-  def fatalMarkerCseq(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) =
-    logMarkerCseq(c)(c.universe.reify(Level.FATAL), marker, message)
-
-  def fatalMarkerObject(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef]) =
-    logMarkerObject(c)(c.universe.reify(Level.FATAL), marker, message)
-
-  def fatalMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMarkerMsgThrowable(c)(c.universe.reify(Level.FATAL), marker, message, cause)
-
-  def fatalMarkerCseqThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logMarkerCseqThrowable(c)(c.universe.reify(Level.FATAL), marker, message, cause)
-
-  def fatalMarkerObjectThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logMarkerObjectThrowable(c)(c.universe.reify(Level.FATAL), marker, message, cause)
-
-  def fatalMsg(c: LoggerContext)(message: c.Expr[Message]) =
-    logMsg(c)(c.universe.reify(Level.FATAL), message)
-
-  def fatalCseq(c: LoggerContext)(message: c.Expr[CharSequence]) =
-    logCseq(c)(c.universe.reify(Level.FATAL), message)
-
-  def fatalObject(c: LoggerContext)(message: c.Expr[AnyRef]) =
-    logObject(c)(c.universe.reify(Level.FATAL), message)
-
-  def fatalMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMsgThrowable(c)(c.universe.reify(Level.FATAL), message, cause)
-
-  def fatalCseqThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logCseqThrowable(c)(c.universe.reify(Level.FATAL), message, cause)
-
-  def fatalObjectThrowable(c: LoggerContext)(message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logObjectThrowable(c)(c.universe.reify(Level.FATAL), message, cause)
-
-
-  def errorMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) =
-    logMarkerMsg(c)(c.universe.reify(Level.ERROR), marker, message)
-
-  def errorMarkerCseq(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) =
-    logMarkerCseq(c)(c.universe.reify(Level.ERROR), marker, message)
-
-  def errorMarkerObject(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef]) =
-    logMarkerObject(c)(c.universe.reify(Level.ERROR), marker, message)
-
-  def errorMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMarkerMsgThrowable(c)(c.universe.reify(Level.ERROR), marker, message, cause)
-
-  def errorMarkerCseqThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logMarkerCseqThrowable(c)(c.universe.reify(Level.ERROR), marker, message, cause)
-
-  def errorMarkerObjectThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logMarkerObjectThrowable(c)(c.universe.reify(Level.ERROR), marker, message, cause)
-
-  def errorMsg(c: LoggerContext)(message: c.Expr[Message]) =
-    logMsg(c)(c.universe.reify(Level.ERROR), message)
-
-  def errorCseq(c: LoggerContext)(message: c.Expr[CharSequence]) =
-    logCseq(c)(c.universe.reify(Level.ERROR), message)
-
-  def errorObject(c: LoggerContext)(message: c.Expr[AnyRef]) =
-    logObject(c)(c.universe.reify(Level.ERROR), message)
-
-  def errorMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMsgThrowable(c)(c.universe.reify(Level.ERROR), message, cause)
-
-  def errorCseqThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logCseqThrowable(c)(c.universe.reify(Level.ERROR), message, cause)
-
-  def errorObjectThrowable(c: LoggerContext)(message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logObjectThrowable(c)(c.universe.reify(Level.ERROR), message, cause)
-
-
-  def warnMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) =
-    logMarkerMsg(c)(c.universe.reify(Level.WARN), marker, message)
-
-  def warnMarkerCseq(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) =
-    logMarkerCseq(c)(c.universe.reify(Level.WARN), marker, message)
-
-  def warnMarkerObject(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef]) =
-    logMarkerObject(c)(c.universe.reify(Level.WARN), marker, message)
-
-  def warnMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMarkerMsgThrowable(c)(c.universe.reify(Level.WARN), marker, message, cause)
-
-  def warnMarkerCseqThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logMarkerCseqThrowable(c)(c.universe.reify(Level.WARN), marker, message, cause)
-
-  def warnMarkerObjectThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logMarkerObjectThrowable(c)(c.universe.reify(Level.WARN), marker, message, cause)
-
-  def warnMsg(c: LoggerContext)(message: c.Expr[Message]) =
-    logMsg(c)(c.universe.reify(Level.WARN), message)
-
-  def warnCseq(c: LoggerContext)(message: c.Expr[CharSequence]) =
-    logCseq(c)(c.universe.reify(Level.WARN), message)
-
-  def warnObject(c: LoggerContext)(message: c.Expr[AnyRef]) =
-    logObject(c)(c.universe.reify(Level.WARN), message)
-
-  def warnMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMsgThrowable(c)(c.universe.reify(Level.WARN), message, cause)
-
-  def warnCseqThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logCseqThrowable(c)(c.universe.reify(Level.WARN), message, cause)
-
-  def warnObjectThrowable(c: LoggerContext)(message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logObjectThrowable(c)(c.universe.reify(Level.WARN), message, cause)
-
-
-  def infoMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) =
-    logMarkerMsg(c)(c.universe.reify(Level.INFO), marker, message)
-
-  def infoMarkerCseq(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) =
-    logMarkerCseq(c)(c.universe.reify(Level.INFO), marker, message)
-
-  def infoMarkerObject(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef]) =
-    logMarkerObject(c)(c.universe.reify(Level.INFO), marker, message)
-
-  def infoMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMarkerMsgThrowable(c)(c.universe.reify(Level.INFO), marker, message, cause)
-
-  def infoMarkerCseqThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logMarkerCseqThrowable(c)(c.universe.reify(Level.INFO), marker, message, cause)
-
-  def infoMarkerObjectThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logMarkerObjectThrowable(c)(c.universe.reify(Level.INFO), marker, message, cause)
-
-  def infoMsg(c: LoggerContext)(message: c.Expr[Message]) =
-    logMsg(c)(c.universe.reify(Level.INFO), message)
-
-  def infoCseq(c: LoggerContext)(message: c.Expr[CharSequence]) =
-    logCseq(c)(c.universe.reify(Level.INFO), message)
-
-  def infoObject(c: LoggerContext)(message: c.Expr[AnyRef]) =
-    logObject(c)(c.universe.reify(Level.INFO), message)
-
-  def infoMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMsgThrowable(c)(c.universe.reify(Level.INFO), message, cause)
-
-  def infoCseqThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logCseqThrowable(c)(c.universe.reify(Level.INFO), message, cause)
-
-  def infoObjectThrowable(c: LoggerContext)(message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logObjectThrowable(c)(c.universe.reify(Level.INFO), message, cause)
-
-
-  def debugMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) =
-    logMarkerMsg(c)(c.universe.reify(Level.DEBUG), marker, message)
-
-  def debugMarkerCseq(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) =
-    logMarkerCseq(c)(c.universe.reify(Level.DEBUG), marker, message)
-
-  def debugMarkerObject(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef]) =
-    logMarkerObject(c)(c.universe.reify(Level.DEBUG), marker, message)
-
-  def debugMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMarkerMsgThrowable(c)(c.universe.reify(Level.DEBUG), marker, message, cause)
-
-  def debugMarkerCseqThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logMarkerCseqThrowable(c)(c.universe.reify(Level.DEBUG), marker, message, cause)
-
-  def debugMarkerObjectThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logMarkerObjectThrowable(c)(c.universe.reify(Level.DEBUG), marker, message, cause)
-
-  def debugMsg(c: LoggerContext)(message: c.Expr[Message]) =
-    logMsg(c)(c.universe.reify(Level.DEBUG), message)
-
-  def debugCseq(c: LoggerContext)(message: c.Expr[CharSequence]) =
-    logCseq(c)(c.universe.reify(Level.DEBUG), message)
-
-  def debugObject(c: LoggerContext)(message: c.Expr[AnyRef]) =
-    logObject(c)(c.universe.reify(Level.DEBUG), message)
-
-  def debugMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMsgThrowable(c)(c.universe.reify(Level.DEBUG), message, cause)
-
-  def debugCseqThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logCseqThrowable(c)(c.universe.reify(Level.DEBUG), message, cause)
-
-  def debugObjectThrowable(c: LoggerContext)(message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logObjectThrowable(c)(c.universe.reify(Level.DEBUG), message, cause)
-
-
-  def traceMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) =
-    logMarkerMsg(c)(c.universe.reify(Level.TRACE), marker, message)
-
-  def traceMarkerCseq(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) =
-    logMarkerCseq(c)(c.universe.reify(Level.TRACE), marker, message)
-
-  def traceMarkerObject(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef]) =
-    logMarkerObject(c)(c.universe.reify(Level.TRACE), marker, message)
-
-  def traceMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMarkerMsgThrowable(c)(c.universe.reify(Level.TRACE), marker, message, cause)
-
-  def traceMarkerCseqThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logMarkerCseqThrowable(c)(c.universe.reify(Level.TRACE), marker, message, cause)
-
-  def traceMarkerObjectThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logMarkerObjectThrowable(c)(c.universe.reify(Level.TRACE), marker, message, cause)
-
-  def traceMsg(c: LoggerContext)(message: c.Expr[Message]) =
-    logMsg(c)(c.universe.reify(Level.TRACE), message)
-
-  def traceCseq(c: LoggerContext)(message: c.Expr[CharSequence]) =
-    logCseq(c)(c.universe.reify(Level.TRACE), message)
-
-  def traceObject(c: LoggerContext)(message: c.Expr[AnyRef]) =
-    logObject(c)(c.universe.reify(Level.TRACE), message)
-
-  def traceMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMsgThrowable(c)(c.universe.reify(Level.TRACE), message, cause)
-
-  def traceCseqThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logCseqThrowable(c)(c.universe.reify(Level.TRACE), message, cause)
-
-  def traceObjectThrowable(c: LoggerContext)(message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logObjectThrowable(c)(c.universe.reify(Level.TRACE), message, cause)
-
-
-  def logMarkerMsg(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[Message]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice, marker.splice)) {
-        c.prefix.splice.logMessage(level.splice, marker.splice, message.splice, null)
-      }
-    )
-
-  def logMarkerCseq(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[CharSequence]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice, marker.splice)) {
-        c.prefix.splice.logMessage(level.splice, marker.splice, message.splice, null)
-      }
-    )
-
-  def logMarkerObject(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[AnyRef]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice, marker.splice)) {
-        c.prefix.splice.logMessage(level.splice, marker.splice, message.splice, null)
-      }
-    )
-
-  def logMarkerMsgThrowable(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice, marker.splice)) {
-        c.prefix.splice.logMessage(level.splice, marker.splice, message.splice, cause.splice)
-      }
-    )
-
-  def logMarkerCseqThrowable(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice, marker.splice)) {
-        c.prefix.splice.logMessage(level.splice, marker.splice, message.splice, cause.splice)
-      }
-    )
-
-  def logMarkerObjectThrowable(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice, marker.splice)) {
-        c.prefix.splice.logMessage(level.splice, marker.splice, message.splice, cause.splice)
-      }
-    )
-
-  def logMsg(c: LoggerContext)(level: c.Expr[Level], message: c.Expr[Message]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice)) {
-        c.prefix.splice.logMessage(level.splice, null, message.splice, null)
-      }
-    )
-
-  def logCseq(c: LoggerContext)(level: c.Expr[Level], message: c.Expr[CharSequence]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice)) {
-        c.prefix.splice.logMessage(level.splice, null, message.splice, null)
-      }
-    )
-
-  def logObject(c: LoggerContext)(level: c.Expr[Level], message: c.Expr[AnyRef]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice)) {
-        c.prefix.splice.logMessage(level.splice, null, message.splice, null)
-      }
-    )
-
-  def logMsgThrowable(c: LoggerContext)(level: c.Expr[Level], message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice)) {
-        c.prefix.splice.logMessage(level.splice, null, message.splice, cause.splice)
-      }
-    )
-
-  def logCseqThrowable(c: LoggerContext)(level: c.Expr[Level], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice)) {
-        c.prefix.splice.logMessage(level.splice, null, message.splice, cause.splice)
-      }
-    )
-
-  def logObjectThrowable(c: LoggerContext)(level: c.Expr[Level], message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice)) {
-        c.prefix.splice.logMessage(level.splice, null, message.splice, cause.splice)
-      }
-    )
-
-}
diff --git a/src/main/scala-2.11+/org/apache/logging/log4j/scala/LoggerMacro.scala b/src/main/scala-2.11+/org/apache/logging/log4j/scala/LoggerMacro.scala
deleted file mode 100644
index c8b5301..0000000
--- a/src/main/scala-2.11+/org/apache/logging/log4j/scala/LoggerMacro.scala
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.scala
-
-import org.apache.logging.log4j.message.Message
-import org.apache.logging.log4j.{Level, Marker}
-
-import scala.language.experimental.macros
-import scala.reflect.macros.blackbox
-
-/**
-  * Inspired from [[https://github.com/typesafehub/scalalogging ScalaLogging]].
-  */
-private object LoggerMacro {
-
-  type LoggerContext = blackbox.Context { type PrefixType = Logger }
-
-
-  def fatalMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) =
-    logMarkerMsg(c)(c.universe.reify(Level.FATAL), marker, message)
-
-  def fatalMarkerCseq(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) =
-    logMarkerCseq(c)(c.universe.reify(Level.FATAL), marker, message)
-
-  def fatalMarkerObject(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef]) =
-    logMarkerObject(c)(c.universe.reify(Level.FATAL), marker, message)
-
-  def fatalMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMarkerMsgThrowable(c)(c.universe.reify(Level.FATAL), marker, message, cause)
-
-  def fatalMarkerCseqThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logMarkerCseqThrowable(c)(c.universe.reify(Level.FATAL), marker, message, cause)
-
-  def fatalMarkerObjectThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logMarkerObjectThrowable(c)(c.universe.reify(Level.FATAL), marker, message, cause)
-
-  def fatalMsg(c: LoggerContext)(message: c.Expr[Message]) =
-    logMsg(c)(c.universe.reify(Level.FATAL), message)
-
-  def fatalCseq(c: LoggerContext)(message: c.Expr[CharSequence]) =
-    logCseq(c)(c.universe.reify(Level.FATAL), message)
-
-  def fatalObject(c: LoggerContext)(message: c.Expr[AnyRef]) =
-    logObject(c)(c.universe.reify(Level.FATAL), message)
-
-  def fatalMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMsgThrowable(c)(c.universe.reify(Level.FATAL), message, cause)
-
-  def fatalCseqThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logCseqThrowable(c)(c.universe.reify(Level.FATAL), message, cause)
-
-  def fatalObjectThrowable(c: LoggerContext)(message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logObjectThrowable(c)(c.universe.reify(Level.FATAL), message, cause)
-
-
-  def errorMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) =
-    logMarkerMsg(c)(c.universe.reify(Level.ERROR), marker, message)
-
-  def errorMarkerCseq(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) =
-    logMarkerCseq(c)(c.universe.reify(Level.ERROR), marker, message)
-
-  def errorMarkerObject(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef]) =
-    logMarkerObject(c)(c.universe.reify(Level.ERROR), marker, message)
-
-  def errorMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMarkerMsgThrowable(c)(c.universe.reify(Level.ERROR), marker, message, cause)
-
-  def errorMarkerCseqThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logMarkerCseqThrowable(c)(c.universe.reify(Level.ERROR), marker, message, cause)
-
-  def errorMarkerObjectThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logMarkerObjectThrowable(c)(c.universe.reify(Level.ERROR), marker, message, cause)
-
-  def errorMsg(c: LoggerContext)(message: c.Expr[Message]) =
-    logMsg(c)(c.universe.reify(Level.ERROR), message)
-
-  def errorCseq(c: LoggerContext)(message: c.Expr[CharSequence]) =
-    logCseq(c)(c.universe.reify(Level.ERROR), message)
-
-  def errorObject(c: LoggerContext)(message: c.Expr[AnyRef]) =
-    logObject(c)(c.universe.reify(Level.ERROR), message)
-
-  def errorMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMsgThrowable(c)(c.universe.reify(Level.ERROR), message, cause)
-
-  def errorCseqThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logCseqThrowable(c)(c.universe.reify(Level.ERROR), message, cause)
-
-  def errorObjectThrowable(c: LoggerContext)(message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logObjectThrowable(c)(c.universe.reify(Level.ERROR), message, cause)
-
-
-  def warnMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) =
-    logMarkerMsg(c)(c.universe.reify(Level.WARN), marker, message)
-
-  def warnMarkerCseq(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) =
-    logMarkerCseq(c)(c.universe.reify(Level.WARN), marker, message)
-
-  def warnMarkerObject(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef]) =
-    logMarkerObject(c)(c.universe.reify(Level.WARN), marker, message)
-
-  def warnMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMarkerMsgThrowable(c)(c.universe.reify(Level.WARN), marker, message, cause)
-
-  def warnMarkerCseqThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logMarkerCseqThrowable(c)(c.universe.reify(Level.WARN), marker, message, cause)
-
-  def warnMarkerObjectThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logMarkerObjectThrowable(c)(c.universe.reify(Level.WARN), marker, message, cause)
-
-  def warnMsg(c: LoggerContext)(message: c.Expr[Message]) =
-    logMsg(c)(c.universe.reify(Level.WARN), message)
-
-  def warnCseq(c: LoggerContext)(message: c.Expr[CharSequence]) =
-    logCseq(c)(c.universe.reify(Level.WARN), message)
-
-  def warnObject(c: LoggerContext)(message: c.Expr[AnyRef]) =
-    logObject(c)(c.universe.reify(Level.WARN), message)
-
-  def warnMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMsgThrowable(c)(c.universe.reify(Level.WARN), message, cause)
-
-  def warnCseqThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logCseqThrowable(c)(c.universe.reify(Level.WARN), message, cause)
-
-  def warnObjectThrowable(c: LoggerContext)(message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logObjectThrowable(c)(c.universe.reify(Level.WARN), message, cause)
-
-
-  def infoMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) =
-    logMarkerMsg(c)(c.universe.reify(Level.INFO), marker, message)
-
-  def infoMarkerCseq(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) =
-    logMarkerCseq(c)(c.universe.reify(Level.INFO), marker, message)
-
-  def infoMarkerObject(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef]) =
-    logMarkerObject(c)(c.universe.reify(Level.INFO), marker, message)
-
-  def infoMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMarkerMsgThrowable(c)(c.universe.reify(Level.INFO), marker, message, cause)
-
-  def infoMarkerCseqThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logMarkerCseqThrowable(c)(c.universe.reify(Level.INFO), marker, message, cause)
-
-  def infoMarkerObjectThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logMarkerObjectThrowable(c)(c.universe.reify(Level.INFO), marker, message, cause)
-
-  def infoMsg(c: LoggerContext)(message: c.Expr[Message]) =
-    logMsg(c)(c.universe.reify(Level.INFO), message)
-
-  def infoCseq(c: LoggerContext)(message: c.Expr[CharSequence]) =
-    logCseq(c)(c.universe.reify(Level.INFO), message)
-
-  def infoObject(c: LoggerContext)(message: c.Expr[AnyRef]) =
-    logObject(c)(c.universe.reify(Level.INFO), message)
-
-  def infoMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMsgThrowable(c)(c.universe.reify(Level.INFO), message, cause)
-
-  def infoCseqThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logCseqThrowable(c)(c.universe.reify(Level.INFO), message, cause)
-
-  def infoObjectThrowable(c: LoggerContext)(message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logObjectThrowable(c)(c.universe.reify(Level.INFO), message, cause)
-
-
-  def debugMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) =
-    logMarkerMsg(c)(c.universe.reify(Level.DEBUG), marker, message)
-
-  def debugMarkerCseq(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) =
-    logMarkerCseq(c)(c.universe.reify(Level.DEBUG), marker, message)
-
-  def debugMarkerObject(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef]) =
-    logMarkerObject(c)(c.universe.reify(Level.DEBUG), marker, message)
-
-  def debugMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMarkerMsgThrowable(c)(c.universe.reify(Level.DEBUG), marker, message, cause)
-
-  def debugMarkerCseqThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logMarkerCseqThrowable(c)(c.universe.reify(Level.DEBUG), marker, message, cause)
-
-  def debugMarkerObjectThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logMarkerObjectThrowable(c)(c.universe.reify(Level.DEBUG), marker, message, cause)
-
-  def debugMsg(c: LoggerContext)(message: c.Expr[Message]) =
-    logMsg(c)(c.universe.reify(Level.DEBUG), message)
-
-  def debugCseq(c: LoggerContext)(message: c.Expr[CharSequence]) =
-    logCseq(c)(c.universe.reify(Level.DEBUG), message)
-
-  def debugObject(c: LoggerContext)(message: c.Expr[AnyRef]) =
-    logObject(c)(c.universe.reify(Level.DEBUG), message)
-
-  def debugMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMsgThrowable(c)(c.universe.reify(Level.DEBUG), message, cause)
-
-  def debugCseqThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logCseqThrowable(c)(c.universe.reify(Level.DEBUG), message, cause)
-
-  def debugObjectThrowable(c: LoggerContext)(message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logObjectThrowable(c)(c.universe.reify(Level.DEBUG), message, cause)
-
-
-  def traceMarkerMsg(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message]) =
-    logMarkerMsg(c)(c.universe.reify(Level.TRACE), marker, message)
-
-  def traceMarkerCseq(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence]) =
-    logMarkerCseq(c)(c.universe.reify(Level.TRACE), marker, message)
-
-  def traceMarkerObject(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef]) =
-    logMarkerObject(c)(c.universe.reify(Level.TRACE), marker, message)
-
-  def traceMarkerMsgThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMarkerMsgThrowable(c)(c.universe.reify(Level.TRACE), marker, message, cause)
-
-  def traceMarkerCseqThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logMarkerCseqThrowable(c)(c.universe.reify(Level.TRACE), marker, message, cause)
-
-  def traceMarkerObjectThrowable(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logMarkerObjectThrowable(c)(c.universe.reify(Level.TRACE), marker, message, cause)
-
-  def traceMsg(c: LoggerContext)(message: c.Expr[Message]) =
-    logMsg(c)(c.universe.reify(Level.TRACE), message)
-
-  def traceCseq(c: LoggerContext)(message: c.Expr[CharSequence]) =
-    logCseq(c)(c.universe.reify(Level.TRACE), message)
-
-  def traceObject(c: LoggerContext)(message: c.Expr[AnyRef]) =
-    logObject(c)(c.universe.reify(Level.TRACE), message)
-
-  def traceMsgThrowable(c: LoggerContext)(message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    logMsgThrowable(c)(c.universe.reify(Level.TRACE), message, cause)
-
-  def traceCseqThrowable(c: LoggerContext)(message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    logCseqThrowable(c)(c.universe.reify(Level.TRACE), message, cause)
-
-  def traceObjectThrowable(c: LoggerContext)(message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    logObjectThrowable(c)(c.universe.reify(Level.TRACE), message, cause)
-
-
-  def logMarkerMsg(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[Message]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice, marker.splice)) {
-        c.prefix.splice.logMessage(level.splice, marker.splice, message.splice, null)
-      }
-    )
-
-  def logMarkerCseq(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[CharSequence]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice, marker.splice)) {
-        c.prefix.splice.logMessage(level.splice, marker.splice, message.splice, null)
-      }
-    )
-
-  def logMarkerObject(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[AnyRef]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice, marker.splice)) {
-        c.prefix.splice.logMessage(level.splice, marker.splice, message.splice, null)
-      }
-    )
-
-  def logMarkerMsgThrowable(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice, marker.splice)) {
-        c.prefix.splice.logMessage(level.splice, marker.splice, message.splice, cause.splice)
-      }
-    )
-
-  def logMarkerCseqThrowable(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice, marker.splice)) {
-        c.prefix.splice.logMessage(level.splice, marker.splice, message.splice, cause.splice)
-      }
-    )
-
-  def logMarkerObjectThrowable(c: LoggerContext)(level: c.Expr[Level], marker: c.Expr[Marker], message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice, marker.splice)) {
-        c.prefix.splice.logMessage(level.splice, marker.splice, message.splice, cause.splice)
-      }
-    )
-
-  def logMsg(c: LoggerContext)(level: c.Expr[Level], message: c.Expr[Message]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice)) {
-        c.prefix.splice.logMessage(level.splice, null, message.splice, null)
-      }
-    )
-
-  def logCseq(c: LoggerContext)(level: c.Expr[Level], message: c.Expr[CharSequence]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice)) {
-        c.prefix.splice.logMessage(level.splice, null, message.splice, null)
-      }
-    )
-
-  def logObject(c: LoggerContext)(level: c.Expr[Level], message: c.Expr[AnyRef]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice)) {
-        c.prefix.splice.logMessage(level.splice, null, message.splice, null)
-      }
-    )
-
-  def logMsgThrowable(c: LoggerContext)(level: c.Expr[Level], message: c.Expr[Message], cause: c.Expr[Throwable]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice)) {
-        c.prefix.splice.logMessage(level.splice, null, message.splice, cause.splice)
-      }
-    )
-
-  def logCseqThrowable(c: LoggerContext)(level: c.Expr[Level], message: c.Expr[CharSequence], cause: c.Expr[Throwable]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice)) {
-        c.prefix.splice.logMessage(level.splice, null, message.splice, cause.splice)
-      }
-    )
-
-  def logObjectThrowable(c: LoggerContext)(level: c.Expr[Level], message: c.Expr[AnyRef], cause: c.Expr[Throwable]) =
-    c.universe.reify(
-      if (c.prefix.splice.delegate.isEnabled(level.splice)) {
-        c.prefix.splice.logMessage(level.splice, null, message.splice, cause.splice)
-      }
-    )
-
-}
diff --git a/src/main/scala-2.12-/org/apache/logging/log4j/scala/LoggingContext.scala b/src/main/scala-2.12-/org/apache/logging/log4j/scala/LoggingContext.scala
deleted file mode 100644
index 246ab02..0000000
--- a/src/main/scala-2.12-/org/apache/logging/log4j/scala/LoggingContext.scala
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.scala
-
-import org.apache.logging.log4j.ThreadContext
-
-import scala.collection.{immutable, mutable}
-import scala.collection.JavaConverters._
-
-/** Manages the context data (context map, MDC) that is added to log events.
-  *
-  * A wrapper around `org.apache.logging.log4j.ThreadContext`.
-  */
-object LoggingContext extends mutable.Map[String, String] {
-
-  override def +=(kv: (String, String)): LoggingContext.this.type = {
-    ThreadContext.put(kv._1, kv._2)
-    this
-  }
-
-  override def +=(elem1: (String, String), elem2: (String, String), elems: (String, String)*): LoggingContext.this.type = {
-    val builder = immutable.Map.newBuilder[String,String]
-    builder += elem1
-    builder += elem2
-    builder ++= elems
-    ThreadContext.putAll(builder.result.asJava)
-    this
-  }
-
-  override def ++=(xs: TraversableOnce[(String, String)]): LoggingContext.this.type = {
-    ThreadContext.putAll(xs.toMap.asJava)
-    this
-  }
-
-  override def -=(key: String): LoggingContext.this.type = {
-    ThreadContext.remove(key)
-    this
-  }
-
-  override def -=(elem1: String, elem2: String, elems: String*): LoggingContext.this.type = {
-    val builder = immutable.Seq.newBuilder[String]
-    builder += elem1
-    builder += elem2
-    builder ++= elems
-    ThreadContext.removeAll(builder.result.asJava)
-    this
-  }
-
-  override def --=(xs: TraversableOnce[String]): LoggingContext.this.type = {
-    ThreadContext.removeAll(xs.toSeq.asJava)
-    this
-  }
-
-  override def clear(): Unit = {
-    ThreadContext.clearMap()
-  }
-
-  override def contains(key: String): Boolean = ThreadContext.containsKey(key)
-
-  override def get(key: String): Option[String] = Option(ThreadContext.get(key))
-
-  override def iterator: Iterator[(String, String)] = ThreadContext.getImmutableContext.asScala.iterator
-
-  override def foreach[U](f: ((String, String)) => U): Unit = ThreadContext.getImmutableContext.asScala.foreach(f)
-
-  override def size: Int = ThreadContext.getImmutableContext.size()
-
-  override def isEmpty: Boolean = ThreadContext.isEmpty
-
-}
diff --git a/src/main/scala-2.13+/org/apache/logging/log4j/scala/LoggingContext.scala b/src/main/scala-2.13+/org/apache/logging/log4j/scala/LoggingContext.scala
deleted file mode 100644
index c21529c..0000000
--- a/src/main/scala-2.13+/org/apache/logging/log4j/scala/LoggingContext.scala
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.scala
-
-import org.apache.logging.log4j.ThreadContext
-
-import scala.jdk.CollectionConverters._
-import scala.collection.{immutable, mutable}
-
-/** Manages the context data (context map, MDC) that is added to log events.
-  *
-  * A wrapper around `org.apache.logging.log4j.ThreadContext`.
-  */
-object LoggingContext extends mutable.Map[String, String] {
-
-  override def addOne(kv: (String, String)): LoggingContext.this.type = {
-    ThreadContext.put(kv._1, kv._2)
-    this
-  }
-
-  override def addAll(xs: IterableOnce[(String, String)]): LoggingContext.this.type = {
-    ThreadContext.putAll(xs.iterator.to(Map).asJava)
-    this
-  }
-
-  override def subtractOne(key: String): LoggingContext.this.type = {
-    ThreadContext.remove(key)
-    this
-  }
-
-  override def -=(elem1: String, elem2: String, elems: String*): LoggingContext.this.type = {
-    val builder = immutable.Seq.newBuilder[String]
-    builder += elem1
-    builder += elem2
-    builder ++= elems
-    ThreadContext.removeAll(builder.result.asJava)
-    this
-  }
-
-  override def subtractAll(xs: IterableOnce[String]): LoggingContext.this.type = {
-    ThreadContext.removeAll(xs.iterator.to(Seq).asJava)
-    this
-  }
-
-  override def clear(): Unit = {
-    ThreadContext.clearMap()
-  }
-
-  override def contains(key: String): Boolean = ThreadContext.containsKey(key)
-
-  override def get(key: String): Option[String] = Option(ThreadContext.get(key))
-
-  override def iterator: Iterator[(String, String)] = ThreadContext.getImmutableContext.asScala.iterator
-
-  override def foreach[U](f: ((String, String)) => U): Unit = ThreadContext.getImmutableContext.asScala.foreach(f)
-
-  override def size: Int = ThreadContext.getImmutableContext.size()
-
-  override def isEmpty: Boolean = ThreadContext.isEmpty
-
-}
diff --git a/src/main/scala-2/org/apache/logging/log4j/scala/Logger.scala b/src/main/scala-2/org/apache/logging/log4j/scala/Logger.scala
deleted file mode 100644
index 1d0024f..0000000
--- a/src/main/scala-2/org/apache/logging/log4j/scala/Logger.scala
+++ /dev/null
@@ -1,596 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.scala
-
-import org.apache.logging.log4j.message.{EntryMessage, Message, MessageFactory2}
-import org.apache.logging.log4j.spi.ExtendedLogger
-import org.apache.logging.log4j.{Level, LogManager, Marker}
-
-import scala.language.experimental.macros
-
-/**
-  * Factory for [[Logger]]s.
-  *
-  * The [[Logging]] trait provides a simple way to get a properly named logger into a class.
-  */
-object Logger {
-
-  final val FQCN = getClass.getName
-
-    /**
-    * Create a properly named [[Logger]] for a given class.
-    *
-    * @param clazz the class
-    */
-  def apply(clazz: Class[_]): Logger = Logger(LogManager.getContext(clazz.getClassLoader, false).getLogger(clazz.getName))
-
-  /**
-    * Create a [[Logger]] wrapping the given Log4j logger.
-    *
-    * @param delegate the Log4j logger to wrap
-    */
-  def apply(delegate: ExtendedLogger): Logger = new Logger(delegate)
-
-}
-
-/**
-  * Scala wrapper for the Log4j `Logger` interface.
-  *
-  * Frequently the purpose of logging is to provide information about what is happening in the system,
-  * which requires including information about the objects being manipulated. In Scala, you can use
-  * [[http://docs.scala-lang.org/overviews/core/string-interpolation.html string interpolation]]
-  * to achieve this:
-  *
-  * {{{
-  * logger.debug(s"Logging in user ${user.getName} with birthday ${user.calcBirthday}")
-  * }}}
-  *
-  * Since this wrapper is implemented with macros, the String construction and method invocations
-  * will only occur when debug logging is enabled.
-  */
-class Logger private(val delegate: ExtendedLogger) extends AnyVal {
-
-  def fatal(marker: Marker, message: Message): Unit =
-  macro LoggerMacro.fatalMarkerMsg
-
-  def fatal(marker: Marker, message: CharSequence): Unit =
-  macro LoggerMacro.fatalMarkerCseq
-
-  def fatal(marker: Marker, message: AnyRef): Unit =
-  macro LoggerMacro.fatalMarkerObject
-
-  def fatal(marker: Marker, message: Message, cause: Throwable): Unit =
-  macro LoggerMacro.fatalMarkerMsgThrowable
-
-  def fatal(marker: Marker, message: CharSequence, cause: Throwable): Unit =
-  macro LoggerMacro.fatalMarkerCseqThrowable
-
-  def fatal(marker: Marker, message: AnyRef, cause: Throwable): Unit =
-  macro LoggerMacro.fatalMarkerObjectThrowable
-
-  def fatal(message: Message): Unit =
-  macro LoggerMacro.fatalMsg
-
-  def fatal(message: CharSequence): Unit =
-  macro LoggerMacro.fatalCseq
-
-  def fatal(message: AnyRef): Unit =
-  macro LoggerMacro.fatalObject
-
-  def fatal(message: Message, cause: Throwable): Unit =
-  macro LoggerMacro.fatalMsgThrowable
-
-  def fatal(message: CharSequence, cause: Throwable): Unit =
-  macro LoggerMacro.fatalCseqThrowable
-
-  def fatal(message: AnyRef, cause: Throwable): Unit =
-  macro LoggerMacro.fatalObjectThrowable
-
-
-  def error(marker: Marker, message: Message): Unit =
-  macro LoggerMacro.errorMarkerMsg
-
-  def error(marker: Marker, message: CharSequence): Unit =
-  macro LoggerMacro.errorMarkerCseq
-
-  def error(marker: Marker, message: AnyRef): Unit =
-  macro LoggerMacro.errorMarkerObject
-
-  def error(marker: Marker, message: Message, cause: Throwable): Unit =
-  macro LoggerMacro.errorMarkerMsgThrowable
-
-  def error(marker: Marker, message: CharSequence, cause: Throwable): Unit =
-  macro LoggerMacro.errorMarkerCseqThrowable
-
-  def error(marker: Marker, message: AnyRef, cause: Throwable): Unit =
-  macro LoggerMacro.errorMarkerObjectThrowable
-
-  def error(message: Message): Unit =
-  macro LoggerMacro.errorMsg
-
-  def error(message: CharSequence): Unit =
-  macro LoggerMacro.errorCseq
-
-  def error(message: AnyRef): Unit =
-  macro LoggerMacro.errorObject
-
-  def error(message: Message, cause: Throwable): Unit =
-  macro LoggerMacro.errorMsgThrowable
-
-  def error(message: CharSequence, cause: Throwable): Unit =
-  macro LoggerMacro.errorCseqThrowable
-
-  def error(message: AnyRef, cause: Throwable): Unit =
-  macro LoggerMacro.errorObjectThrowable
-
-
-  def warn(marker: Marker, message: Message): Unit =
-  macro LoggerMacro.warnMarkerMsg
-
-  def warn(marker: Marker, message: CharSequence): Unit =
-  macro LoggerMacro.warnMarkerCseq
-
-  def warn(marker: Marker, message: AnyRef): Unit =
-  macro LoggerMacro.warnMarkerObject
-
-  def warn(marker: Marker, message: Message, cause: Throwable): Unit =
-  macro LoggerMacro.warnMarkerMsgThrowable
-
-  def warn(marker: Marker, message: CharSequence, cause: Throwable): Unit =
-  macro LoggerMacro.warnMarkerCseqThrowable
-
-  def warn(marker: Marker, message: AnyRef, cause: Throwable): Unit =
-  macro LoggerMacro.warnMarkerObjectThrowable
-
-  def warn(message: Message): Unit =
-  macro LoggerMacro.warnMsg
-
-  def warn(message: CharSequence): Unit =
-  macro LoggerMacro.warnCseq
-
-  def warn(message: AnyRef): Unit =
-  macro LoggerMacro.warnObject
-
-  def warn(message: Message, cause: Throwable): Unit =
-  macro LoggerMacro.warnMsgThrowable
-
-  def warn(message: CharSequence, cause: Throwable): Unit =
-  macro LoggerMacro.warnCseqThrowable
-
-  def warn(message: AnyRef, cause: Throwable): Unit =
-  macro LoggerMacro.warnObjectThrowable
-
-
-  def info(marker: Marker, message: Message): Unit =
-  macro LoggerMacro.infoMarkerMsg
-
-  def info(marker: Marker, message: CharSequence): Unit =
-  macro LoggerMacro.infoMarkerCseq
-
-  def info(marker: Marker, message: AnyRef): Unit =
-  macro LoggerMacro.infoMarkerObject
-
-  def info(marker: Marker, message: Message, cause: Throwable): Unit =
-  macro LoggerMacro.infoMarkerMsgThrowable
-
-  def info(marker: Marker, message: CharSequence, cause: Throwable): Unit =
-  macro LoggerMacro.infoMarkerCseqThrowable
-
-  def info(marker: Marker, message: AnyRef, cause: Throwable): Unit =
-  macro LoggerMacro.infoMarkerObjectThrowable
-
-  def info(message: Message): Unit =
-  macro LoggerMacro.infoMsg
-
-  def info(message: CharSequence): Unit =
-  macro LoggerMacro.infoCseq
-
-  def info(message: AnyRef): Unit =
-  macro LoggerMacro.infoObject
-
-  def info(message: Message, cause: Throwable): Unit =
-  macro LoggerMacro.infoMsgThrowable
-
-  def info(message: CharSequence, cause: Throwable): Unit =
-  macro LoggerMacro.infoCseqThrowable
-
-  def info(message: AnyRef, cause: Throwable): Unit =
-  macro LoggerMacro.infoObjectThrowable
-
-
-  def debug(marker: Marker, message: Message): Unit =
-  macro LoggerMacro.debugMarkerMsg
-
-  def debug(marker: Marker, message: CharSequence): Unit =
-  macro LoggerMacro.debugMarkerCseq
-
-  def debug(marker: Marker, message: AnyRef): Unit =
-  macro LoggerMacro.debugMarkerObject
-
-  def debug(marker: Marker, message: Message, cause: Throwable): Unit =
-  macro LoggerMacro.debugMarkerMsgThrowable
-
-  def debug(marker: Marker, message: CharSequence, cause: Throwable): Unit =
-  macro LoggerMacro.debugMarkerCseqThrowable
-
-  def debug(marker: Marker, message: AnyRef, cause: Throwable): Unit =
-  macro LoggerMacro.debugMarkerObjectThrowable
-
-  def debug(message: Message): Unit =
-  macro LoggerMacro.debugMsg
-
-  def debug(message: CharSequence): Unit =
-  macro LoggerMacro.debugCseq
-
-  def debug(message: AnyRef): Unit =
-  macro LoggerMacro.debugObject
-
-  def debug(message: Message, cause: Throwable): Unit =
-  macro LoggerMacro.debugMsgThrowable
-
-  def debug(message: CharSequence, cause: Throwable): Unit =
-  macro LoggerMacro.debugCseqThrowable
-
-  def debug(message: AnyRef, cause: Throwable): Unit =
-  macro LoggerMacro.debugObjectThrowable
-
-
-  def trace(marker: Marker, message: Message): Unit =
-  macro LoggerMacro.traceMarkerMsg
-
-  def trace(marker: Marker, message: CharSequence): Unit =
-  macro LoggerMacro.traceMarkerCseq
-
-  def trace(marker: Marker, message: AnyRef): Unit =
-  macro LoggerMacro.traceMarkerObject
-
-  def trace(marker: Marker, message: Message, cause: Throwable): Unit =
-  macro LoggerMacro.traceMarkerMsgThrowable
-
-  def trace(marker: Marker, message: CharSequence, cause: Throwable): Unit =
-  macro LoggerMacro.traceMarkerCseqThrowable
-
-  def trace(marker: Marker, message: AnyRef, cause: Throwable): Unit =
-  macro LoggerMacro.traceMarkerObjectThrowable
-
-  def trace(message: Message): Unit =
-  macro LoggerMacro.traceMsg
-
-  def trace(message: CharSequence): Unit =
-  macro LoggerMacro.traceCseq
-
-  def trace(message: AnyRef): Unit =
-  macro LoggerMacro.traceObject
-
-  def trace(message: Message, cause: Throwable): Unit =
-  macro LoggerMacro.traceMsgThrowable
-
-  def trace(message: CharSequence, cause: Throwable): Unit =
-  macro LoggerMacro.traceCseqThrowable
-
-  def trace(message: AnyRef, cause: Throwable): Unit =
-  macro LoggerMacro.traceObjectThrowable
-
-
-  /**
-    * Logs a `Message` with the specific `Marker` at the given `Level`.
-    *
-    * @param level   the logging level
-    * @param marker  the marker data specific to this log statement
-    * @param message the message to be logged
-    */
-  def apply(level: Level, marker: Marker, message: Message): Unit =
-  macro LoggerMacro.logMarkerMsg
-
-  /**
-    * Logs a string with the specific `Marker` at the given `Level`.
-    *
-    * @param level   the logging level
-    * @param marker  the marker data specific to this log statement
-    * @param message the message to be logged
-    */
-  def apply(level: Level, marker: Marker, message: CharSequence): Unit =
-  macro LoggerMacro.logMarkerCseq
-
-  /**
-    * Logs an object with the specific `Marker` at the given `Level`.
-    *
-    * @param level   the logging level
-    * @param marker  the marker data specific to this log statement
-    * @param message the message to be logged
-    */
-  def apply(level: Level, marker: Marker, message: AnyRef): Unit =
-  macro LoggerMacro.logMarkerObject
-
-  /**
-    * Logs a `Message` with the specific `Marker` at the given `Level` including the stack trace
-    * of the given `Throwable`.
-    *
-    * @param level   the logging level
-    * @param marker  the marker data specific to this log statement
-    * @param message the message to be logged
-    * @param cause   the cause
-    */
-  def apply(level: Level, marker: Marker, message: Message, cause: Throwable): Unit =
-  macro LoggerMacro.logMarkerMsgThrowable
-
-  /**
-    * Logs a string with the specific `Marker` at the given `Level` including the stack trace
-    * of the given `Throwable`.
-    *
-    * @param level   the logging level
-    * @param marker  the marker data specific to this log statement
-    * @param message the message to be logged
-    * @param cause   the cause
-    */
-  def apply(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit =
-  macro LoggerMacro.logMarkerCseqThrowable
-
-  /**
-    * Logs an object with the specific `Marker` at the given `Level` including the stack trace
-    * of the given `Throwable`.
-    *
-    * @param level   the logging level
-    * @param marker  the marker data specific to this log statement
-    * @param message the message to be logged
-    * @param cause   the cause
-    */
-  def apply(level: Level, marker: Marker, message: AnyRef, cause: Throwable): Unit =
-  macro LoggerMacro.logMarkerObjectThrowable
-
-  /**
-    * Logs a `Message` at the given `Level`.
-    *
-    * @param level   the logging level
-    * @param message the message to be logged
-    */
-  def apply(level: Level, message: Message): Unit =
-  macro LoggerMacro.logMsg
-
-  /**
-    * Logs a string at the given `Level`.
-    *
-    * @param level   the logging level
-    * @param message the message to be logged
-    */
-  def apply(level: Level, message: CharSequence): Unit =
-  macro LoggerMacro.logCseq
-
-  /**
-    * Logs an object at the given `Level`.
-    *
-    * @param level   the logging level
-    * @param message the message to be logged
-    */
-  def apply(level: Level, message: AnyRef): Unit =
-  macro LoggerMacro.logObject
-
-  /**
-    * Logs a `Message` at the given `Level` including the stack trace of the given `Throwable`.
-    *
-    * @param level   the logging level
-    * @param message the message to be logged
-    * @param cause   a `Throwable`
-    */
-  def apply(level: Level, message: Message, cause: Throwable): Unit =
-  macro LoggerMacro.logMsgThrowable
-
-  /**
-    * Logs a string at the given `Level` including the stack trace of the given `Throwable`.
-    *
-    * @param level   the logging level
-    * @param message the message to be logged
-    * @param cause   a `Throwable`
-    */
-  def apply(level: Level, message: CharSequence, cause: Throwable): Unit =
-  macro LoggerMacro.logCseqThrowable
-
-  /**
-    * Logs an object at the given `Level` including the stack trace of the given `Throwable`.
-    *
-    * @param level   the logging level
-    * @param message the message to be logged
-    * @param cause   a `Throwable`
-    */
-  def apply(level: Level, message: AnyRef, cause: Throwable): Unit =
-  macro LoggerMacro.logObjectThrowable
-
-
-  /**
-    * Logs entry to a method. Used when the method in question has no parameters or when the parameters should not be
-    * logged.
-    *
-    * @return The built `EntryMessage`
-    */
-  def traceEntry(): EntryMessage =
-    delegate.traceEntry()
-
-  /**
-    * Logs entry to a method along with its parameters.
-    *
-    * {{{
-    * def doSomething(foo: String, bar: Int): Unit = {
-    *   logger.traceEntry(foo, bar)
-    *   // do something
-    * }
-    * }}}
-    *
-    * @param params the parameters to the method.
-    * @return The built `EntryMessage`
-    */
-  def traceEntry(params: AnyRef*): EntryMessage = {
-    params match {
-      case Seq() => delegate.traceEntry()
-      case seq => delegate.traceEntry(seq.head.toString, seq.tail:_*)
-    }
-  }
-
-  /**
-    * Logs entry to a method using a `Message` to describe the parameters.
-    *
-    * {{{
-    * def doSomething(foo: Request): Unit = {
-    *   logger.traceEntry(JsonMessage(foo))
-    *   // do something
-    * }
-    * }}}
-    *
-    * @param message the message
-    * @return The built `EntryMessage`
-    */
-  def traceEntry(message: Message): EntryMessage =
-    delegate.traceEntry(message)
-
-  /**
-    * Logs exit from a method with no result.
-    */
-  def traceExit(): Unit =
-    delegate.traceExit()
-
-  /**
-    * Logs exiting from a method with result.
-    *
-    * @param result The result being returned from the method call
-    * @return `result`
-    */
-  def traceExit[R](result: R): R =
-    delegate.traceExit(result)
-
-  /**
-    * Logs exiting from a method with no result.
-    *
-    * @param entryMessage the `EntryMessage` returned from one of the `traceEntry` methods
-    */
-  def traceExit(entryMessage: EntryMessage): Unit =
-    delegate.traceExit(entryMessage)
-
-  /**
-    * Logs exiting from a method with result.
-    *
-    * {{{
-    * def doSomething(foo: String, bar: Int): Int = {
-    *   val entryMessage = logger.traceEntry(foo, bar)
-    *   // do something
-    *   traceExit(entryMessage, value)
-    * }
-    * }}}
-    *
-    * @param entryMessage the `EntryMessage` returned from one of the `traceEntry` methods
-    * @param result       The result being returned from the method call
-    * @return `result`
-    */
-  def traceExit[R](entryMessage: EntryMessage, result: R): R =
-    delegate.traceExit(entryMessage, result)
-
-  /**
-    * Logs exiting from a method with result. Allows custom formatting of the result.
-    *
-    * @param message the Message containing the formatted result
-    * @param result  The result being returned from the method call.
-    * @return `result`
-    */
-  def traceExit[R](message: Message, result: R): R =
-    delegate.traceExit(message, result)
-
-  /**
-    * Logs an exception or error to be thrown.
-    *
-    * {{{
-    *   throw logger.throwing(myException)
-    * }}}
-    *
-    * @param t the Throwable
-    * @return `t`
-    */
-  def throwing[T <: Throwable](t: T): T =
-    delegate.throwing(t)
-
-  /**
-    * Logs an exception or error to be thrown to a specific logging level.
-    *
-    * {{{
-    *   throw logger.throwing(Level.DEBUG, myException)
-    * }}}
-    *
-    * @param level the logging Level.
-    * @param t     the Throwable
-    * @return `t`
-    */
-  def throwing[T <: Throwable](level: Level, t: T): T =
-    delegate.throwing(level, t)
-
-  /**
-    * Logs an exception or error that has been caught.
-    *
-    * @param t the Throwable.
-    */
-  def catching(t: Throwable): Unit =
-    delegate.catching(t)
-
-  /**
-    * Logs an exception or error that has been caught to a specific logging level.
-    *
-    * @param level The logging Level.
-    * @param t     The Throwable.
-    */
-  def catching(level: Level, t: Throwable): Unit =
-    delegate.catching(level, t)
-
-
-  /** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified
-    * level is enabled.
-    *
-    * Should normally not be used directly from application code, but needs to be public for access by macros.
-    *
-    * @param level   log level
-    * @param marker  marker or `null`
-    * @param message message
-    * @param cause   cause or `null`
-    */
-  def logMessage(level: Level, marker: Marker, message: Message, cause: Throwable): Unit = {
-    delegate.logMessage(Logger.FQCN, level, marker, message, cause)
-  }
-
-  /** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified
-    * level is enabled.
-    *
-    * Should normally not be used directly from application code, but needs to be public for access by macros.
-    *
-    * @param level   log level
-    * @param marker  marker or `null`
-    * @param message message
-    * @param cause   cause or `null`
-    */
-  def logMessage(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit = {
-    delegate.logMessage(Logger.FQCN, level, marker, delegate.getMessageFactory.asInstanceOf[MessageFactory2].newMessage(message), cause)
-  }
-
-  /** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified
-    * level is enabled.
-    *
-    * Should normally not be used directly from application code, but needs to be public for access by macros.
-    *
-    * @param level   log level
-    * @param marker  marker or `null`
-    * @param message message
-    * @param cause   cause or `null`
-    */
-  def logMessage(level: Level, marker: Marker, message: AnyRef, cause: Throwable): Unit = {
-    delegate.logMessage(Logger.FQCN, level, marker, delegate.getMessageFactory.asInstanceOf[MessageFactory2].newMessage(message), cause)
-  }
-
-}
diff --git a/src/main/scala-3/org/apache/logging/log4j/scala/Logger.scala b/src/main/scala-3/org/apache/logging/log4j/scala/Logger.scala
deleted file mode 100644
index 8184496..0000000
--- a/src/main/scala-3/org/apache/logging/log4j/scala/Logger.scala
+++ /dev/null
@@ -1,597 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.scala
-
-import org.apache.logging.log4j.message.{EntryMessage, Message, MessageFactory2}
-import org.apache.logging.log4j.spi.ExtendedLogger
-import org.apache.logging.log4j.{Level, LogManager, Marker}
-
-import scala.quoted.*
-
-/**
-  * Factory for [[Logger]]s.
-  *
-  * The [[Logging]] trait provides a simple way to get a properly named logger into a class.
-  */
-object Logger {
-
-  final val FQCN = getClass.getName
-
-    /**
-    * Create a properly named [[Logger]] for a given class.
-    *
-    * @param clazz the class
-    */
-  def apply(clazz: Class[_]): Logger = Logger(LogManager.getContext(clazz.getClassLoader, false).getLogger(clazz.getName))
-
-  /**
-    * Create a [[Logger]] wrapping the given Log4j logger.
-    *
-    * @param delegate the Log4j logger to wrap
-    */
-  def apply(delegate: ExtendedLogger): Logger = new Logger(delegate)
-
-}
-
-/**
-  * Scala wrapper for the Log4j `Logger` interface.
-  *
-  * Frequently the purpose of logging is to provide information about what is happening in the system,
-  * which requires including information about the objects being manipulated. In Scala, you can use
-  * [[http://docs.scala-lang.org/overviews/core/string-interpolation.html string interpolation]]
-  * to achieve this:
-  *
-  * {{{
-  * logger.debug(s"Logging in user ${user.getName} with birthday ${user.calcBirthday}")
-  * }}}
-  *
-  * Since this wrapper is implemented with macros, the String construction and method invocations
-  * will only occur when debug logging is enabled.
-  */
-class Logger private(val delegate: ExtendedLogger) extends AnyVal {
-
-  inline def fatal(inline marker: Marker, inline message: Message): Unit =
-    ${LoggerMacro.fatalMarkerMsg('this, 'marker, 'message)}
-
-  inline def fatal(inline marker: Marker, inline message: CharSequence): Unit =
-    ${LoggerMacro.fatalMarkerCseq('this, 'marker, 'message)}
-
-  inline def fatal(inline marker: Marker, inline message: AnyRef): Unit =
-    ${LoggerMacro.fatalMarkerObject('this, 'marker, 'message)}
-
-  inline def fatal(inline marker: Marker, inline message: Message, inline cause: Throwable): Unit =
-    ${LoggerMacro.fatalMarkerMsgThrowable('this, 'marker, 'message, 'cause)}
-
-  inline def fatal(inline marker: Marker, inline message: CharSequence, inline cause: Throwable): Unit =
-    ${LoggerMacro.fatalMarkerCseqThrowable('this, 'marker, 'message, 'cause)}
-
-  inline def fatal(inline marker: Marker, inline message: AnyRef, inline cause: Throwable): Unit =
-    ${LoggerMacro.fatalMarkerObjectThrowable('this, 'marker, 'message, 'cause)}
-
-  inline def fatal(inline message: Message): Unit =
-    ${LoggerMacro.fatalMsg('this, 'message)}
-
-  inline def fatal(inline message: CharSequence): Unit =
-    ${LoggerMacro.fatalCseq('this, 'message)}
-
-  inline def fatal(inline message: AnyRef): Unit =
-    ${LoggerMacro.fatalObject('this, 'message)}
-
-  inline def fatal(inline message: Message, inline cause: Throwable): Unit =
-    ${LoggerMacro.fatalMsgThrowable('this, 'message, 'cause)}
-
-  inline def fatal(inline message: CharSequence, inline cause: Throwable): Unit =
-    ${LoggerMacro.fatalCseqThrowable('this, 'message, 'cause)}
-
-  inline def fatal(inline message: AnyRef, inline cause: Throwable): Unit =
-    ${LoggerMacro.fatalObjectThrowable('this, 'message, 'cause)}
-
-  inline def error(inline marker: Marker, inline message: Message): Unit =
-    ${LoggerMacro.errorMarkerMsg('this, 'marker, 'message)}
-
-  inline def error(inline marker: Marker, inline message: CharSequence): Unit =
-    ${LoggerMacro.errorMarkerCseq('this, 'marker, 'message)}
-
-  inline def error(inline marker: Marker, inline message: AnyRef): Unit =
-    ${LoggerMacro.errorMarkerObject('this, 'marker, 'message)}
-
-
-  inline def error(inline marker: Marker, inline message: Message, inline cause: Throwable): Unit =
-    ${LoggerMacro.errorMarkerMsgThrowable('this, 'marker, 'message, 'cause)}
-
-  inline def error(inline marker: Marker, inline message: CharSequence, inline cause: Throwable): Unit =
-    ${LoggerMacro.errorMarkerCseqThrowable('this, 'marker, 'message, 'cause)}
-
-  inline def error(inline marker: Marker, inline message: AnyRef, inline cause: Throwable): Unit =
-    ${LoggerMacro.errorMarkerObjectThrowable('this, 'marker, 'message, 'cause)}
-
-  inline def error(inline message: Message): Unit =
-    ${LoggerMacro.errorMsg('this, 'message)}
-
-  inline def error(inline message: CharSequence): Unit =
-    ${LoggerMacro.errorCseq('this, 'message)}
-
-  inline def error(inline message: AnyRef): Unit =
-    ${LoggerMacro.errorObject('this, 'message)}
-
-  inline def error(inline message: Message, inline cause: Throwable): Unit =
-    ${LoggerMacro.errorMsgThrowable('this, 'message, 'cause)}
-
-  inline def error(inline message: CharSequence, inline cause: Throwable): Unit =
-    ${LoggerMacro.errorCseqThrowable('this, 'message, 'cause)}
-
-  inline def error(inline message: AnyRef, inline cause: Throwable): Unit =
-    ${LoggerMacro.errorObjectThrowable('this, 'message, 'cause)}
-
-
-  inline def warn(inline marker: Marker, inline message: Message): Unit =
-    ${LoggerMacro.warnMarkerMsg('this, 'marker, 'message)}
-
-  inline def warn(inline marker: Marker, inline message: CharSequence): Unit =
-    ${LoggerMacro.warnMarkerCseq('this, 'marker, 'message)}
-
-  inline def warn(inline marker: Marker, inline message: AnyRef): Unit =
-    ${LoggerMacro.warnMarkerObject('this, 'marker, 'message)}
-
-  inline def warn(inline marker: Marker, inline message: Message, inline cause: Throwable): Unit =
-    ${LoggerMacro.warnMarkerMsgThrowable('this, 'marker, 'message, 'cause)}
-
-  inline def warn(inline marker: Marker, inline message: CharSequence, inline cause: Throwable): Unit =
-    ${LoggerMacro.warnMarkerCseqThrowable('this, 'marker, 'message, 'cause)}
-
-  inline def warn(inline marker: Marker, inline message: AnyRef, inline cause: Throwable): Unit =
-    ${LoggerMacro.warnMarkerObjectThrowable('this, 'marker, 'message, 'cause)}
-
-
-  inline def warn(message: Message): Unit =
-    ${LoggerMacro.warnMsg('this, 'message)}
-
-  inline def warn(inline message: CharSequence): Unit =
-    ${LoggerMacro.warnCseq('this, 'message)}
-
-  inline def warn(inline message: AnyRef): Unit =
-    ${LoggerMacro.warnObject('this, 'message)}
-
-  inline def warn(inline message: Message, inline cause: Throwable): Unit =
-    ${LoggerMacro.warnMsgThrowable('this, 'message, 'cause)}
-
-  inline def warn(inline message: CharSequence, inline cause: Throwable): Unit =
-    ${LoggerMacro.warnCseqThrowable('this, 'message, 'cause)}
-
-  inline def warn(inline message: AnyRef, inline cause: Throwable): Unit =
-    ${LoggerMacro.warnObjectThrowable('this, 'message, 'cause)}
-
-
-  inline def info(inline marker: Marker, inline message: Message): Unit =
-    ${LoggerMacro.infoMarkerMsg('this, 'marker, 'message)}
-
-  inline def info(inline marker: Marker, inline message: CharSequence): Unit =
-    ${LoggerMacro.infoMarkerCseq('this, 'marker, 'message)}
-
-  inline def info(inline marker: Marker, inline message: AnyRef): Unit =
-    ${LoggerMacro.infoMarkerObject('this, 'marker, 'message)}
-
-  inline def info(inline marker: Marker, inline message: Message, inline cause: Throwable): Unit =
-    ${LoggerMacro.infoMarkerMsgThrowable('this, 'marker, 'message, 'cause)}
-
-  inline def info(inline marker: Marker, inline message: CharSequence, inline cause: Throwable): Unit =
-    ${LoggerMacro.infoMarkerCseqThrowable('this, 'marker, 'message, 'cause)}
-
-  inline def info(inline marker: Marker, inline message: AnyRef, inline cause: Throwable): Unit =
-    ${LoggerMacro.infoMarkerObjectThrowable('this, 'marker, 'message, 'cause)}
-
-  inline def info(inline message: Message): Unit =
-    ${LoggerMacro.infoMsg('this, 'message)}
-
-  inline def info(inline message: CharSequence): Unit =
-    ${LoggerMacro.infoCseq('this, 'message)}
-
-  inline def info(inline message: AnyRef): Unit =
-    ${LoggerMacro.infoObject('this, 'message)}
-
-  inline def info(inline message: Message, inline cause: Throwable): Unit =
-    ${LoggerMacro.infoMsgThrowable('this, 'message, 'cause)}
-
-  inline def info(inline message: CharSequence, inline cause: Throwable): Unit =
-    ${LoggerMacro.infoCseqThrowable('this, 'message, 'cause)}
-
-  inline def info(inline message: AnyRef, inline cause: Throwable): Unit =
-    ${LoggerMacro.infoObjectThrowable('this, 'message, 'cause)}
-
-
-  inline def debug(inline marker: Marker, inline message: Message): Unit =
-    ${LoggerMacro.debugMarkerMsg('this, 'marker, 'message)}
-
-  inline def debug(inline marker: Marker, inline message: CharSequence): Unit =
-    ${LoggerMacro.debugMarkerCseq('this, 'marker, 'message)}
-
-  inline def debug(inline marker: Marker, inline message: AnyRef): Unit =
-    ${LoggerMacro.debugMarkerObject('this, 'marker, 'message)}
-
-  inline def debug(inline marker: Marker, inline message: Message, inline cause: Throwable): Unit =
-    ${LoggerMacro.debugMarkerMsgThrowable('this, 'marker, 'message, 'cause)}
-
-  inline def debug(inline marker: Marker, inline message: CharSequence, inline cause: Throwable): Unit =
-    ${LoggerMacro.fatalMarkerCseqThrowable('this, 'marker, 'message, 'cause)}
-
-  inline def debug(inline marker: Marker, inline message: AnyRef, inline cause: Throwable): Unit =
-    ${LoggerMacro.debugMarkerObjectThrowable('this, 'marker, 'message, 'cause)}
-
-  inline def debug(inline message: Message): Unit =
-    ${LoggerMacro.debugMsg('this, 'message)}
-
-  inline def debug(inline message: CharSequence): Unit =
-    ${LoggerMacro.debugCseq('this, 'message)}
-
-  inline def debug(inline message: AnyRef): Unit =
-    ${LoggerMacro.debugObject('this, 'message)}
-
-  inline def debug(inline message: Message, inline cause: Throwable): Unit =
-    ${LoggerMacro.debugMsgThrowable('this, 'message, 'cause)}
-
-  inline def debug(inline message: CharSequence, inline cause: Throwable): Unit =
-    ${LoggerMacro.debugCseqThrowable('this, 'message, 'cause)}
-
-  inline def debug(inline message: AnyRef, inline cause: Throwable): Unit =
-    ${LoggerMacro.debugObjectThrowable('this, 'message, 'cause)}
-
-
-  inline def trace(inline marker: Marker, inline message: Message): Unit =
-    ${LoggerMacro.traceMarkerMsg('this, 'marker, 'message)}
-
-  inline def trace(inline marker: Marker, inline message: CharSequence): Unit =
-    ${LoggerMacro.traceMarkerCseq('this, 'marker, 'message)}
-
-  inline def trace(inline marker: Marker, inline message: AnyRef): Unit =
-    ${LoggerMacro.traceMarkerObject('this, 'marker, 'message)}
-
-  inline def trace(inline marker: Marker, inline message: Message, inline cause: Throwable): Unit =
-    ${LoggerMacro.traceMarkerMsgThrowable('this, 'marker, 'message, 'cause)}
-
-  inline def trace(inline marker: Marker, inline message: CharSequence, inline cause: Throwable): Unit =
-    ${LoggerMacro.fatalMarkerCseqThrowable('this, 'marker, 'message, 'cause)}
-
-  inline def trace(inline marker: Marker, inline message: AnyRef, inline cause: Throwable): Unit =
-    ${LoggerMacro.traceMarkerObjectThrowable('this, 'marker, 'message, 'cause)}
-
-  inline def trace(inline message: Message): Unit =
-    ${LoggerMacro.traceMsg('this, 'message)}
-
-  inline def trace(inline message: CharSequence): Unit =
-    ${LoggerMacro.traceCseq('this, 'message)}
-
-  inline def trace(inline message: AnyRef): Unit =
-    ${LoggerMacro.traceObject('this, 'message)}
-
-  inline def trace(inline message: Message, inline cause: Throwable): Unit =
-    ${LoggerMacro.traceMsgThrowable('this, 'message, 'cause)}
-
-  inline def trace(inline message: CharSequence, inline cause: Throwable): Unit =
-    ${LoggerMacro.traceCseqThrowable('this, 'message, 'cause)}
-
-  inline def trace(inline message: AnyRef, inline cause: Throwable): Unit =
-    ${LoggerMacro.traceObjectThrowable('this, 'message, 'cause)}
-
-
-  /**
-    * Logs a `Message` with the specific `Marker` at the given `Level`.
-    *
-    * @param level   the logging level
-    * @param marker  the marker data specific to this log statement
-    * @param message the message to be logged
-    */
-  inline def apply(inline level: Level, inline marker: Marker, inline message: Message): Unit =
-    ${LoggerMacro.logMarkerMsg('this, 'level, 'marker, 'message)}
-
-  /**
-    * Logs a string with the specific `Marker` at the given `Level`.
-    *
-    * @param level   the logging level
-    * @param marker  the marker data specific to this log statement
-    * @param message the message to be logged
-    */
-  inline def apply(inline level: Level, inline marker: Marker, inline message: CharSequence): Unit =
-    ${LoggerMacro.logMarkerCseq('this, 'level, 'marker, 'message)}
-
-  /**
-    * Logs an object with the specific `Marker` at the given `Level`.
-    *
-    * @param level   the logging level
-    * @param marker  the marker data specific to this log statement
-    * @param message the message to be logged
-    */
-  inline def apply(inline level: Level, inline marker: Marker, inline message: AnyRef): Unit =
-    ${LoggerMacro.logMarkerObject('this, 'level, 'marker, 'message)}
-
-  /**
-    * Logs a `Message` with the specific `Marker` at the given `Level` including the stack trace
-    * of the given `Throwable`.
-    *
-    * @param level   the logging level
-    * @param marker  the marker data specific to this log statement
-    * @param message the message to be logged
-    * @param cause   the cause
-    */
-  inline def apply(inline level: Level, inline marker: Marker, inline message: Message, inline cause: Throwable): Unit =
-    ${LoggerMacro.logMarkerMsgThrowable('this, 'level, 'marker, 'message, 'cause)}
-
-  /**
-    * Logs a string with the specific `Marker` at the given `Level` including the stack trace
-    * of the given `Throwable`.
-    *
-    * @param level   the logging level
-    * @param marker  the marker data specific to this log statement
-    * @param message the message to be logged
-    * @param cause   the cause
-    */
-  inline def apply(inline level: Level, inline marker: Marker, inline message: CharSequence, inline cause: Throwable): Unit =
-    ${LoggerMacro.logMarkerCseqThrowable('this, 'level, 'marker, 'message, 'cause)}
-
-  /**
-    * Logs an object with the specific `Marker` at the given `Level` including the stack trace
-    * of the given `Throwable`.
-    *
-    * @param level   the logging level
-    * @param marker  the marker data specific to this log statement
-    * @param message the message to be logged
-    * @param cause   the cause
-    */
-  inline def apply(inline level: Level, inline marker: Marker, inline message: AnyRef, inline cause: Throwable): Unit =
-    ${LoggerMacro.logMarkerObjectThrowable('this, 'level, 'marker, 'message, 'cause)}
-
-  /**
-    * Logs a `Message` at the given `Level`.
-    *
-    * @param level   the logging level
-    * @param message the message to be logged
-    */
-  inline def apply(inline level: Level, inline message: Message): Unit =
-    ${LoggerMacro.logMsg('this, 'level, 'message)}
-
-  /**
-    * Logs a string at the given `Level`.
-    *
-    * @param level   the logging level
-    * @param message the message to be logged
-    */
-  inline def apply(inline level: Level, inline message: CharSequence): Unit =
-    ${LoggerMacro.logCseq('this, 'level, 'message)}
-
-  /**
-    * Logs an object at the given `Level`.
-    *
-    * @param level   the logging level
-    * @param message the message to be logged
-    */
-  inline def apply(inline level: Level, inline message: AnyRef): Unit =
-    ${LoggerMacro.logObject('this, 'level, 'message)}
-
-  /**
-    * Logs a `Message` at the given `Level` including the stack trace of the given `Throwable`.
-    *
-    * @param level   the logging level
-    * @param message the message to be logged
-    * @param cause   a `Throwable`
-    */
-  inline def apply(inline level: Level, inline message: Message, inline cause: Throwable): Unit =
-    ${LoggerMacro.logMsgThrowable('this, 'level, 'message, 'cause)}
-
-  /**
-    * Logs a string at the given `Level` including the stack trace of the given `Throwable`.
-    *
-    * @param level   the logging level
-    * @param message the message to be logged
-    * @param cause   a `Throwable`
-    */
-  inline def apply(inline level: Level, inline message: CharSequence, inline cause: Throwable): Unit =
-    ${LoggerMacro.logCseqThrowable('this, 'level, 'message, 'cause)}
-
-  /**
-    * Logs an object at the given `Level` including the stack trace of the given `Throwable`.
-    *
-    * @param level   the logging level
-    * @param message the message to be logged
-    * @param cause   a `Throwable`
-    */
-  inline def apply(inline level: Level, inline message: AnyRef, inline cause: Throwable): Unit =
-    ${LoggerMacro.logObjectThrowable('this, 'level, 'message, 'cause)}
-
-
-  /**
-    * Logs entry to a method. Used when the method in question has no parameters or when the parameters should not be
-    * logged.
-    *
-    * @return The built `EntryMessage`
-    */
-  inline def traceEntry(): EntryMessage =
-    delegate.traceEntry()
-
-  /**
-    * Logs entry to a method along with its parameters.
-    *
-    * {{{
-    * def doSomething(foo: String, bar: Int): Unit = {
-    *   logger.traceEntry(foo, bar)
-    *   // do something
-    * }
-    * }}}
-    *
-    * @param params the parameters to the method.
-    * @return The built `EntryMessage`
-    */
-  inline def traceEntry(inline params: AnyRef*): EntryMessage = {
-    params match {
-      case Seq() => delegate.traceEntry()
-      case seq => delegate.traceEntry(seq.head.toString, seq.tail:_*)
-    }
-  }
-
-  /**
-    * Logs entry to a method using a `Message` to describe the parameters.
-    *
-    * {{{
-    * def doSomething(foo: Request): Unit = {
-    *   logger.traceEntry(JsonMessage(foo))
-    *   // do something
-    * }
-    * }}}
-    *
-    * @param message the message
-    * @return The built `EntryMessage`
-    */
-  inline def traceEntry(inline message: Message): EntryMessage =
-    delegate.traceEntry(message)
-
-  /**
-    * Logs exit from a method with no result.
-    */
-  inline def traceExit(): Unit =
-    delegate.traceExit()
-
-  /**
-    * Logs exiting from a method with result.
-    *
-    * @param result The result being returned from the method call
-    * @return `result`
-    */
-  inline def traceExit[R](inline result: R): R =
-    delegate.traceExit(result)
-
-  /**
-    * Logs exiting from a method with no result.
-    *
-    * @param entryMessage the `EntryMessage` returned from one of the `traceEntry` methods
-    */
-  inline def traceExit(inline entryMessage: EntryMessage): Unit =
-    delegate.traceExit(entryMessage)
-
-  /**
-    * Logs exiting from a method with result.
-    *
-    * {{{
-    * def doSomething(foo: String, bar: Int): Int = {
-    *   val entryMessage = logger.traceEntry(foo, bar)
-    *   // do something
-    *   traceExit(entryMessage, value)
-    * }
-    * }}}
-    *
-    * @param entryMessage the `EntryMessage` returned from one of the `traceEntry` methods
-    * @param result       The result being returned from the method call
-    * @return `result`
-    */
-  inline def traceExit[R](inline entryMessage: EntryMessage, result: R): R =
-    delegate.traceExit(entryMessage, result)
-
-  /**
-    * Logs exiting from a method with result. Allows custom formatting of the result.
-    *
-    * @param message the Message containing the formatted result
-    * @param result  The result being returned from the method call.
-    * @return `result`
-    */
-  inline def traceExit[R](inline message: Message, result: R): R =
-    delegate.traceExit(message, result)
-
-  /**
-    * Logs an exception or error to be thrown.
-    *
-    * {{{
-    *   throw logger.throwing(myException)
-    * }}}
-    *
-    * @param t the Throwable
-    * @return `t`
-    */
-  inline def throwing[T <: Throwable](inline t: T): T =
-    delegate.throwing(t)
-
-  /**
-    * Logs an exception or error to be thrown to a specific logging level.
-    *
-    * {{{
-    *   throw logger.throwing(Level.DEBUG, myException)
-    * }}}
-    *
-    * @param level the logging Level.
-    * @param t     the Throwable
-    * @return `t`
-    */
-  inline def throwing[T <: Throwable](inline level: Level, inline t: T): T =
-    delegate.throwing(level, t)
-
-  /**
-    * Logs an exception or error that has been caught.
-    *
-    * @param t the Throwable.
-    */
-  inline def catching(inline t: Throwable): Unit =
-    delegate.catching(t)
-
-  /**
-    * Logs an exception or error that has been caught to a specific logging level.
-    *
-    * @param level The logging Level.
-    * @param t     The Throwable.
-    */
-  inline def catching(inline level: Level, inline t: Throwable): Unit =
-    delegate.catching(level, t)
-
-
-  /** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified
-    * level is enabled.
-    *
-    * Should normally not be used directly from application code, but needs to be public for access by macros.
-    *
-    * @param level   log level
-    * @param marker  marker or `null`
-    * @param message message
-    * @param cause   cause or `null`
-    */
-  def logMessage(level: Level, marker: Marker, message: Message, cause: Throwable): Unit = {
-    delegate.logMessage(Logger.FQCN, level, marker, message, cause)
-  }
-
-  /** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified
-    * level is enabled.
-    *
-    * Should normally not be used directly from application code, but needs to be public for access by macros.
-    *
-    * @param level   log level
-    * @param marker  marker or `null`
-    * @param message message
-    * @param cause   cause or `null`
-    */
-  def logMessage(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit = {
-    delegate.logMessage(Logger.FQCN, level, marker, delegate.getMessageFactory.asInstanceOf[MessageFactory2].newMessage(message), cause)
-  }
-
-  /** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified
-    * level is enabled.
-    *
-    * Should normally not be used directly from application code, but needs to be public for access by macros.
-    *
-    * @param level   log level
-    * @param marker  marker or `null`
-    * @param message message
-    * @param cause   cause or `null`
-    */
-  def logMessage(level: Level, marker: Marker, message: AnyRef, cause: Throwable): Unit = {
-    delegate.logMessage(Logger.FQCN, level, marker, delegate.getMessageFactory.asInstanceOf[MessageFactory2].newMessage(message), cause)
-  }
-
-}
diff --git a/src/main/scala-3/org/apache/logging/log4j/scala/LoggerMacro.scala b/src/main/scala-3/org/apache/logging/log4j/scala/LoggerMacro.scala
deleted file mode 100644
index d3ec3f4..0000000
--- a/src/main/scala-3/org/apache/logging/log4j/scala/LoggerMacro.scala
+++ /dev/null
@@ -1,556 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.scala
-
-import org.apache.logging.log4j.message.{EntryMessage, Message}
-import org.apache.logging.log4j.spi.{AbstractLogger, ExtendedLogger}
-import org.apache.logging.log4j.{Level, Marker}
-
-import scala.quoted.*
-
-/**
-  * Inspired from [[https://github.com/typesafehub/scalalogging ScalaLogging]].
-  */
-private object LoggerMacro {
-  // Trace
-
-  def traceMsg(underlying: Expr[Logger], message: Expr[Message])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.TRACE)) $underlying.trace($message) }
-  }
-
-  def traceMsgThrowable(underlying: Expr[Logger], message: Expr[Message],
-                        throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.TRACE)) $underlying.trace($message, $throwable) }
-  }
-
-  def traceMarkerMsg(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[Message])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.TRACE, $marker)) $underlying.trace($marker, $message) }
-  }
-
-  def traceMarkerMsgThrowable(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[Message],
-                              throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.TRACE, $marker)) $underlying.trace($marker, $message, $throwable) }
-  }
-
-  def traceCseq(underlying: Expr[Logger], message: Expr[CharSequence])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMessageArgs(underlying, '{Level.TRACE}, messageFormat, Expr.ofSeq(args))
-  }
-
-  def traceCseqThrowable(underlying: Expr[Logger], message: Expr[CharSequence],
-                         throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMessageArgsThrowable(underlying, '{Level.TRACE}, messageFormat, Expr.ofSeq(args), throwable)
-  }
-
-  def traceMarkerCseq(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[CharSequence])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMarkerMessageArgs(underlying, '{Level.TRACE}, marker, messageFormat, Expr.ofSeq(args))
-  }
-
-  def traceMarkerCseqThrowable(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[CharSequence],
-                               throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMarkerMessageArgsThrowable(underlying, '{Level.TRACE}, marker, messageFormat, Expr.ofSeq(args), throwable)
-  }
-
-  def traceObject(underlying: Expr[Logger], message: Expr[AnyRef])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.TRACE)) $underlying.trace($message) }
-  }
-
-  def traceObjectThrowable(underlying: Expr[Logger], message: Expr[AnyRef],
-                           throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.TRACE)) $underlying.trace($message, $throwable) }
-  }
-
-  def traceMarkerObject(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[AnyRef])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.TRACE, $marker)) $underlying.trace($marker, $message) }
-  }
-
-  def traceMarkerObjectThrowable(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[AnyRef],
-                                 throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.TRACE, $marker)) $underlying.trace($marker, $message, $throwable) }
-  }
-
-  // Debug
-
-  def debugMsg(underlying: Expr[Logger], message: Expr[Message])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.DEBUG)) $underlying.debug($message) }
-  }
-
-  def debugMsgThrowable(underlying: Expr[Logger], message: Expr[Message],
-                        throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.DEBUG)) $underlying.debug($message, $throwable) }
-  }
-
-  def debugMarkerMsg(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[Message])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.DEBUG, $marker)) $underlying.debug($marker, $message) }
-  }
-
-  def debugMarkerMsgThrowable(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[Message],
-                              throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.DEBUG, $marker)) $underlying.debug($marker, $message, $throwable) }
-  }
-
-  def debugCseq(underlying: Expr[Logger], message: Expr[CharSequence])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMessageArgs(underlying, '{Level.DEBUG}, messageFormat, Expr.ofSeq(args))
-  }
-
-  def debugCseqThrowable(underlying: Expr[Logger], message: Expr[CharSequence],
-                         throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMessageArgsThrowable(underlying, '{Level.DEBUG}, messageFormat, Expr.ofSeq(args), throwable)
-  }
-
-  def debugMarkerCseq(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[CharSequence])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMarkerMessageArgs(underlying, '{Level.DEBUG}, marker, messageFormat, Expr.ofSeq(args))
-  }
-
-  def debugMarkerCseqThrowable(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[CharSequence],
-                               throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMarkerMessageArgsThrowable(underlying, '{Level.DEBUG}, marker, messageFormat, Expr.ofSeq(args), throwable)
-  }
-
-  def debugObject(underlying: Expr[Logger], message: Expr[AnyRef])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.DEBUG)) $underlying.debug($message) }
-  }
-
-  def debugObjectThrowable(underlying: Expr[Logger], message: Expr[AnyRef],
-                           throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.DEBUG)) $underlying.debug($message, $throwable) }
-  }
-
-  def debugMarkerObject(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[AnyRef])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.DEBUG, $marker)) $underlying.debug($marker, $message) }
-  }
-
-  def debugMarkerObjectThrowable(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[AnyRef],
-                                 throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.DEBUG, $marker)) $underlying.debug($marker, $message, $throwable) }
-  }
-
-  // Info
-
-  def infoMsg(underlying: Expr[Logger], message: Expr[Message])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.INFO)) $underlying.info($message) }
-  }
-
-  def infoMsgThrowable(underlying: Expr[Logger], message: Expr[Message],
-                       throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.INFO)) $underlying.info($message, $throwable) }
-  }
-
-  def infoMarkerMsg(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[Message])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.INFO, $marker)) $underlying.info($marker, $message) }
-  }
-
-  def infoMarkerMsgThrowable(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[Message],
-                             throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.INFO, $marker)) $underlying.info($marker, $message, $throwable) }
-  }
-
-  def infoCseq(underlying: Expr[Logger], message: Expr[CharSequence])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMessageArgs(underlying, '{Level.INFO}, messageFormat, Expr.ofSeq(args))
-  }
-
-  def infoCseqThrowable(underlying: Expr[Logger], message: Expr[CharSequence],
-                        throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMessageArgsThrowable(underlying, '{Level.INFO}, messageFormat, Expr.ofSeq(args), throwable)
-  }
-
-  def infoMarkerCseq(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[CharSequence])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMarkerMessageArgs(underlying, '{Level.INFO}, marker, messageFormat, Expr.ofSeq(args))
-  }
-
-  def infoMarkerCseqThrowable(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[CharSequence],
-                              throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMarkerMessageArgsThrowable(underlying, '{Level.INFO}, marker, messageFormat, Expr.ofSeq(args), throwable)
-  }
-
-
-  def infoObject(underlying: Expr[Logger], message: Expr[AnyRef])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.INFO)) $underlying.info($message) }
-  }
-
-  def infoObjectThrowable(underlying: Expr[Logger], message: Expr[AnyRef],
-                          throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.INFO)) $underlying.info($message, $throwable) }
-  }
-
-  def infoMarkerObject(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[AnyRef])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.INFO, $marker)) $underlying.info($marker, $message) }
-  }
-
-  def infoMarkerObjectThrowable(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[AnyRef],
-                                throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.INFO, $marker)) $underlying.info($marker, $message, $throwable) }
-  }
-
-  //Warn
-
-  def warnMsg(underlying: Expr[Logger], message: Expr[Message])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.WARN)) $underlying.warn($message) }
-  }
-
-  def warnMsgThrowable(underlying: Expr[Logger], message: Expr[Message],
-                       throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.WARN)) $underlying.warn($message, $throwable) }
-  }
-
-  def warnMarkerMsg(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[Message])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.WARN, $marker)) $underlying.warn($marker, $message) }
-  }
-
-  def warnMarkerMsgThrowable(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[Message],
-                             throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.WARN, $marker)) $underlying.warn($marker, $message, $throwable) }
-  }
-
-  def warnCseq(underlying: Expr[Logger], message: Expr[CharSequence])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMessageArgs(underlying, '{Level.WARN}, messageFormat, Expr.ofSeq(args))
-  }
-
-  def warnCseqThrowable(underlying: Expr[Logger], message: Expr[CharSequence],
-                        throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMessageArgsThrowable(underlying, '{Level.WARN}, messageFormat, Expr.ofSeq(args), throwable)
-  }
-
-  def warnMarkerCseq(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[CharSequence])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMarkerMessageArgs(underlying, '{Level.WARN}, marker, messageFormat, Expr.ofSeq(args))
-  }
-
-  def warnMarkerCseqThrowable(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[CharSequence],
-                              throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMarkerMessageArgsThrowable(underlying, '{Level.WARN}, marker, messageFormat, Expr.ofSeq(args), throwable)
-  }
-
-  def warnObject(underlying: Expr[Logger], message: Expr[AnyRef])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.WARN)) $underlying.warn($message) }
-  }
-
-  def warnObjectThrowable(underlying: Expr[Logger], message: Expr[AnyRef],
-                          throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.WARN)) $underlying.warn($message, $throwable) }
-  }
-
-  def warnMarkerObject(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[AnyRef])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.WARN, $marker)) $underlying.warn($marker, $message) }
-  }
-
-  def warnMarkerObjectThrowable(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[AnyRef],
-                                throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.WARN, $marker)) $underlying.warn($marker, $message, $throwable) }
-  }
-
-  //Error
-
-  def errorMsg(underlying: Expr[Logger], message: Expr[Message])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.ERROR)) $underlying.error($message) }
-  }
-
-  def errorMsgThrowable(underlying: Expr[Logger], message: Expr[Message],
-                        throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.ERROR)) $underlying.error($message, $throwable) }
-  }
-
-  def errorMarkerMsg(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[Message])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.ERROR, $marker)) $underlying.error($marker, $message) }
-  }
-
-  def errorMarkerMsgThrowable(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[Message],
-                              throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.ERROR, $marker)) $underlying.error($marker, $message, $throwable) }
-  }
-
-  def errorCseq(underlying: Expr[Logger], message: Expr[CharSequence])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMessageArgs(underlying, '{Level.ERROR}, messageFormat, Expr.ofSeq(args))
-  }
-
-  def errorCseqThrowable(underlying: Expr[Logger], message: Expr[CharSequence],
-                         throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMessageArgsThrowable(underlying, '{Level.ERROR}, messageFormat, Expr.ofSeq(args), throwable)
-  }
-
-  def errorMarkerCseq(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[CharSequence])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMarkerMessageArgs(underlying, '{Level.ERROR}, marker, messageFormat, Expr.ofSeq(args))
-  }
-
-  def errorMarkerCseqThrowable(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[CharSequence],
-                               throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMarkerMessageArgsThrowable(underlying, '{Level.ERROR}, marker, messageFormat, Expr.ofSeq(args), throwable)
-  }
-
-  def errorObject(underlying: Expr[Logger], message: Expr[AnyRef])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.ERROR)) $underlying.error($message) }
-  }
-
-  def errorObjectThrowable(underlying: Expr[Logger], message: Expr[AnyRef],
-                           throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.ERROR)) $underlying.error($message, $throwable) }
-  }
-
-  def errorMarkerObject(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[AnyRef])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.ERROR, $marker)) $underlying.error($marker, $message) }
-  }
-
-  def errorMarkerObjectThrowable(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[AnyRef],
-                                 throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.ERROR, $marker)) $underlying.error($marker, $message, $throwable) }
-  }
-
-  //Fatal
-
-  def fatalMsg(underlying: Expr[Logger], message: Expr[Message])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.FATAL)) $underlying.fatal($message) }
-  }
-
-  def fatalMsgThrowable(underlying: Expr[Logger], message: Expr[Message],
-                        throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.FATAL)) $underlying.fatal($message, $throwable) }
-  }
-
-  def fatalMarkerMsg(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[Message])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.FATAL, $marker)) $underlying.fatal($marker, $message) }
-  }
-
-  def fatalMarkerMsgThrowable(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[Message],
-                              throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.FATAL, $marker)) $underlying.fatal($marker, $message, $throwable) }
-  }
-
-  def fatalCseq(underlying: Expr[Logger], message: Expr[CharSequence])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMessageArgs(underlying, '{Level.FATAL}, messageFormat, Expr.ofSeq(args))
-  }
-
-  def fatalCseqThrowable(underlying: Expr[Logger], message: Expr[CharSequence],
-                         throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMessageArgsThrowable(underlying, '{Level.FATAL}, messageFormat, Expr.ofSeq(args), throwable)
-  }
-
-  def fatalMarkerCseq(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[CharSequence])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMarkerMessageArgs(underlying, '{Level.FATAL}, marker, messageFormat, Expr.ofSeq(args))
-  }
-
-  def fatalMarkerCseqThrowable(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[CharSequence],
-                               throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMarkerMessageArgsThrowable(underlying, '{Level.FATAL}, marker, messageFormat, Expr.ofSeq(args), throwable)
-  }
-
-  def fatalObject(underlying: Expr[Logger], message: Expr[AnyRef])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.FATAL)) $underlying.fatal($message) }
-  }
-
-  def fatalObjectThrowable(underlying: Expr[Logger], message: Expr[AnyRef],
-                           throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.FATAL)) $underlying.fatal($message, $throwable) }
-  }
-
-  def fatalMarkerObject(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[AnyRef])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.FATAL, $marker)) $underlying.fatal($marker, $message) }
-  }
-
-  def fatalMarkerObjectThrowable(underlying: Expr[Logger], marker: Expr[Marker], message: Expr[AnyRef],
-                                 throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled(Level.FATAL, $marker)) $underlying.fatal($marker, $message, $throwable) }
-  }
-
-  def logMsg(underlying: Expr[Logger], level: Expr[Level], message: Expr[Message])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled($level)) $underlying.delegate.log($level, $message) }
-  }
-
-  def logMsgThrowable(underlying: Expr[Logger], level: Expr[Level], message: Expr[Message], throwable: Expr[Throwable])
-                     (using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled($level)) $underlying.delegate.log($level, $message, $throwable) }
-  }
-
-  def logObject(underlying: Expr[Logger], level: Expr[Level], message: Expr[AnyRef])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled($level)) $underlying.delegate.log($level, $message) }
-  }
-
-  def logObjectThrowable(underlying: Expr[Logger], level: Expr[Level], message: Expr[AnyRef],
-                         throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled($level)) $underlying.delegate.log($level, $message, $throwable) }
-  }
-
-  def logCseq(underlying: Expr[Logger], level: Expr[Level], message: Expr[CharSequence])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMessageArgs(underlying, level, messageFormat, Expr.ofSeq(args))
-  }
-
-  def logCseqThrowable(underlying: Expr[Logger], level: Expr[Level], message: Expr[CharSequence],
-                       throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMessageArgsThrowable(underlying, level, messageFormat, Expr.ofSeq(args), throwable)
-  }
-
-  def logMarkerMsg(underlying: Expr[Logger], level: Expr[Level], marker: Expr[Marker], message: Expr[Message])
-                  (using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.delegate.log($level, $marker, $message) }
-  }
-
-  def logMarkerMsgThrowable(underlying: Expr[Logger], level: Expr[Level], marker: Expr[Marker], message: Expr[Message], throwable: Expr[Throwable])
-                  (using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.delegate.log($level, $marker, $message, $throwable) }
-  }
-
-  def logMarkerObject(underlying: Expr[Logger], level: Expr[Level], marker: Expr[Marker], message: Expr[AnyRef])
-                     (using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.delegate.log($level, $marker, $message) }
-  }
-
-  def logMarkerObjectThrowable(underlying: Expr[Logger], level: Expr[Level], marker: Expr[Marker], message: Expr[AnyRef],
-                               throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.delegate.log($level, $marker, $message, $throwable) }
-  }
-
-  def logMarkerCseq(underlying: Expr[Logger], level: Expr[Level], marker: Expr[Marker], message: Expr[CharSequence])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMarkerMessageArgs(underlying, level, marker, messageFormat, Expr.ofSeq(args))
-  }
-
-  def logMarkerCseqThrowable(underlying: Expr[Logger], level: Expr[Level], marker: Expr[Marker], message: Expr[CharSequence],
-                             throwable: Expr[Throwable])(using Quotes): Expr[Unit] = {
-    val (messageFormat, args) = deconstructInterpolatedMessage(message)
-    logMarkerMessageArgsThrowable(underlying, level, marker, messageFormat, Expr.ofSeq(args), throwable)
-  }
-
-  private def logMessageArgs(underlying: Expr[Logger], level: Expr[Level], message: Expr[CharSequence],
-                             args: Expr[Seq[Any]]) (using Quotes) = {
-    val anyRefArgs = formatArgs(args)
-    if(anyRefArgs.isEmpty)
-    '{ if ($underlying.delegate.isEnabled($level)) $underlying.logMessage($level, null, ${charSequenceExprToStringExpr(message)}, null) }
-    else if(anyRefArgs.length == 1)
-    '{ if ($underlying.delegate.isEnabled($level)) $underlying.delegate.log($level, ${charSequenceExprToStringExpr(message)}, ${anyRefArgs.head}) }
-    else
-    '{ if ($underlying.delegate.isEnabled($level)) $underlying.delegate.log($level, ${charSequenceExprToStringExpr(message)}, ${Expr.ofSeq(anyRefArgs)}*) }
-  }
-
-  private def logMessageArgsThrowable(underlying: Expr[Logger], level: Expr[Level], message: Expr[CharSequence],
-                                      args: Expr[Seq[Any]], throwable: Expr[Throwable]) (using Quotes) = {
-    val anyRefArgs = formatArgs(args)
-    if(anyRefArgs.isEmpty)
-    '{ if ($underlying.delegate.isEnabled($level)) $underlying.logMessage($level, null, ${charSequenceExprToStringExpr(message)}, $throwable) }
-    else if(anyRefArgs.length == 1)
-    '{ if ($underlying.delegate.isEnabled($level)) $underlying.delegate.log($level, ${charSequenceExprToStringExpr(message)}, ${anyRefArgs.head}, $throwable) }
-    else {
-      val extendedArgs = anyRefArgs :+ throwable
-      '{ if ($underlying.delegate.isEnabled($level)) $underlying.delegate.log($level, ${charSequenceExprToStringExpr(message)}, ${Expr.ofSeq(extendedArgs)}*) }
-    }
-  }
-
-  private def logMarkerMessageArgs(underlying: Expr[Logger], level: Expr[Level], marker: Expr[Marker], message: Expr[CharSequence],
-                                   args: Expr[Seq[Any]]) (using Quotes) = {
-    val anyRefArgs = formatArgs(args)
-    if(anyRefArgs.isEmpty)
-    '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.logMessage($level, $marker, ${charSequenceExprToStringExpr(message)}, null) }
-    else if(anyRefArgs.length == 1)
-    '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.delegate.log($level, $marker, ${charSequenceExprToStringExpr(message)}, ${anyRefArgs.head}) }
-    else
-    '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.delegate.log($level, $marker, ${charSequenceExprToStringExpr(message)}, ${Expr.ofSeq(anyRefArgs)}*) }
-  }
-
-  private def logMarkerMessageArgsThrowable(underlying: Expr[Logger], level: Expr[Level], marker: Expr[Marker],
-                                            message: Expr[CharSequence], args: Expr[Seq[Any]], throwable: Expr[Throwable]) (using Quotes) = {
-    val anyRefArgs = formatArgs(args)
-    if(anyRefArgs.isEmpty)
-    '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.logMessage($level, $marker, ${charSequenceExprToStringExpr(message)}, $throwable) }
-    else if(anyRefArgs.length == 1)
-    '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.delegate.log($level, $marker, ${charSequenceExprToStringExpr(message)}, ${anyRefArgs.head}, $throwable) }
-    else {
-      val extendedArgs = anyRefArgs :+ throwable
-      '{ if ($underlying.delegate.isEnabled($level, $marker)) $underlying.delegate.log($level, $marker, ${charSequenceExprToStringExpr(message)}, ${Expr.ofSeq(extendedArgs)}*) }
-    }
-  }
-
-  /** Checks whether `message` is an interpolated string and transforms it into LOG4J string interpolation. */
-  private def deconstructInterpolatedMessage(message: Expr[CharSequence])(using Quotes): (Expr[String], Seq[Expr[Any]]) = {
-    import quotes.reflect.*
-    import util.*
-
-    message.asTerm match{
-      case Inlined(_, _, Apply(Select(Apply(Select(Select(_, "StringContext"), _), messageNode), _), argumentsNode)) =>
-        val messageTextPartsOpt: Option[List[String]] =
-          messageNode.collectFirst{
-            case Typed(Repeated(ls, _), _) =>
-              ls.collect{ case Literal(StringConstant(s)) => s}
-          }
-        val argsOpt: Option[List[Term]] =
-          argumentsNode.collectFirst {
-            case Typed(Repeated(ls, _), _) => ls
-          }
-
-        (messageTextPartsOpt, argsOpt) match{
-          case (Some(messageTextParts), Some(args)) =>
-            val format = messageTextParts.iterator
-              // Emulate standard interpolator escaping
-              .map(StringContext.processEscapes)
-              // Escape literal log4j format anchors if the resulting call will require a format string
-              .map(str => if (args.nonEmpty) str.replace("{}", "\\{}") else str)
-              .mkString("{}")
-
-            val formatArgs = args.map(_.asExpr)
-
-            (Expr(format), formatArgs)
-          case _ =>
-            (charSequenceExprToStringExpr(message), Seq.empty)
-        }
-      case _ => (charSequenceExprToStringExpr(message), Seq.empty)
-    }
-  }
-  
-  private def formatArgs(args: Expr[Seq[Any]])(using q: Quotes): Seq[Expr[Object]] = {
-    import quotes.reflect.*
-    import util.*
-
-    args.asTerm match {
-      case p@Inlined(_, _, Typed(Repeated(v, _),_)) =>
-        v.map{
-          case t if t.tpe <:< TypeRepr.of[AnyRef] => t.asExprOf[Object]
-          case t => '{${t.asExpr}.asInstanceOf[Object]}
-        }
-      case Repeated(v, _) =>
-        v.map{
-          case t if t.tpe <:< TypeRepr.of[Object] => t.asExprOf[Object]
-          case t => '{${t.asExpr}.asInstanceOf[Object]}
-        }
-      case _ => Seq.empty
-    }
-  }
-
-  private def charSequenceExprToStringExpr(expr: Expr[CharSequence])(using Quotes): Expr[String] = expr match {
-    case '{ $cs } => Expr(cs.toString)
-  }
-}
diff --git a/src/main/scala/org/apache/logging/log4j/scala/Logging.scala b/src/main/scala/org/apache/logging/log4j/scala/Logging.scala
deleted file mode 100644
index b017de7..0000000
--- a/src/main/scala/org/apache/logging/log4j/scala/Logging.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.scala
-
-/**
-  * Mix in this trait into classes from which you want to log,
-  * give you a `logger` value with a [[Logger]] named according to the class.
-  */
-trait Logging {
-
-  /**
-    * A [[Logger]] named according to the class.
-    */
-  protected val logger: Logger = Logger(getClass)
-
-}
\ No newline at end of file
diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc
new file mode 100644
index 0000000..5dfc3f0
--- /dev/null
+++ b/src/site/_constants.adoc
@@ -0,0 +1,41 @@
+////
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+////
+
+////
+    ██     ██  █████  ██████  ███    ██ ██ ███    ██  ██████  ██
+    ██     ██ ██   ██ ██   ██ ████   ██ ██ ████   ██ ██       ██
+    ██  █  ██ ███████ ██████  ██ ██  ██ ██ ██ ██  ██ ██   ███ ██
+    ██ ███ ██ ██   ██ ██   ██ ██  ██ ██ ██ ██  ██ ██ ██    ██
+     ███ ███  ██   ██ ██   ██ ██   ████ ██ ██   ████  ██████  ██
+
+    IF THIS FILE DOESN'T HAVE A `.tmpl.adoc` SUFFIX, IT IS AUTO-GENERATED, DO NOT EDIT IT!
+
+    `_constants.adoc` is auto-generated from `_constants.tmpl.adoc`.
+    Auto-generation happens during `process-sources` phase of Maven.
+    Hence, you must always
+
+    1. Edit `_constants.tmpl.adoc`
+    2. Run `./mvnw process-sources`
+    3. Commit both `_constants.tmpl.adoc` and the generated `_constants.adoc`
+////
+
+:project-github-url: https://github.com/apache/logging-log4j-scala
+:project-version: 13.0.0-SNAPSHOT
+:project-name: Log4j Scala API
+:project-id: log4j-scala
+:java-compiler-version: [17,18)
+:bnd-module-name: org.apache.logging.log4j.api_scala
diff --git a/src/site/_constants.tmpl.adoc b/src/site/_constants.tmpl.adoc
new file mode 100644
index 0000000..7c63d19
--- /dev/null
+++ b/src/site/_constants.tmpl.adoc
@@ -0,0 +1,41 @@
+////
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+////
+
+////
+    ██     ██  █████  ██████  ███    ██ ██ ███    ██  ██████  ██
+    ██     ██ ██   ██ ██   ██ ████   ██ ██ ████   ██ ██       ██
+    ██  █  ██ ███████ ██████  ██ ██  ██ ██ ██ ██  ██ ██   ███ ██
+    ██ ███ ██ ██   ██ ██   ██ ██  ██ ██ ██ ██  ██ ██ ██    ██
+     ███ ███  ██   ██ ██   ██ ██   ████ ██ ██   ████  ██████  ██
+
+    IF THIS FILE DOESN'T HAVE A `.tmpl.adoc` SUFFIX, IT IS AUTO-GENERATED, DO NOT EDIT IT!
+
+    `_constants.adoc` is auto-generated from `_constants.tmpl.adoc`.
+    Auto-generation happens during `process-sources` phase of Maven.
+    Hence, you must always
+
+    1. Edit `_constants.tmpl.adoc`
+    2. Run `./mvnw process-sources`
+    3. Commit both `_constants.tmpl.adoc` and the generated `_constants.adoc`
+////
+
+:project-github-url: ${scm.url}
+:project-version: ${project.version}
+:project-name: Log4j Scala API
+:project-id: log4j-scala
+:java-compiler-version: ${minimalJavaBuildVersion}
+:bnd-module-name: ${bnd-module-name}
diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc
new file mode 100644
index 0000000..5cd39bf
--- /dev/null
+++ b/src/site/_release-notes.adoc
@@ -0,0 +1,40 @@
+////
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+////
+
+////
+    ██     ██  █████  ██████  ███    ██ ██ ███    ██  ██████  ██
+    ██     ██ ██   ██ ██   ██ ████   ██ ██ ████   ██ ██       ██
+    ██  █  ██ ███████ ██████  ██ ██  ██ ██ ██ ██  ██ ██   ███ ██
+    ██ ███ ██ ██   ██ ██   ██ ██  ██ ██ ██ ██  ██ ██ ██    ██
+     ███ ███  ██   ██ ██   ██ ██   ████ ██ ██   ████  ██████  ██
+
+    IF THIS FILE IS CALLED `index.adoc`, IT IS AUTO-GENERATED, DO NOT EDIT IT!
+
+    Release notes `index.adoc` is generated from `src/changelog/.index.adoc.ftl`.
+    Auto-generation happens during `generate-sources` phase of Maven.
+    Hence, you must always
+
+    1. Edit `.index.adoc.ftl`
+    2. Run `./mvnw generate-sources`
+    3. Commit both `.index.adoc.ftl` and the generated `.index.adoc`
+////
+
+[#release-notes]
+== Release Notes
+
+include::_release-notes/_13.x.x.adoc[]
+include::_release-notes/_12.0.adoc[]
diff --git a/src/site/_release-notes/_12.0.adoc b/src/site/_release-notes/_12.0.adoc
new file mode 100644
index 0000000..ee8db65
--- /dev/null
+++ b/src/site/_release-notes/_12.0.adoc
@@ -0,0 +1,57 @@
+////
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+////
+
+////
+    ██     ██  █████  ██████  ███    ██ ██ ███    ██  ██████  ██
+    ██     ██ ██   ██ ██   ██ ████   ██ ██ ████   ██ ██       ██
+    ██  █  ██ ███████ ██████  ██ ██  ██ ██ ██ ██  ██ ██   ███ ██
+    ██ ███ ██ ██   ██ ██   ██ ██  ██ ██ ██ ██  ██ ██ ██    ██
+     ███ ███  ██   ██ ██   ██ ██   ████ ██ ██   ████  ██████  ██
+
+    IF THIS FILE DOESN'T HAVE A `.ftl` SUFFIX, IT IS AUTO-GENERATED, DO NOT EDIT IT!
+
+    Version-specific release notes (`7.8.0.adoc`, etc.) are generated from `src/changelog/*/.release-notes.adoc.ftl`.
+    Auto-generation happens during `generate-sources` phase of Maven.
+    Hence, you must always
+
+    1. Find and edit the associated `.release-notes.adoc.ftl`
+    2. Run `./mvnw generate-sources`
+    3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
+////
+
+[#release-notes-12-0]
+=== 12.0
+
+Release date:: 2020-05-03
+
+This is the first release of the project.
+
+
+==== Added
+
+* Added Jenkins pipeline for `sbt` build (https://issues.apache.org/jira/browse/LOG4J2-2291[LOG4J2-2291])
+* Added required license files to `sbt` output artifacts (https://issues.apache.org/jira/browse/LOG4J2-2293[LOG4J2-2293])
+* Added `apache-rat-plugin` reports (https://issues.apache.org/jira/browse/LOG4J2-2294[LOG4J2-2294])
+* Added OSGi descriptors (https://issues.apache.org/jira/browse/LOG4J2-2295[LOG4J2-2295])
+* Added `sbt-site` plugin and website configuration (https://issues.apache.org/jira/browse/LOG4J2-2296[LOG4J2-2296])
+* Added changelog to site (https://issues.apache.org/jira/browse/LOG4J2-2298[LOG4J2-2298])
+* Added support for Scala 2.13 (https://issues.apache.org/jira/browse/LOG4J2-2668[LOG4J2-2668])
+
+==== Changed
+
+* Switched from `sbt` to Maven to take advantage of `logging-parent` conveniences (https://issues.apache.org/jira/browse/LOG4J2-1882[LOG4J2-1882])
+* Added release distribution script (https://issues.apache.org/jira/browse/LOG4J2-2303[LOG4J2-2303])
diff --git a/src/site/_release-notes/_13.x.x.adoc b/src/site/_release-notes/_13.x.x.adoc
new file mode 100644
index 0000000..ab0ce78
--- /dev/null
+++ b/src/site/_release-notes/_13.x.x.adoc
@@ -0,0 +1,55 @@
+////
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+////
+
+////
+    ██     ██  █████  ██████  ███    ██ ██ ███    ██  ██████  ██
+    ██     ██ ██   ██ ██   ██ ████   ██ ██ ████   ██ ██       ██
+    ██  █  ██ ███████ ██████  ██ ██  ██ ██ ██ ██  ██ ██   ███ ██
+    ██ ███ ██ ██   ██ ██   ██ ██  ██ ██ ██ ██  ██ ██ ██    ██
+     ███ ███  ██   ██ ██   ██ ██   ████ ██ ██   ████  ██████  ██
+
+    IF THIS FILE DOESN'T HAVE A `.ftl` SUFFIX, IT IS AUTO-GENERATED, DO NOT EDIT IT!
+
+    Version-specific release notes (`7.8.0.adoc`, etc.) are generated from `src/changelog/*/.release-notes.adoc.ftl`.
+    Auto-generation happens during `generate-sources` phase of Maven.
+    Hence, you must always
+
+    1. Find and edit the associated `.release-notes.adoc.ftl`
+    2. Run `./mvnw generate-sources`
+    3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
+////
+
+[#release-notes-13-x-x]
+=== 13.x.x
+
+
+
+This minor release contains various bug fixes and improvements.
+
+
+==== Added
+
+* Added support for Scala 3 (https://issues.apache.org/jira/browse/LOG4J2-3184[LOG4J2-3184])
+
+==== Changed
+
+* Bumped the Java version to 17 (Scala 2.10 and 2.11 targets still require Java 8 that build switches to using `maven-toolchains-plugin`)
+* Switch the CI to GitHub Actions
+* Switched from `sbt` to Maven to take advantage of `logging-parent` conveniences
+* Switched to semantic versioning
+* Updated Log4j version to `2.20.0`
+* Started using `log4j-changelog`
diff --git a/src/site/index.adoc b/src/site/index.adoc
new file mode 100644
index 0000000..8d00b17
--- /dev/null
+++ b/src/site/index.adoc
@@ -0,0 +1,157 @@
+////
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+////
+
+include::_constants.adoc[]
+:log4j-url: https://logging.apache.org/log4j/2.x
+:log4j-api-url: {log4j-url}/manual/api-separation.html
+
+= Log4j Scala API
+
+{project-name} provides a Scala-friendly interface to log against {log4j-api-url}[the Log4j API].
+It supports Scala `2.10`, `2.11`, `2.12`, `2.13`, and `3`.
+
+[IMPORTANT]
+====
+This is just a logging API.
+Your application still needs to have a logging backend (e.g., {log4j-url}[Log4j]) configured.
+====
+
+[#dependencies]
+== Dependencies
+
+You need to have the `org.apache.logging.log4j:log4j-api-scala` dependency in your classpath:
+
+[source,sbt,subs="+attributes"]
+----
+libraryDependencies ++= Seq(
+  "org.apache.logging.log4j" %% "log4j-api-scala" % "{project-version}"
+)
+----
+
+Java module name and OSGi `Bundle-SymbolicName` are set to `{bnd-module-name}`.
+
+[#usage]
+== Usage
+
+Using the Scala API is as simple as mixing in the `Logging` trait to your class:
+
+[source,scala]
+----
+import org.apache.logging.log4j.scala.Logging
+import org.apache.logging.log4j.Level
+
+class MyClass extends BaseClass with Logging {
+
+  def doStuff(): Unit = {
+    logger.info("Doing stuff")
+  }
+
+  def doStuffWithLevel(level: Level): Unit = {
+    logger(level, "Doing stuff with arbitrary level")
+  }
+
+  def doStuffWithUser(user: User): Unit = {
+    logger.info(s"Doing stuff with ${user.getName}.")
+  }
+
+}
+----
+
+[#params]
+== Parameter substitution
+
+Unlike in Java, Scala provides native functionality for string interpolation https://docs.scala-lang.org/overviews/core/string-interpolation.html[beginning in Scala 2.10].
+As all logger calls are implemented as macros, using string interpolation directly does not require additional if checks:
+
+[source,scala]
+----
+logger.debug(s"Logging in user ${user.getName} with birthday ${user.calcBirthday}")
+----
+
+[#logger-names]
+== Logger names
+
+Most logging implementations use a hierarchical scheme for matching logger names with logging configuration.
+In this scheme the logger name hierarchy is represented by `.` characters in the logger name, in a fashion very similar to the hierarchy used for Java/Scala package names.
+The `Logger` property added by the `Logging` trait follows this convention: the trait ensures the `Logger` is automatically named according to the class it is being used in.
+
+[#development]
+== Development
+
+{project-name} uses {project-github-url}[GitHub] for source code management.
+
+The project requires two Java compilers to build:
+
+. `8` (required for Scala `2.10` and `2.11`)
+. one matching the `{java-compiler-version}` range.
+
+You can build and verify sources using:
+
+[source,bash]
+----
+./mvnw verify
+----
+
+You can build and view the website as follows:
+
+[source,bash]
+----
+./mvnw -N site
+python -m http.server -d target/site
+----
+
+[#distribution]
+== Distribution
+
+In accordance with the Apache Software Foundation's release https://infra.apache.org/release-distribution.html[distribution policy] and https://infra.apache.org/release-publishing.html[creation process], project artifacts are _officially_ accessible from the following locations:
+
+* ASF https://repository.apache.org/content/repositories/releases[Release] and https://repository.apache.org/content/repositories/snapshots[snapshot] repositories (mirrored to https://central.sonatype.dev/[the Maven Central Repository])
+* ASF https://downloads.apache.org/logging/{project-id}[Distribution directory]
+
+See xref:#release-instructions[the release instructions] for details.
+
+[#support]
+== Support
+
+Please keep in mind that this project is intended for internal usage only.
+You can use GitHub Issues for feature requests and bug reports – not questions!
+See https://logging.apache.org/log4j/2.x/support.html[the Log4j support policy] for details.
+
+[#security]
+== Security
+
+If you have encountered an unlisted security vulnerability or other unexpected behaviour that has security impact, please report them privately to mailto:security@logging.apache.org[the Log4j security mailing list].
+See https://logging.apache.org/log4j/2.x/security.html[the Log4j Security page] for further details.
+
+include::_release-notes.adoc[]
+
+[#release-instructions]
+== Release instructions
+
+{project-name} employs the CI/CD foundation provided by the https://logging.apache.org/logging-parent[`logging-parent`].
+You can simply use its release instructions.
+
+[#license]
+== License
+
+Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
+See `NOTICE.txt` distributed with this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
+You may obtain a copy of the License at https://www.apache.org/licenses/LICENSE-2.0[].
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and limitations under the License.
diff --git a/src/test/scala-2/org/apache/logging/log4j/scala/LoggerTest.scala b/src/test/scala-2/org/apache/logging/log4j/scala/LoggerTest.scala
deleted file mode 100644
index 979b8b6..0000000
--- a/src/test/scala-2/org/apache/logging/log4j/scala/LoggerTest.scala
+++ /dev/null
@@ -1,555 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.scala
-
-import org.apache.logging.log4j.message.{DefaultFlowMessageFactory, EntryMessage, Message, ParameterizedMessage, ParameterizedMessageFactory}
-import org.apache.logging.log4j.spi.{AbstractLogger, ExtendedLogger}
-import org.apache.logging.log4j.{Level, Marker, MarkerManager}
-import org.junit.runner.RunWith
-import org.mockito.ArgumentMatchers.{any, anyString, eq => eqv}
-import org.mockito.Mockito._
-import org.scalatest.funsuite.AnyFunSuite
-import org.scalatestplus.junit.JUnitRunner
-import org.scalatestplus.mockito.MockitoSugar
-
-case class Custom(i: Int)
-
-trait Manager {
-  def fetchValue(): Int
-}
-
-case class TestFixture(mockLogger: ExtendedLogger, manager: Manager)
-
-@RunWith(classOf[JUnitRunner])
-class LoggerTest extends AnyFunSuite with MockitoSugar {
-
-  val msg                    = new ParameterizedMessage("msg {}", 17)
-  val entryMsg: EntryMessage = new DefaultFlowMessageFactory().newEntryMessage(msg)
-  val cseqMsg : CharSequence = new StringBuilder().append("cseq msg")
-  val objectMsg              = Custom(17)
-  val cause                  = new RuntimeException("cause")
-  val marker  : Marker       = MarkerManager.getMarker("marker")
-  val result                 = "foo"
-
-  def fixture: TestFixture = {
-    val mockLogger = {
-      val mockLogger = mock[ExtendedLogger]
-      when(mockLogger.getMessageFactory).thenReturn(new ParameterizedMessageFactory)
-      mockLogger
-    }
-    val manager = {
-      val mockManager = mock[Manager]
-      when(mockManager.fetchValue()).thenReturn(4711)
-      mockManager
-    }
-    TestFixture(mockLogger, manager)
-  }
-
-  test("fatal enabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.FATAL)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.fatal(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.FATAL), eqv(null), any[Message], eqv(null))
-    verify(f.manager).fetchValue()
-  }
-
-  test("fatal disabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.FATAL)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger.fatal(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-    verify(f.manager, never).fetchValue()
-  }
-
-  test("error enabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.ERROR)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.error(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.ERROR), eqv(null), any[Message], eqv(null))
-    verify(f.manager).fetchValue()
-  }
-
-  test("error disabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.ERROR)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger.error(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-    verify(f.manager, never).fetchValue()
-  }
-
-  test("warn enabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.WARN)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.warn(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.WARN), eqv(null), any[Message], eqv(null))
-    verify(f.manager).fetchValue()
-  }
-
-  test("warn disabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.WARN)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger.warn(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-    verify(f.manager, never).fetchValue()
-  }
-
-  test("info enabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.info(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(null), any[Message], eqv(null))
-    verify(f.manager).fetchValue()
-  }
-
-  test("info disabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger.info(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-    verify(f.manager, never).fetchValue()
-  }
-
-  test("debug enabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.DEBUG)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.debug(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.DEBUG), eqv(null), any[Message], eqv(null))
-    verify(f.manager).fetchValue()
-  }
-
-  test("debug disabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.DEBUG)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger.debug(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-    verify(f.manager, never).fetchValue()
-  }
-
-  test("trace enabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.trace(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.TRACE), eqv(null), any[Message], eqv(null))
-    verify(f.manager).fetchValue()
-  }
-
-  test("trace disabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger.trace(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-    verify(f.manager, never).fetchValue()
-  }
-
-
-  test("log enabled with Message message and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, msg)
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(marker), eqv(msg), eqv(null))
-  }
-
-  test("log disabled with Message message and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, msg)
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-  }
-
-  test("log enabled with String message and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(marker), any[Message], eqv(null))
-    verify(f.manager).fetchValue()
-  }
-
-  test("log disabled with String message and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-    verify(f.manager, never).fetchValue()
-  }
-
-  test("log enabled with CharSequence message and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, cseqMsg)
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(marker), any[Message], eqv(null))
-  }
-
-  test("log disabled with CharSequence message and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, cseqMsg)
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-  }
-
-  test("log enabled with Object message and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, objectMsg)
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(marker), any[Message], eqv(null))
-  }
-
-  test("log disabled with Object message and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, objectMsg)
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-  }
-
-  test("log enabled with Message message and cause and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, msg, cause)
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(marker), eqv(msg), eqv(cause))
-  }
-
-  test("log disabled with Message message and cause and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, msg, cause)
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-  }
-
-  test("log enabled with String message and cause and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}", cause)
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(marker), any[Message], eqv(cause))
-    verify(f.manager).fetchValue()
-  }
-
-  test("log disabled with String message and cause and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}", cause)
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-    verify(f.manager, never).fetchValue()
-  }
-
-  test("log enabled with CharSequence message and cause and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, cseqMsg, cause)
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(marker), any[Message], eqv(cause))
-  }
-
-  test("log disabled with CharSequence message and cause and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, cseqMsg, cause)
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-  }
-
-  test("log enabled with Object message and cause and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, objectMsg, cause)
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(marker), any[Message], eqv(cause))
-  }
-
-  test("log disabled with Object message and cause and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, objectMsg, cause)
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-  }
-
-  test("log enabled with Message message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, msg)
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(null), eqv(msg), eqv(null))
-  }
-
-  test("log disabled with Message message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, msg)
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-  }
-
-  test("log enabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(null), any[Message], eqv(null))
-    verify(f.manager).fetchValue()
-  }
-
-  test("log disabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-    verify(f.manager, never).fetchValue()
-  }
-
-  test("log enabled with CharSequence message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, cseqMsg)
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(null), any[Message], eqv(null))
-  }
-
-  test("log disabled with CharSequence message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, cseqMsg)
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-  }
-
-  test("log enabled with Object message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, objectMsg)
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(null), any[Message], eqv(null))
-  }
-
-  test("log disabled with Object message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, objectMsg)
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-  }
-
-  test("log enabled with Message message and cause") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, msg, cause)
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(null), eqv(msg), eqv(cause))
-  }
-
-  test("log disabled with Message message and cause") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, msg, cause)
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-  }
-
-  test("log enabled with String message and cause") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}", cause)
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(null), any[Message], eqv(cause))
-    verify(f.manager).fetchValue()
-  }
-
-  test("log disabled with String message and cause") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}", cause)
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-    verify(f.manager, never).fetchValue()
-  }
-
-  test("log enabled with CharSequence message and cause") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, cseqMsg, cause)
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(null), any[Message], eqv(cause))
-  }
-
-  test("log disabled with CharSequence message and cause") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, cseqMsg, cause)
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-  }
-
-  test("log enabled with Object message and cause") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, objectMsg, cause)
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(null), any[Message], eqv(cause))
-  }
-
-  test("log disabled with Object message and cause") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, objectMsg, cause)
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-  }
-
-
-  test("traceEntry") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.traceEntry()
-    verify(f.mockLogger).traceEntry()
-  }
-
-  test("traceEntry enabled with params") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.traceEntry("foo", "bar")
-    verify(f.mockLogger).traceEntry("foo", "bar")
-  }
-
-  test("traceEntry disabled with params") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger.traceEntry("foo", "bar")
-    //traceEntry is now passes through to the underlying logger without checking if logging is enabled (the delegate checks anyway)
-    verify(f.mockLogger).traceEntry("foo", "bar")
-  }
-
-  test("traceEntry enabled with message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.traceEntry(msg)
-    verify(f.mockLogger).traceEntry(eqv(msg))
-  }
-
-  test("traceEntry disabled with message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger.traceEntry(msg)
-    //traceEntry is now passes through to the underlying logger without checking if logging is enabled (the delegate checks anyway)
-    verify(f.mockLogger).traceEntry(eqv(msg))
-  }
-
-  test("traceExit") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.traceExit()
-    verify(f.mockLogger).traceExit()
-  }
-
-  test("traceExit with result") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.traceExit(result)
-    verify(f.mockLogger).traceExit(result)
-  }
-
-  test("traceExit with entrymessage") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.traceExit(entryMsg)
-    verify(f.mockLogger).traceExit(entryMsg)
-  }
-
-  test("traceExit with entrymessage and result") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.traceExit(entryMsg, result)
-    verify(f.mockLogger).traceExit(entryMsg, result)
-  }
-
-  test("traceExit enabled with message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.traceExit(msg, result)
-    verify(f.mockLogger).traceExit(eqv(msg), eqv(result))
-  }
-
-  test("traceExit disabled with message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger.traceExit(msg, result)
-    //traceExit is now passes through to the underlying logger without checking if logging is enabled (the delegate checks anyway)
-    verify(f.mockLogger).traceExit(eqv(msg), eqv(result))
-  }
-
-  test("throwing") {
-    val f = fixture
-    val logger = Logger(f.mockLogger)
-    logger.throwing(cause)
-    verify(f.mockLogger).throwing(eqv(cause))
-  }
-
-  test("throwing with level") {
-    val f = fixture
-    val logger = Logger(f.mockLogger)
-    logger.throwing(Level.INFO, cause)
-    verify(f.mockLogger).throwing(eqv(Level.INFO), eqv(cause))
-  }
-
-  test("catching") {
-    val f = fixture
-    val logger = Logger(f.mockLogger)
-    logger.catching(cause)
-    verify(f.mockLogger).catching(eqv(cause))
-  }
-
-  test("catching with level") {
-    val f = fixture
-    val logger = Logger(f.mockLogger)
-    logger.catching(Level.INFO, cause)
-    verify(f.mockLogger).catching(eqv(Level.INFO), eqv(cause))
-  }
-
-}
diff --git a/src/test/scala-3/org/apache/logging/log4j/scala/LoggerTest.scala b/src/test/scala-3/org/apache/logging/log4j/scala/LoggerTest.scala
deleted file mode 100644
index b1ffb61..0000000
--- a/src/test/scala-3/org/apache/logging/log4j/scala/LoggerTest.scala
+++ /dev/null
@@ -1,555 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.scala
-
-import org.apache.logging.log4j.message.*
-import org.apache.logging.log4j.spi.{AbstractLogger, ExtendedLogger}
-import org.apache.logging.log4j.{Level, Marker, MarkerManager}
-import org.junit.runner.RunWith
-import org.mockito.ArgumentMatchers.{any, anyString, eq as eqv}
-import org.mockito.Mockito.*
-import org.scalatest.funsuite.AnyFunSuite
-import org.scalatestplus.junit.JUnitRunner
-import org.scalatestplus.mockito.MockitoSugar
-
-case class Custom(i: Int)
-
-trait Manager {
-  def fetchValue(): Int
-}
-
-case class TestFixture(mockLogger: ExtendedLogger, manager: Manager)
-
-@RunWith(classOf[JUnitRunner])
-class LoggerTest extends AnyFunSuite with MockitoSugar {
-
-  val msg                    = new ParameterizedMessage("msg {}", 17)
-  val entryMsg: EntryMessage = new DefaultFlowMessageFactory().newEntryMessage(msg)
-  val cseqMsg : CharSequence = new StringBuilder().append("cseq msg")
-  val objectMsg              = Custom(17)
-  val cause                  = new RuntimeException("cause")
-  val marker  : Marker       = MarkerManager.getMarker("marker")
-  val result                 = "foo"
-
-  def fixture: TestFixture = {
-    val mockLogger = {
-      val mockLogger = mock[ExtendedLogger]
-      when(mockLogger.getMessageFactory).thenReturn(new ParameterizedMessageFactory)
-      mockLogger
-    }
-    val manager = {
-      val mockManager = mock[Manager]
-      when(mockManager.fetchValue()).thenReturn(4711)
-      mockManager
-    }
-    TestFixture(mockLogger, manager)
-  }
-
-  test("fatal enabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.FATAL)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.fatal(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger).log(eqv(Level.FATAL), any[String], any[String])
-    verify(f.manager).fetchValue()
-  }
-
-  test("fatal disabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.FATAL)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger.fatal(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger, never).log(any[Level], any[String], any[String])
-    verify(f.manager, never).fetchValue()
-  }
-
-  test("error enabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.ERROR)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.error(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger).log(eqv(Level.ERROR), any[String], any[String])
-    verify(f.manager).fetchValue()
-  }
-
-  test("error disabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.ERROR)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger.error(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger, never).log(any[Level], any[String], any[String])
-    verify(f.manager, never).fetchValue()
-  }
-
-  test("warn enabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.WARN)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.warn(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger).log(eqv(Level.WARN), any[String], any[String])
-    verify(f.manager).fetchValue()
-  }
-
-  test("warn disabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.WARN)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger.warn(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger, never).log(any[Level], any[String], any[String])
-    verify(f.manager, never).fetchValue()
-  }
-
-  test("info enabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.info(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger).log(eqv(Level.INFO), any[String], any[String])
-    verify(f.manager).fetchValue()
-  }
-
-  test("info disabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger.info(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger, never).log(any[Level], any[String], any[String])
-    verify(f.manager, never).fetchValue()
-  }
-
-  test("debug enabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.DEBUG)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.debug(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger).log(eqv(Level.DEBUG), any[String], any[String])
-    verify(f.manager).fetchValue()
-  }
-
-  test("debug disabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.DEBUG)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger.debug(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger, never).log(any[Level], any[String], any[String])
-    verify(f.manager, never).fetchValue()
-  }
-
-  test("trace enabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.trace(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger).log(eqv(Level.TRACE), any[String], any[String])
-    verify(f.manager).fetchValue()
-  }
-
-  test("trace disabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger.trace(s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger, never).log(any[Level], any[String], any[String])
-    verify(f.manager, never).fetchValue()
-  }
-
-
-  test("log enabled with Message message and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, msg)
-    verify(f.mockLogger).log(eqv(Level.INFO), eqv(marker), eqv(msg))
-  }
-
-  test("log disabled with Message message and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, msg)
-    verify(f.mockLogger, never).log(any[Level], any[Marker], any[Message])
-  }
-
-  test("log enabled with String message and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger).log(eqv(Level.INFO), eqv(marker), any[String], eqv(4711))
-    verify(f.manager).fetchValue()
-  }
-
-  test("log disabled with String message and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger, never).log(any[Level], any[Marker], any[String], any[Object])
-    verify(f.manager, never).fetchValue()
-  }
-
-  test("log enabled with CharSequence message and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, cseqMsg)
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(marker), any[Message], eqv(null))
-  }
-
-  test("log disabled with CharSequence message and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, cseqMsg)
-    verify(f.mockLogger, never).logMessage(any[String], any[Level], any[Marker], any[Message], any[Throwable])
-  }
-
-  test("log enabled with Object message and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, objectMsg)
-    verify(f.mockLogger).log(eqv(Level.INFO), eqv(marker), eqv(objectMsg))
-  }
-
-  test("log disabled with Object message and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, objectMsg)
-    verify(f.mockLogger, never).log(any[Level], any[Marker], any[Object], any[Throwable])
-  }
-
-  test("log enabled with Message message and cause and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, msg, cause)
-    verify(f.mockLogger).log(eqv(Level.INFO), eqv(marker), eqv(msg), eqv(cause))
-  }
-
-  test("log disabled with Message message and cause and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, msg, cause)
-    verify(f.mockLogger, never).log(any[Level], any[Marker], any[Message], any[Throwable])
-  }
-
-  test("log enabled with String message and cause and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}", cause)
-    verify(f.mockLogger).log(eqv(Level.INFO), eqv(marker), any[String], eqv(4711), eqv(cause))
-    verify(f.manager).fetchValue()
-  }
-
-  test("log disabled with String message and cause and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, s"string msg with value: ${f.manager.fetchValue()}", cause)
-    verify(f.mockLogger, never).log(any[Level], any[Marker], any[String], any[Object], any[Throwable])
-    verify(f.manager, never).fetchValue()
-  }
-
-  test("log enabled with CharSequence message and cause and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, cseqMsg, cause)
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(marker), any[Message], eqv(cause))
-  }
-
-  test("log disabled with CharSequence message and cause and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, cseqMsg, cause)
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-  }
-
-  test("log enabled with Object message and cause and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, objectMsg, cause)
-    verify(f.mockLogger).log(eqv(Level.INFO), eqv(marker), eqv(objectMsg), eqv(cause))
-  }
-
-  test("log disabled with Object message and cause and Marker") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO, marker)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, marker, objectMsg, cause)
-    verify(f.mockLogger, never).log(any[Level], any[Marker], any[Object], any[Throwable])
-  }
-
-  test("log enabled with Message message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, msg)
-    verify(f.mockLogger).log(eqv(Level.INFO), eqv(msg))
-  }
-
-  test("log disabled with Message message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, msg)
-    verify(f.mockLogger, never).log(any[Level], any[Message])
-  }
-
-  test("log enabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger).log(eqv(Level.INFO), any[String], eqv(4711))
-    verify(f.manager).fetchValue()
-  }
-
-  test("log disabled with String message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}")
-    verify(f.mockLogger, never).log(any[Level], any[String], any[Object])
-    verify(f.manager, never).fetchValue()
-  }
-
-  test("log enabled with CharSequence message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, cseqMsg)
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(null), any[Message], eqv(null))
-  }
-
-  test("log disabled with CharSequence message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, cseqMsg)
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-  }
-
-  test("log enabled with Object message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, objectMsg)
-    verify(f.mockLogger).log(eqv(Level.INFO), any[Object])
-  }
-
-  test("log disabled with Object message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, objectMsg)
-    verify(f.mockLogger, never).log(any[Level], any[Object], any[Throwable])
-  }
-
-  test("log enabled with Message message and cause") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, msg, cause)
-    verify(f.mockLogger).log(eqv(Level.INFO), eqv(msg), eqv(cause))
-  }
-
-  test("log disabled with Message message and cause") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, msg, cause)
-    verify(f.mockLogger, never).log(any[Level], any[Marker], any[Message], any[Throwable])
-  }
-
-  test("log enabled with String message and cause") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}", cause)
-    verify(f.mockLogger).log(eqv(Level.INFO), any[String], eqv(4711), eqv(cause))
-    verify(f.manager).fetchValue()
-  }
-
-  test("log disabled with String message and cause") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, s"string msg with value: ${f.manager.fetchValue()}", cause)
-    verify(f.mockLogger, never).log(any[Level], any[String], any[Object], any[Throwable])
-    verify(f.manager, never).fetchValue()
-  }
-
-  test("log enabled with CharSequence message and cause") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, cseqMsg, cause)
-    verify(f.mockLogger).logMessage(eqv(Logger.FQCN), eqv(Level.INFO), eqv(null), any[Message], eqv(cause))
-  }
-
-  test("log disabled with CharSequence message and cause") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, cseqMsg, cause)
-    verify(f.mockLogger, never).logMessage(eqv(Logger.FQCN), any[Level], any[Marker], any[Message], any[Throwable])
-  }
-
-  test("log enabled with Object message and cause") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, objectMsg, cause)
-    verify(f.mockLogger).log(eqv(Level.INFO), eqv(objectMsg), eqv(cause))
-  }
-
-  test("log disabled with Object message and cause") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.INFO)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger(Level.INFO, objectMsg, cause)
-    verify(f.mockLogger, never).log(any[Level], any[Object], any[Throwable])
-  }
-
-
-  test("traceEntry") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.traceEntry()
-    verify(f.mockLogger).traceEntry()
-  }
-
-  test("traceEntry enabled with params") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.traceEntry("foo", "bar")
-    verify(f.mockLogger).traceEntry("foo", "bar")
-  }
-
-  test("traceEntry disabled with params") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger.traceEntry("foo", "bar")
-    //traceEntry is now passes through to the underlying logger without checking if logging is enabled (the delegate checks anyway)
-    verify(f.mockLogger).traceEntry("foo", "bar")
-  }
-
-  test("traceEntry enabled with message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.traceEntry(msg)
-    verify(f.mockLogger).traceEntry(eqv(msg))
-  }
-
-  test("traceEntry disabled with message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.ENTRY_MARKER, null.asInstanceOf[AnyRef], null)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger.traceEntry(msg)
-    //traceEntry is now passes through to the underlying logger without checking if logging is enabled (the delegate checks anyway)
-    verify(f.mockLogger).traceEntry(eqv(msg))
-  }
-
-  test("traceExit") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.traceExit()
-    verify(f.mockLogger).traceExit()
-  }
-
-  test("traceExit with result") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.traceExit(result)
-    verify(f.mockLogger).traceExit(result)
-  }
-
-  test("traceExit with entrymessage") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.traceExit(entryMsg)
-    verify(f.mockLogger).traceExit(entryMsg)
-  }
-
-  test("traceExit with entrymessage and result") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.traceExit(entryMsg, result)
-    verify(f.mockLogger).traceExit(entryMsg, result)
-  }
-
-  test("traceExit enabled with message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(true)
-    val logger = Logger(f.mockLogger)
-    logger.traceExit(msg, result)
-    verify(f.mockLogger).traceExit(eqv(msg), eqv(result))
-  }
-
-  test("traceExit disabled with message") {
-    val f = fixture
-    when(f.mockLogger.isEnabled(Level.TRACE, AbstractLogger.EXIT_MARKER, msg, null)).thenReturn(false)
-    val logger = Logger(f.mockLogger)
-    logger.traceExit(msg, result)
-    //traceExit is now passes through to the underlying logger without checking if logging is enabled (the delegate checks anyway)
-    verify(f.mockLogger).traceExit(eqv(msg), eqv(result))
-  }
-
-  test("throwing") {
-    val f = fixture
-    val logger = Logger(f.mockLogger)
-    logger.throwing(cause)
-    verify(f.mockLogger).throwing(eqv(cause))
-  }
-
-  test("throwing with level") {
-    val f = fixture
-    val logger = Logger(f.mockLogger)
-    logger.throwing(Level.INFO, cause)
-    verify(f.mockLogger).throwing(eqv(Level.INFO), eqv(cause))
-  }
-
-  test("catching") {
-    val f = fixture
-    val logger = Logger(f.mockLogger)
-    logger.catching(cause)
-    verify(f.mockLogger).catching(eqv(cause))
-  }
-
-  test("catching with level") {
-    val f = fixture
-    val logger = Logger(f.mockLogger)
-    logger.catching(Level.INFO, cause)
-    verify(f.mockLogger).catching(eqv(Level.INFO), eqv(cause))
-  }
-
-}
diff --git a/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala b/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala
deleted file mode 100644
index b37124c..0000000
--- a/src/test/scala/org/apache/logging/log4j/scala/LoggingContextTest.scala
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.scala
-
-import org.junit.runner.RunWith
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.funsuite.AnyFunSuite
-import org.scalatestplus.junit.JUnitRunner
-
-import scala.collection.mutable
-
-@RunWith(classOf[JUnitRunner])
-class LoggingContextTest extends AnyFunSuite with Matchers {
-
-  test("put single, contains, get") {
-    LoggingContext += "key" -> "value"
-
-    LoggingContext.contains("key") shouldBe true
-    LoggingContext.get("key") shouldBe Some("value")
-    LoggingContext.contains("bogus") shouldBe false
-    LoggingContext.get("bogus") shouldBe None
-  }
-
-  test("put multiple 1") {
-    LoggingContext ++= Seq("key1" -> "value1", "key2" -> "value2")
-
-    LoggingContext.get("key1") shouldBe Some("value1")
-    LoggingContext.get("key2") shouldBe Some("value2")
-  }
-
-  test("put multiple 2") {
-    LoggingContext ++= Seq("key1" -> "value1", "key2" -> "value2")
-
-    LoggingContext.get("key1") shouldBe Some("value1")
-    LoggingContext.get("key2") shouldBe Some("value2")
-  }
-
-  test("remove single") {
-    LoggingContext += ("key1" -> "value1")
-    LoggingContext += ("key2" -> "value2")
-    LoggingContext += ("key3" -> "value3")
-
-    LoggingContext -= "key1"
-
-    LoggingContext.get("key1") shouldBe None
-    LoggingContext.get("key2") shouldBe Some("value2")
-    LoggingContext.get("key3") shouldBe Some("value3")
-  }
-
-  test("remove multiple 1") {
-    LoggingContext += ("key1" -> "value1")
-    LoggingContext += ("key2" -> "value2")
-    LoggingContext += ("key3" -> "value3")
-
-    LoggingContext --= Set("key1", "key2")
-
-    LoggingContext.get("key1") shouldBe None
-    LoggingContext.get("key2") shouldBe None
-    LoggingContext.get("key3") shouldBe Some("value3")
-  }
-
-  test("remove multiple 2") {
-    LoggingContext += ("key1" -> "value1")
-    LoggingContext += ("key2" -> "value2")
-    LoggingContext += ("key3" -> "value3")
-
-    LoggingContext --= Seq("key1", "key2")
-
-    LoggingContext.get("key1") shouldBe None
-    LoggingContext.get("key2") shouldBe None
-    LoggingContext.get("key3") shouldBe Some("value3")
-  }
-
-  test("clear, size, isEmpty") {
-    LoggingContext += ("key" -> "value")
-
-    LoggingContext.clear()
-
-    LoggingContext.contains("key") shouldBe false
-    LoggingContext.size shouldBe 0
-    LoggingContext.isEmpty shouldBe true
-  }
-
-  test("iterator") {
-    LoggingContext += ("key1" -> "value1")
-    LoggingContext += ("key2" -> "value2")
-
-    LoggingContext.iterator.toSet shouldBe Set("key1" -> "value1", "key2" -> "value2")
-  }
-
-  test("foreach") {
-    LoggingContext += ("key1" -> "value1")
-    LoggingContext += ("key2" -> "value2")
-
-    val result = mutable.Set.empty[(String, String)]
-
-    LoggingContext.foreach { result += _ }
-
-    result shouldBe Set("key1" -> "value1", "key2" -> "value2")
-  }
-
-}
diff --git a/version.sbt b/version.sbt
deleted file mode 100644
index 59f8e69..0000000
--- a/version.sbt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-ThisBuild / version := "13.0.0-SNAPSHOT"


[logging-log4j-scala] 04/05: Add auto-generated files

Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-scala.git

commit b75a82e57ef0c2fd96c828a30dc691de9fff255f
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Fri Sep 29 14:11:12 2023 +0200

    Add auto-generated files
---
 src/site/_release-notes/_13.x.x.adoc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/site/_release-notes/_13.x.x.adoc b/src/site/_release-notes/_13.x.x.adoc
index ab0ce78..4303faa 100644
--- a/src/site/_release-notes/_13.x.x.adoc
+++ b/src/site/_release-notes/_13.x.x.adoc
@@ -51,5 +51,10 @@ This minor release contains various bug fixes and improvements.
 * Switch the CI to GitHub Actions
 * Switched from `sbt` to Maven to take advantage of `logging-parent` conveniences
 * Switched to semantic versioning
-* Updated Log4j version to `2.20.0`
+* Updated `org.apache.logging.log4j:log4j-api` version to `2.20.0`
+* Update `org.apache.logging:logging-parent` to version `10.1.0`
 * Started using `log4j-changelog`
+
+==== Fixed
+
+* Fixed Scala 3 macros (https://github.com/apache/logging-log4j-scala/pull/26[26])