You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2020/02/08 19:24:43 UTC

[logging-log4j-scala] branch master updated (397b32b -> 50a3848)

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

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


    from 397b32b  Setting version to 12.1-SNAPSHOT
     new 1d63657  Update SCM URLs to gitbox
     new e46ccf9  Add SHA-2 links and update log4j version
     new ee220be  Update changelog for 12.0
     new e173751  Update log4j dependency
     new 5e3bb2b  Fix site URLs
     new 50a3848  Fix API links

The 6 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:
 build.sbt                     | 10 +++++-----
 project/Dependencies.scala    |  2 +-
 src/asciidoctor/changes.adoc  |  3 ++-
 src/asciidoctor/download.adoc | 14 +++++++++++---
 src/asciidoctor/usage.adoc    |  9 ++++++---
 5 files changed, 25 insertions(+), 13 deletions(-)


[logging-log4j-scala] 06/06: Fix API links

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

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

commit 50a3848dc86ff592a7056b97a044750a5f46c7d6
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Sat Feb 8 13:24:34 2020 -0600

    Fix API links
---
 src/asciidoctor/usage.adoc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/asciidoctor/usage.adoc b/src/asciidoctor/usage.adoc
index 6f60637..6cc3e52 100644
--- a/src/asciidoctor/usage.adoc
+++ b/src/asciidoctor/usage.adoc
@@ -42,13 +42,16 @@ class MyClass extends BaseClass with Logging {
 |Scala Version |API Link
 
 |Scala 2.10
-|https://logging.apache.org/log4j/scala/log4j-api-scala_2.10/scaladocs/#org.apache.logging.log4j.scala.package[ScalaDocs]
+|link:api/2.10/[ScalaDocs]
 
 |Scala 2.11
-|https://logging.apache.org/log4j/scala/log4j-api-scala_2.11/scaladocs/#org.apache.logging.log4j.scala.package[ScalaDocs]
+|link:api/2.11/[ScalaDocs]
 
 |Scala 2.12
-|https://logging.apache.org/log4j/scala/log4j-api-scala_2.12/scaladocs/org/apache/logging/log4j/scala/[ScalaDocs]
+|link:api/2.12/[ScalaDocs]
+
+|Scala 2.13
+|link:api/2.13/[ScalaDocs]
 |===
 
 === Configuration


[logging-log4j-scala] 05/06: Fix site URLs

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

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

commit 5e3bb2bb2a8e4e8e8b5c329d5e0b6887935d3070
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Sat Feb 8 13:21:50 2020 -0600

    Fix site URLs
---
 build.sbt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sbt b/build.sbt
index bbf305f..34616ee 100644
--- a/build.sbt
+++ b/build.sbt
@@ -124,8 +124,8 @@ lazy val releaseSettings = Seq(
 )
 
 lazy val siteSettings = Seq(
-  apiURL := Some(url(s"https://logging.apache.org/log4j/scala/api/${version.value}/")),
-  siteSubdirName in SiteScaladoc := s"api/${version.value}",
+  apiURL := Some(url(s"https://logging.apache.org/log4j/log4j-scala-${version.value}/")),
+  siteSubdirName in SiteScaladoc := s"api/${scalaBinaryVersion.value}",
   managedSources in Asciidoc += {
     (auditReport in Compile).value
     (target in Compile).value / "rat.adoc"


[logging-log4j-scala] 01/06: Update SCM URLs to gitbox

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

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

commit 1d63657e6878d8b00519ca324588b0752d942136
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Sat Feb 8 12:45:22 2020 -0600

    Update SCM URLs to gitbox
---
 build.sbt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.sbt b/build.sbt
index de6aba4..bbf305f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -29,9 +29,9 @@ lazy val metadataSettings = Seq(
     organizationName = "Apache Software Foundation",
     organizationHomepage = Some(url("https://www.apache.org/")),
     scmInfo = Some(ScmInfo(
-      url("https://git-wip-us.apache.org/repos/asf?p=logging-log4j-scala.git;a=summary"),
-      "scm:git:http://git-wip-us.apache.org/repos/asf/logging-log4j-scala.git",
-      "scm:git:https://git-wip-us.apache.org/repos/asf/logging-log4j-scala.git"
+      url("https://gitbox.apache.org/repos/asf?p=logging-log4j-scala.git;a=summary"),
+      "scm:git:https://gitbox.apache.org/repos/asf/logging-log4j-scala.git",
+      "scm:git:https://gitbox.apache.org/repos/asf/logging-log4j-scala.git"
     )),
     developers = Vector(
       Developer("mikes", "Mikael Ståldal", "mikes@apache.org", null),


[logging-log4j-scala] 02/06: Add SHA-2 links and update log4j version

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

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

commit e46ccf9d174388df9fe5ac6857a9d72e1a35c8b1
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Sat Feb 8 12:45:46 2020 -0600

    Add SHA-2 links and update log4j version
---
 src/asciidoctor/download.adoc | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/asciidoctor/download.adoc b/src/asciidoctor/download.adoc
index 90057f2..56decc3 100644
--- a/src/asciidoctor/download.adoc
+++ b/src/asciidoctor/download.adoc
@@ -22,26 +22,34 @@ 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
+|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 or MD5 signatures.
+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.
@@ -69,6 +77,6 @@ How to add Log4j Scala API to your project using Log4j 2:
 ----
 libraryDependencies ++= Seq(
   "org.apache.logging.log4j" %% "log4j-api-scala" % "{project-version}",
-  "org.apache.logging.log4j" % "log4j-core" % "2.11.0" % Runtime
+  "org.apache.logging.log4j" % "log4j-core" % "2.13.0" % Runtime
 )
 ----


[logging-log4j-scala] 03/06: Update changelog for 12.0

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

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

commit ee220bea7249735ae8c8aa3f78a9fa208aa6d52d
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Sat Feb 8 13:00:45 2020 -0600

    Update changelog for 12.0
---
 src/asciidoctor/changes.adoc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/asciidoctor/changes.adoc b/src/asciidoctor/changes.adoc
index a9b716c..96b8441 100644
--- a/src/asciidoctor/changes.adoc
+++ b/src/asciidoctor/changes.adoc
@@ -16,7 +16,7 @@
 ////
 == ChangeLog
 
-=== Version 11.1
+=== Version 12.0
 
 [vertical]
 New Features::
@@ -29,6 +29,7 @@ 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.


[logging-log4j-scala] 04/06: Update log4j dependency

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

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

commit e1737519ec6354dc2135cdc5312736229ee14ed4
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Sat Feb 8 13:21:36 2020 -0600

    Update log4j dependency
---
 project/Dependencies.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 9656d47..7cb3a37 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -25,7 +25,7 @@ object Dependencies {
   def scalaReflect(version: String): ModuleID =
     "org.scala-lang" % "scala-reflect" % version
 
-  private val log4jV = "2.12.1"
+  private val log4jV = "2.13.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"