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 2018/04/01 00:55:56 UTC
[1/5] logging-log4j-scala git commit: Add dynamic project version for
usage page
Repository: logging-log4j-scala
Updated Branches:
refs/heads/sbt a6af7ecc1 -> e665ddfbe
Add dynamic project version for usage page
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/commit/c888b039
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/c888b039
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/c888b039
Branch: refs/heads/sbt
Commit: c888b039f90a98f0f82844de3a9e9207b327cc41
Parents: a6af7ec
Author: Matt Sicker <bo...@gmail.com>
Authored: Sat Mar 31 19:26:25 2018 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sat Mar 31 19:26:25 2018 -0500
----------------------------------------------------------------------
src/asciidoctor/usage.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/c888b039/src/asciidoctor/usage.adoc
----------------------------------------------------------------------
diff --git a/src/asciidoctor/usage.adoc b/src/asciidoctor/usage.adoc
index 10fa6b9..9300963 100644
--- a/src/asciidoctor/usage.adoc
+++ b/src/asciidoctor/usage.adoc
@@ -19,10 +19,10 @@
Log4j Scala API requires Log4j API. An example SBT dependency setup:
.build.sbt
-[source,scala]
+[source,scala,subs=attributes]
----
libraryDependencies ++= Seq(
- "org.apache.logging.log4j" %% "log4j-api-scala" % "11.0",
+ "org.apache.logging.log4j" %% "log4j-api-scala" % "{project-version}",
"org.apache.logging.log4j" % "log4j-api" % "2.11.0",
"org.apache.logging.log4j" % "log4j-core" % "2.11.0" % Runtime)
----
[4/5] logging-log4j-scala git commit: Add download page
Posted by ma...@apache.org.
Add download page
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/commit/6cb937c2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/6cb937c2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/6cb937c2
Branch: refs/heads/sbt
Commit: 6cb937c2d622b88a0c9c0de08b33912196259a72
Parents: a42494a
Author: Matt Sicker <bo...@gmail.com>
Authored: Sat Mar 31 19:54:36 2018 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sat Mar 31 19:54:36 2018 -0500
----------------------------------------------------------------------
src/asciidoctor/download.adoc | 74 ++++++++++++++++++++++++++++++++++++++
src/asciidoctor/index.adoc | 5 ++-
src/asciidoctor/usage.adoc | 11 ------
3 files changed, 78 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/6cb937c2/src/asciidoctor/download.adoc
----------------------------------------------------------------------
diff --git a/src/asciidoctor/download.adoc b/src/asciidoctor/download.adoc
new file mode 100644
index 0000000..2d11fc9
--- /dev/null
+++ b/src/asciidoctor/download.adoc
@@ -0,0 +1,74 @@
+////
+ 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
+
+|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]
+
+|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]
+
+|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]
+
+|Apache Log4j Scala API binary (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]
+|===
+
+It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures.
+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,bash,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.11.0" % Runtime
+)
+----
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/6cb937c2/src/asciidoctor/index.adoc
----------------------------------------------------------------------
diff --git a/src/asciidoctor/index.adoc b/src/asciidoctor/index.adoc
index 913809b..6eccdfb 100644
--- a/src/asciidoctor/index.adoc
+++ b/src/asciidoctor/index.adoc
@@ -24,12 +24,15 @@ While this library is not required to use Log4j API in Scala, it does provide id
include::usage.adoc[]
+include::download.adoc[]
+
include::changes.adoc[]
+include::build.adoc[]
+
////
TODO:
* Apache logo
-* Downloads page
* License report
* ScalaDocs links
* Project links
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/6cb937c2/src/asciidoctor/usage.adoc
----------------------------------------------------------------------
diff --git a/src/asciidoctor/usage.adoc b/src/asciidoctor/usage.adoc
index 9300963..cc65bad 100644
--- a/src/asciidoctor/usage.adoc
+++ b/src/asciidoctor/usage.adoc
@@ -16,17 +16,6 @@
////
== Usage
-Log4j Scala API requires Log4j API. An example SBT dependency setup:
-
-.build.sbt
-[source,scala,subs=attributes]
-----
-libraryDependencies ++= Seq(
- "org.apache.logging.log4j" %% "log4j-api-scala" % "{project-version}",
- "org.apache.logging.log4j" % "log4j-api" % "2.11.0",
- "org.apache.logging.log4j" % "log4j-core" % "2.11.0" % Runtime)
-----
-
Using the Scala API is as simple as mixing in the `Logging` trait to your class. Example:
[source,scala]
[3/5] logging-log4j-scala git commit: Add build page
Posted by ma...@apache.org.
Add build page
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/commit/a42494ae
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/a42494ae
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/a42494ae
Branch: refs/heads/sbt
Commit: a42494ae47b69c6d12aa4258704c35fcb3174edb
Parents: a95fbe6
Author: Matt Sicker <bo...@gmail.com>
Authored: Sat Mar 31 19:52:56 2018 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sat Mar 31 19:52:56 2018 -0500
----------------------------------------------------------------------
src/asciidoctor/build.adoc | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/a42494ae/src/asciidoctor/build.adoc
----------------------------------------------------------------------
diff --git a/src/asciidoctor/build.adoc b/src/asciidoctor/build.adoc
new file mode 100644
index 0000000..955501c
--- /dev/null
+++ b/src/asciidoctor/build.adoc
@@ -0,0 +1,32 @@
+////
+ 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"
+----
[5/5] logging-log4j-scala git commit: Add changelog entry
Posted by ma...@apache.org.
Add changelog entry
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/commit/e665ddfb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/e665ddfb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/e665ddfb
Branch: refs/heads/sbt
Commit: e665ddfbeed6ffcf10d47cdef3e48c8b773f41a1
Parents: 6cb937c
Author: Matt Sicker <bo...@gmail.com>
Authored: Sat Mar 31 19:55:49 2018 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sat Mar 31 19:55:49 2018 -0500
----------------------------------------------------------------------
src/asciidoctor/changes.adoc | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/e665ddfb/src/asciidoctor/changes.adoc
----------------------------------------------------------------------
diff --git a/src/asciidoctor/changes.adoc b/src/asciidoctor/changes.adoc
index 890263a..748b0e9 100644
--- a/src/asciidoctor/changes.adoc
+++ b/src/asciidoctor/changes.adoc
@@ -21,6 +21,7 @@
[vertical]
New Features::
[horizontal]
+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.
[2/5] logging-log4j-scala git commit: Set version to 11.1-SNAPSHOT
Posted by ma...@apache.org.
Set version to 11.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/commit/a95fbe6e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/a95fbe6e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/a95fbe6e
Branch: refs/heads/sbt
Commit: a95fbe6e2bbd8f5ae351b6b0261f4a76ab0ffa8d
Parents: c888b03
Author: Matt Sicker <bo...@gmail.com>
Authored: Sat Mar 31 19:52:14 2018 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sat Mar 31 19:52:14 2018 -0500
----------------------------------------------------------------------
version.sbt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/a95fbe6e/version.sbt
----------------------------------------------------------------------
diff --git a/version.sbt b/version.sbt
index b8bcd26..e0f281a 100644
--- a/version.sbt
+++ b/version.sbt
@@ -14,4 +14,4 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-version in ThisBuild := "12.0-SNAPSHOT"
+version in ThisBuild := "11.1-SNAPSHOT"