[1/2] logging-log4j-kotlin git commit: Add a function to create an explicitly-named logger

2018-04-03 Thread mattsicker 
Repository: logging-log4j-kotlin
Updated Branches:
  refs/heads/master bdd72d3b2 -> 96b470ece


Add a function to create an explicitly-named logger


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/commit/dca80be9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/tree/dca80be9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/diff/dca80be9

Branch: refs/heads/master
Commit: dca80be9d6fb5012daa5f18fad6073b6e2b0c7e1
Parents: bdd72d3
Author: Raman Gupta 
Authored: Tue Apr 3 12:11:28 2018 -0400
Committer: Raman Gupta 
Committed: Tue Apr 3 14:35:35 2018 -0400

--
 .../logging/log4j/kotlin/LoggingFactory.kt  | 10 +++-
 .../NamedLoggerTest.kt  | 48 
 src/main/asciidoc/usage.adoc| 17 ++-
 3 files changed, 73 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/dca80be9/log4j-api-kotlin/src/main/kotlin/org/apache/logging/log4j/kotlin/LoggingFactory.kt
--
diff --git 
a/log4j-api-kotlin/src/main/kotlin/org/apache/logging/log4j/kotlin/LoggingFactory.kt
 
b/log4j-api-kotlin/src/main/kotlin/org/apache/logging/log4j/kotlin/LoggingFactory.kt
index 7a4126c..87ee9a8 100644
--- 
a/log4j-api-kotlin/src/main/kotlin/org/apache/logging/log4j/kotlin/LoggingFactory.kt
+++ 
b/log4j-api-kotlin/src/main/kotlin/org/apache/logging/log4j/kotlin/LoggingFactory.kt
@@ -21,11 +21,19 @@ import org.apache.logging.log4j.spi.ExtendedLogger
 import kotlin.reflect.full.companionObject
 
 /**
- * Logger instantiation by function. Use: `val log = logger()`.
+ * Logger instantiation by function. Use: `val log = logger()`. The logger 
will be named according to the
+ * receiver of the function, which can be a class or object. An alternative 
for explicitly named loggers is
+ * the `namedLogger` function.
  */
 @Suppress("unused")
 inline fun  T.logger() = loggerOf(T::class.java)
 
+/**
+ * Named logger instantiation by function. Use: `val log = 
namedLogger('MyLoggerName')`. Generally one should
+ * prefer the `logger` function to create automatically named loggers.
+ */
+fun namedLogger(name: String): KotlinLogger = 
KotlinLogger(LogManager.getContext(false).getLogger(name))
+
 fun loggerDelegateOf(ofClass: Class<*>): ExtendedLogger {
   return LogManager.getContext(ofClass.classLoader, 
false).getLogger(unwrapCompanionClass(ofClass).name)
 }

http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/dca80be9/log4j-api-kotlin/src/test/kotlin/org.apache.logging.log4j.kotlin/NamedLoggerTest.kt
--
diff --git 
a/log4j-api-kotlin/src/test/kotlin/org.apache.logging.log4j.kotlin/NamedLoggerTest.kt
 
b/log4j-api-kotlin/src/test/kotlin/org.apache.logging.log4j.kotlin/NamedLoggerTest.kt
new file mode 100644
index 000..28c0cfb
--- /dev/null
+++ 
b/log4j-api-kotlin/src/test/kotlin/org.apache.logging.log4j.kotlin/NamedLoggerTest.kt
@@ -0,0 +1,48 @@
+/*
+ * 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.kotlin
+
+import org.apache.logging.log4j.Level
+import org.apache.logging.log4j.junit.LoggerContextRule
+import org.apache.logging.log4j.kotlin.support.withListAppender
+import org.junit.Rule
+import org.junit.Test
+import kotlin.test.assertEquals
+
+const val loggerName = "Foo"
+
+class NamedLoggerTest {
+  @Rule @JvmField var init = LoggerContextRule("InfoLogger.xml")
+
+  val log = namedLogger(loggerName)
+
+  @Test
+  fun `Logging from an explicitly named logger logs with the correct name`() {
+val msg = "This is an error log."
+val msgs = withListAppender { _, _ ->
+  log.error(msg)
+}
+
+assertEquals(1, msgs.size.toLong())
+
+msgs.first().also {
+  assertEquals(Level.ERROR, it.level)
+  assertEquals(msg, it.message.format)
+  assertEquals(loggerName, it.loggerName)
+}
+  }

[2/2] logging-log4j-kotlin git commit: Exclude travis config from rat check

2018-04-03 Thread mattsicker 
Exclude travis config from rat check


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/commit/96b470ec
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/tree/96b470ec
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/diff/96b470ec

Branch: refs/heads/master
Commit: 96b470ece6a12c336ace30ab71150146c9bdc017
Parents: dca80be
Author: Raman Gupta 
Authored: Tue Apr 3 17:19:32 2018 -0400
Committer: Raman Gupta 
Committed: Tue Apr 3 17:19:32 2018 -0400

--
 pom.xml | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/96b470ec/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 63a16e4..ebe7329 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,6 +105,11 @@
 
   
 
+
+  
+.travis.yml
+  
+
   
   
 org.jetbrains.kotlin

logging-log4j-scala git commit: Add minimal travis config for PRs

2018-04-03 Thread mattsicker 
Repository: logging-log4j-scala
Updated Branches:
  refs/heads/master b5ff1c751 -> b26bc91f5


Add minimal travis config for PRs


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/b26bc91f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/b26bc91f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/b26bc91f

Branch: refs/heads/master
Commit: b26bc91f530e247b16b82204ea532590619eba21
Parents: b5ff1c7
Author: Matt Sicker 
Authored: Tue Apr 3 16:18:58 2018 -0500
Committer: Matt Sicker 
Committed: Tue Apr 3 16:18:58 2018 -0500

--
 .travis.yml | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/b26bc91f/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000..8fa7e87
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,5 @@
+language: java
+jdk:
+  - openjdk8
+script:
+  - ./sbt -batch "+ test"

[logging-log4j-scala] Git Push Summary

2018-04-03 Thread mattsicker 
Repository: logging-log4j-scala
Updated Branches:
  refs/heads/sbt [deleted] ffcbc0362

[43/50] [abbrv] logging-log4j-scala git commit: Remove obsolete files

2018-04-03 Thread mattsicker 
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/be2e32be/src/site/resources/js/prettify.min.js
--
diff --git a/src/site/resources/js/prettify.min.js 
b/src/site/resources/js/prettify.min.js
deleted file mode 100644
index 6623601..000
--- a/src/site/resources/js/prettify.min.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (C) 2006 Google Inc.
-//
-// Licensed 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.
-var q=null;window.PR_SHOULD_USE_CONTINUATION=!0;
-(function(){function L(a){function m(a){var f=a.charCodeAt(0);if(f!==92)return 
f;var 
b=a.charAt(1);return(f=r[b])?f:"0"<=b&<="7"?parseInt(a.substring(1),8):b==="u"||b==="x"?parseInt(a.substring(2),16):a.charCodeAt(1)}function
 
e(a){if(a<32)return(a<16?"\\x0":"\\x")+a.toString(16);a=String.fromCharCode(a);if(a==="\\"||a==="-"||a==="["||a==="]")a="\\"+a;return
 a}function h(a){for(var 
f=a.substring(1,a.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),a=
-[],b=[],o=f[0]==="^",c=o?1:0,i=f.length;c122||(d<65||j>90||b.push([Math.max(65,j)|32,Math.min(d,90)|32]),d<97||j>122||b.push([Math.max(97,j)&-33,Math.min(d,122)&-33]))}}b.sort(function(a,f){return
 
a[0]-f[0]||f[1]-a[1]});f=[];j=[NaN,NaN];for(c=0;ci[0]&&(i[1]+1>i[0]&("-"),b.push(e(i[1])));b.push("]");return
 b.join("")}function y(a){for(var 
f=a.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),b=f.length,d=[],c=0,i=0;c=2&==="["?f[c]=h(j):a!=="\\"&&(f[c]=j.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return
 f.join("")}for(var t=0,s=!1,l=!1,p=0,d=a.length;p=5&&"lang-"===b.substring(0,5))&&!(o&
 o[1]==="string"))c=!1,b="src";c||(r[f]=b)}i=d;d+=f.length;if(c){c=o[1];var 
j=f.indexOf(c),k=j+c.length;o[2]&&(k=f.length-o[2].length,j=k-c.length);b=b.substring(5);B(l+i,f.substring(0,j),e,p);B(l+i+j,c,C(b,c),p);B(l+i+k,f.substring(k),e,p)}else
 p.push(l+i,b)}a.e=p}var h={},y;(function(){for(var e=a.concat(m),
-l=[],p={},d=0,g=e.length;d=0;)h[n.charAt(k)]=r;r=r[1];n=""+r;p.hasOwnProperty(n)||(l.push(r),p[n]=q)}l.push(/[\S\s]/);y=L(l)})();var
 t=m.length;return e}function u(a){var

[26/50] [abbrv] logging-log4j-scala git commit: Add dynamic project version for usage page

2018-04-03 Thread mattsicker 
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/master
Commit: c888b039f90a98f0f82844de3a9e9207b327cc41
Parents: a6af7ec
Author: Matt Sicker 
Authored: Sat Mar 31 19:26:25 2018 -0500
Committer: Matt Sicker 
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)

[41/50] [abbrv] logging-log4j-scala git commit: Move sample module into sbt project

2018-04-03 Thread mattsicker 
Move sample module into sbt project


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/94faa798
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/94faa798
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/94faa798

Branch: refs/heads/master
Commit: 94faa7984a5df8d4e6ab1c8dba37c420bbe6d361
Parents: 59f47b8
Author: Matt Sicker 
Authored: Mon Apr 2 15:31:59 2018 -0500
Committer: Matt Sicker 
Committed: Mon Apr 2 15:31:59 2018 -0500

--
 build.sbt   | 33 
 log4j-api-scala-sample/pom.xml  | 82 
 .../src/main/resources/log4j2.xml   | 32 
 .../logging/log4j/scala/sample/LoggingApp.scala | 54 -
 .../src/site/markdown/index.md  | 20 -
 log4j-api-scala-sample/src/site/site.xml| 30 ---
 project/Dependencies.scala  |  1 +
 sample/src/main/resources/log4j2.xml| 32 
 .../logging/log4j/scala/sample/LoggingApp.scala | 54 +
 9 files changed, 102 insertions(+), 236 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/94faa798/build.sbt
--
diff --git a/build.sbt b/build.sbt
index 5bb6b15..9398b25 100644
--- a/build.sbt
+++ b/build.sbt
@@ -127,23 +127,20 @@ lazy val root = (project in file("."))
   .enablePlugins(SbtOsgi)
   .settings(bundleSettings: _*)
 
-//lazy val nopublish = Seq(
-//  publish := {},
-//  publishLocal := {},
-//  publishM2 := {},
-//  skip in publish := true
-//)
+lazy val nopublish = Seq(
+  publish := {},
+  publishLocal := {},
+  publishM2 := {},
+  skip in publish := true
+)
 
-//lazy val sample = (project in file("sample"))
-//  .settings(metadataSettings: _*)
-//  .settings(nopublish: _*)
-//  .settings(
-//name := "log4j-api-scala-sample",
-//scalaVersion := scala212,
-//libraryDependencies := Seq(
-//  "org.apache.logging.log4j" % "log4j-api" % log4j,
-//  "org.apache.logging.log4j" % "log4j-core" % log4j % Runtime
-//)
-//  )
-//  .dependsOn(root)
+lazy val sample = (project in file("sample"))
+  .settings(metadataSettings: _*)
+  .settings(compileSettings: _*)
+  .settings(nopublish: _*)
+  .settings(
+name := "log4j-api-scala-sample",
+libraryDependencies := Seq(log4jApi, log4jCore)
+  )
+  .dependsOn(root)
 

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/94faa798/log4j-api-scala-sample/pom.xml
--
diff --git a/log4j-api-scala-sample/pom.xml b/log4j-api-scala-sample/pom.xml
deleted file mode 100644
index 2f8b97b..000
--- a/log4j-api-scala-sample/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-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;>
-  4.0.0
-  
-org.apache.logging.log4j
-log4j-scala
-12.0-SNAPSHOT
-../
-  
-  log4j-api-scala-sample
-  jar
-  Scala API samples
-  http://http://logging.apache.org/log4j/2.x/
-  
-2.12.4
-3.3.1
-${basedir}/..
-  
-  
-
-  org.apache.logging.log4j
-  log4j-api-scala_2.12
-
-
-  org.apache.logging.log4j
-  log4j-core
-  runtime
-
-  
-  
-src/main/scala
-
-  
-net.alchim31.maven
-scala-maven-plugin
-${scala.maven.plugin.version}
-
-  
-
-  compile
-
-  
-
-
-  
--feature
--unchecked
--deprecation
-  
-
-  
-  
-org.codehaus.mojo
-exec-maven-plugin
-1.5.0
-
-  
org.apache.logging.log4j.scala.sample.LoggingApp
-
-  
-  
-org.apache.felix
-maven-bundle-plugin
-  
-
-  
-

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/94faa798/log4j-api-scala-sample/src/main/resources/log4j2.xml
--
diff --git a/log4j-api-scala-sample/src/main/resources/log4j2.xml 
b/log4j-api-scala-sample/src/main/resources/log4j2.xml
deleted file mode 100644
index 1c8703b..000
--- a/log4j-api-scala-sample/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-%d [%X{correlationId}] %5p %c{1} %X %F:%L - 
%m%n
-
-
-
-
-
-
-
-
-
\ No newline at end of file

[37/50] [abbrv] logging-log4j-scala git commit: Clarify logger names

2018-04-03 Thread mattsicker 
Clarify logger names


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/4e87e1f3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/4e87e1f3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/4e87e1f3

Branch: refs/heads/master
Commit: 4e87e1f3a333d457704908a7d20fbef3a399e304
Parents: 8ef7ea2
Author: Matt Sicker 
Authored: Sun Apr 1 13:43:17 2018 -0500
Committer: Matt Sicker 
Committed: Sun Apr 1 13:43:17 2018 -0500

--
 src/asciidoctor/usage.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/4e87e1f3/src/asciidoctor/usage.adoc
--
diff --git a/src/asciidoctor/usage.adoc b/src/asciidoctor/usage.adoc
index 528e999..6f60637 100644
--- a/src/asciidoctor/usage.adoc
+++ b/src/asciidoctor/usage.adoc
@@ -71,4 +71,4 @@ logger.debug(s"Logging in user ${user.getName} with birthday 
${user.calcBirthday
 
 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 `Logging` trait will automatically name the Logger accordingly to the 
class it is being used in.
+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.

[22/50] [abbrv] logging-log4j-scala git commit: Add failure emails for master builds

2018-04-03 Thread mattsicker 
Add failure emails for master builds


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/421c39c2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/421c39c2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/421c39c2

Branch: refs/heads/master
Commit: 421c39c267abed825217dd286f584f6d1a571df6
Parents: e37c29a
Author: Matt Sicker 
Authored: Fri Mar 30 19:47:50 2018 -0500
Committer: Matt Sicker 
Committed: Fri Mar 30 19:47:50 2018 -0500

--
 Jenkinsfile | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/421c39c2/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index c51e27c..1af227b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -57,6 +57,11 @@ pipeline {
 }
 }
 }
+post {
+failure {
+emailext body: "See <${env.BUILD_URL}>", replyTo: 
'd...@logging.apache.org', subject: "[Scala] Jenkins build failure 
(#${env.BUILD_NUMBER})", 'notificati...@logging.apache.org'
+}
+}
 }
 }
 }

[25/50] [abbrv] logging-log4j-scala git commit: Add rat checks to jenkins pipeline

2018-04-03 Thread mattsicker 
Add rat checks to jenkins pipeline


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/a6af7ecc
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/a6af7ecc
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/a6af7ecc

Branch: refs/heads/master
Commit: a6af7ecc166c2fdd439a0cc69833002d5680db36
Parents: 34e39f8
Author: Matt Sicker 
Authored: Sat Mar 31 18:06:25 2018 -0500
Committer: Matt Sicker 
Committed: Sat Mar 31 18:06:25 2018 -0500

--
 Jenkinsfile | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/a6af7ecc/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 90b3893..c9d0812 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,6 +27,7 @@ pipeline {
 stage('Build') {
 steps {
 ansiColor('xterm') {
+sh './sbt -batch auditCheck'
 sh './sbt -batch "+ compile"'
 }
 }
@@ -34,6 +35,7 @@ pipeline {
 stage('Test') {
 steps {
 ansiColor('xterm') {
+sh './sbt -batch Test/auditCheck'
 sh './sbt -batch "+ test"'
 }
 }

[49/50] [abbrv] logging-log4j-scala git commit: Remove obsolete files

2018-04-03 Thread mattsicker 
Remove obsolete files


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/ffcbc036
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/ffcbc036
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/ffcbc036

Branch: refs/heads/master
Commit: ffcbc03624fbdef97289cbd531e54a5ce90a9434
Parents: ddc513c
Author: Matt Sicker 
Authored: Tue Apr 3 16:01:36 2018 -0500
Committer: Matt Sicker 
Committed: Tue Apr 3 16:01:36 2018 -0500

--
 log4j-scala-distribution/pom.xml  | 134 -
 log4j-scala-distribution/src/assembly/bin.xml |  58 -
 log4j-scala-distribution/src/assembly/src.xml |  76 
 3 files changed, 268 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/ffcbc036/log4j-scala-distribution/pom.xml
--
diff --git a/log4j-scala-distribution/pom.xml b/log4j-scala-distribution/pom.xml
deleted file mode 100644
index 80bb523..000
--- a/log4j-scala-distribution/pom.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-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;>
-  4.0.0
-  
-org.apache.logging.log4j
-log4j-scala
-12.0-SNAPSHOT
-../
-  
-  log4j-scala-distribution
-  pom
-  Apache Log4j Scala API Distribution
-  Scala wrapper for Log4j API
-  
-
-  org.apache.logging.log4j
-  log4j-api-scala_2.10
-  ${project.version}
-
-
-  org.apache.logging.log4j
-  log4j-api-scala_2.10
-  ${project.version}
-  sources
-
-
-  org.apache.logging.log4j
-  log4j-api-scala_2.10
-  ${project.version}
-  javadoc
-
-
-  org.apache.logging.log4j
-  log4j-api-scala_2.11
-  ${project.version}
-
-
-  org.apache.logging.log4j
-  log4j-api-scala_2.11
-  ${project.version}
-  sources
-
-
-  org.apache.logging.log4j
-  log4j-api-scala_2.11
-  ${project.version}
-  javadoc
-
-
-  org.apache.logging.log4j
-  log4j-api-scala_2.12
-  ${project.version}
-
-
-  org.apache.logging.log4j
-  log4j-api-scala_2.12
-  ${project.version}
-  sources
-
-
-  org.apache.logging.log4j
-  log4j-api-scala_2.12
-  ${project.version}
-  javadoc
-
-  
-  
-
-  
-maven-assembly-plugin
-
-  
-  
-log4j-scala-source-release-assembly
-package
-
-  single
-
-
-  apache-log4j-scala-${project.version}
-  
-src/assembly/src.xml
-  
-  gnu
-
-  
-  
-binary
-
-  apache-log4j-scala-${project.version}
-  
-src/assembly/bin.xml
-  
-  gnu
-
-
-  single
-
-package
-  
-
-  
-  
-org.apache.maven.plugins
-maven-site-plugin
-3.0
-
-  true
-  true
-
-  
-
-  
-

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/ffcbc036/log4j-scala-distribution/src/assembly/bin.xml
--
diff --git a/log4j-scala-distribution/src/assembly/bin.xml 
b/log4j-scala-distribution/src/assembly/bin.xml
deleted file mode 100644
index 7e95c5a..000
--- a/log4j-scala-distribution/src/assembly/bin.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-bin
-
-tar.gz
-zip
-
-apache-log4j-scala-${project.version}-bin
-false
-
-
-true
-
-
-
-
-
-org.apache.logging.log4j:log4j-*
-
-
-false
-
-
-
-
-
-..
-
-LICENSE.txt
-NOTICE.txt
-
-
-
-
-

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/ffcbc036/log4j-scala-distribution/src/assembly/src.xml
--
diff --git a/log4j-scala-distribution/src/assembly/src.xml 
b/log4j-scala-distribution/src/assembly/src.xml
deleted file mode 100644
index aa0dc59..000
--- a/log4j-scala-distribution/src/assembly/src.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-  src
-  
-zip
-tar.gz
-  
-  apache-log4j-scala-${project.version}-src
-  
-
-
-  ..
-

[21/50] [abbrv] logging-log4j-scala git commit: Combine project info into ModuleInfo

2018-04-03 Thread mattsicker 
Combine project info into ModuleInfo


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/e37c29a5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/e37c29a5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/e37c29a5

Branch: refs/heads/master
Commit: e37c29a55f3f20a56f8dd6ec0c5fd2791f98a3b1
Parents: f0784da
Author: Matt Sicker 
Authored: Fri Mar 30 18:57:47 2018 -0500
Committer: Matt Sicker 
Committed: Fri Mar 30 18:57:47 2018 -0500

--
 build.sbt | 42 +++---
 1 file changed, 19 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/e37c29a5/build.sbt
--
diff --git a/build.sbt b/build.sbt
index 39f8ac7..b91cbb0 100644
--- a/build.sbt
+++ b/build.sbt
@@ -21,35 +21,31 @@ 
enablePlugins(org.apache.logging.log4j.scala.sbt.copyresources.CopyResourcesPlug
 
 lazy val metadataSettings = Seq(
   organization := "org.apache.logging.log4j",
-  organizationName := "Apache Software Foundation",
-  organizationHomepage := Some(url("https://www.apache.org/;)),
-  homepage := Some(url("https://logging.apache.org/log4j/scala/;)),
-  licenses := Seq("Apache License, Version 2.0" -> 
url("https://www.apache.org/licenses/LICENSE-2.0.txt;)),
-  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;
-  )),
+  projectInfo := ModuleInfo(
+nameFormal = "Apache Log4j Scala API",
+description = "Scala logging API facade for Log4j",
+homepage = Some(url("https://logging.apache.org/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://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;
+)),
+developers = Vector(
+  Developer("mikes", "Mikael Ståldal", "mi...@apache.org", null),
+  Developer("mattsicker", "Matt Sicker", "mattsic...@apache.org", null),
+  Developer("ggregory", "Gary Gregory", "ggreg...@apache.org", null)
+)
+  ),
   pomExtra := {
 
   org.apache.logging
   logging-parent
   2
 
-
-  
-mikes
-Mikael Ståldal
-  
-  
-mattsicker
-Matt Sicker
-  
-  
-ggregory
-Gary Gregory
-  
-
   }
 )

[27/50] [abbrv] logging-log4j-scala git commit: Set version to 11.1-SNAPSHOT

2018-04-03 Thread mattsicker 
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/master
Commit: a95fbe6e2bbd8f5ae351b6b0261f4a76ab0ffa8d
Parents: c888b03
Author: Matt Sicker 
Authored: Sat Mar 31 19:52:14 2018 -0500
Committer: Matt Sicker 
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"

[19/50] [abbrv] logging-log4j-scala git commit: Reorganize build.sbt into better settings categories

2018-04-03 Thread mattsicker 
Reorganize build.sbt into better settings categories


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/d8be0380
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/d8be0380
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/d8be0380

Branch: refs/heads/master
Commit: d8be0380e4e143cdb8e18990a34cfed5770da6d1
Parents: d245e72
Author: Matt Sicker 
Authored: Fri Mar 30 17:45:16 2018 -0500
Committer: Matt Sicker 
Committed: Fri Mar 30 17:45:16 2018 -0500

--
 build.sbt | 28 
 1 file changed, 16 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/d8be0380/build.sbt
--
diff --git a/build.sbt b/build.sbt
index 00993c0..39f8ac7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -76,15 +76,26 @@ lazy val publishSettings = Seq(
 } yield Credentials("Sonatype Nexus Repository Manager", 
"repository.apache.org", username, password)
   }.toList,
   // FIXME: https://github.com/sbt/sbt/issues/3519
-  updateOptions := updateOptions.value.withGigahorse(false),
+  updateOptions := updateOptions.value.withGigahorse(false)
+)
+
+lazy val packagingSettings = Seq(
   extraResources := Seq(
 (baseDirectory.value / "LICENSE.txt", "META-INF/LICENSE"),
 (baseDirectory.value / "NOTICE.txt", "META-INF/NOTICE")
-  )
+  ),
+  unmanagedSources in Compile := {
+val Some((_, minor)) = CrossVersion.partialVersion(scalaVersion.value)
+val extras = if (minor > 10) ((baseDirectory.value / "src" / "main" / 
"scala-2.11+") ** "*.scala").get else Nil
+(unmanagedSources in Compile).value ++ extras
+  }
 )
 
 lazy val releaseSettings = Seq(
-  releaseCrossBuild := true,
+  releaseCrossBuild := true
+)
+
+lazy val siteSettings = Seq(
   apiURL := 
Some(url(s"https://logging.apache.org/log4j/scala/api/${version.value}/;)),
   siteSubdirName in SiteScaladoc := s"api/${version.value}"
 )
@@ -101,14 +112,6 @@ lazy val apiDependencies = Seq(
   )
 )
 
-lazy val apiInputFiles = Seq(
-  unmanagedSources in Compile := {
-val Some((_, minor)) = CrossVersion.partialVersion(scalaVersion.value)
-val extras = if (minor > 10) ((baseDirectory.value / "src" / "main" / 
"scala-2.11+") ** "*.scala").get else Nil
-(unmanagedSources in Compile).value ++ extras
-  }
-)
-
 //lazy val bundleSettings = osgiSettings ++ Seq(
 //  bundleSymbolicName := "org.apache.logging.log4j.scala",
 //  exportPackage := Seq("org.apache.logging.log4j.scala")
@@ -119,9 +122,10 @@ lazy val root = (project in file("."))
   .settings(metadataSettings: _*)
   .settings(compileSettings: _*)
   .settings(publishSettings: _*)
+  .settings(packagingSettings: _*)
   .settings(releaseSettings: _*)
+  .settings(siteSettings: _*)
   .settings(apiDependencies: _*)
-  .settings(apiInputFiles: _*)
   .enablePlugins(AsciidoctorPlugin)
   .enablePlugins(SiteScaladocPlugin)
 //  .enablePlugins(SbtOsgi)

[24/50] [abbrv] logging-log4j-scala git commit: Add rat plugin

2018-04-03 Thread mattsicker 
Add rat plugin


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/34e39f8c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/34e39f8c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/34e39f8c

Branch: refs/heads/master
Commit: 34e39f8cd172b9ef78b208d910667945234defa5
Parents: 9c4d548
Author: Matt Sicker 
Authored: Sat Mar 31 18:03:13 2018 -0500
Committer: Matt Sicker 
Committed: Sat Mar 31 18:03:13 2018 -0500

--
 project/plugins.sbt| 2 ++
 src/asciidoctor/index.adoc | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/34e39f8c/project/plugins.sbt
--
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 0d7f53e..3007056 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -18,4 +18,6 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.8")
 addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0")
 addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.2")
+addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.0")
 //addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3")
+addSbtPlugin("org.musigma" % "sbt-rat" % "0.1")

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/34e39f8c/src/asciidoctor/index.adoc
--
diff --git a/src/asciidoctor/index.adoc b/src/asciidoctor/index.adoc
index 33e0ceb..913809b 100644
--- a/src/asciidoctor/index.adoc
+++ b/src/asciidoctor/index.adoc
@@ -31,7 +31,7 @@ TODO:
 * Apache logo
 * Downloads page
 * License report
-* Other reports?
 * ScalaDocs links
 * Project links
+* Dependency report
 
\ No newline at end of file

[34/50] [abbrv] logging-log4j-scala git commit: Add links to docs

2018-04-03 Thread mattsicker 
Add links to docs


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/cead3895
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/cead3895
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/cead3895

Branch: refs/heads/master
Commit: cead389503f2314d7c047a62566c3d1eaa798950
Parents: 7e2426b
Author: Matt Sicker 
Authored: Sat Mar 31 20:25:54 2018 -0500
Committer: Matt Sicker 
Committed: Sat Mar 31 20:28:09 2018 -0500

--
 BUILDING.md | 14 +-
 CONTRIBUTING.md | 53 +---
 README.md   |  2 +-
 3 files changed, 3 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/cead3895/BUILDING.md
--
diff --git a/BUILDING.md b/BUILDING.md
index 7497179..1fea4bb 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -15,17 +15,5 @@
  limitations under the License.
 -->
 # Building Log4j 2 Scala API
-  
-To build Log4j 2 Scala API, you need a JDK implementation version 1.8 or 
greater and Apache Maven 3.x.
 
-To perform the license release audit, a.k.a. "RAT check", run.
-
-mvn apache-rat:check
-
-To install the jars in your local Maven repository, from a command line, run:
-
-mvn clean install
-
-Next, to build the site:
-
-mvn site
+Moved to [site docs](./src/asciidoctor/build.adoc).

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/cead3895/CONTRIBUTING.md
--
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 526d871..93299c1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,57 +14,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
 # Contributing to Apache Log4j 2
 
-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 [JIRA account](https://issues.apache.org/jira/).
-+ Make sure you have a [GitHub account](https://github.com/signup/free).
-+ If you're planning to implement a new feature it makes sense to discuss your 
changes on the [dev list](https://logging.apache.org/log4j/2.x/mail-lists.html) 
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 `mvn clean verify` 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 [Contributor License Agreement][cla] 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
-
-+ [Project Guidelines](https://logging.apache.org/log4j/2.x/guidelines.html)
-+ [Code Style Guide](https://logging.apache.org/log4j/2.x/javastyle.html)
-+ [Apache Log4j 2 JIRA project 
page](https://issues.apache.org/jira/browse/LOG4J2)
-+ [Contributor License Agreement][cla]
-+ [General GitHub documentation](https://help.github.com/)
-+ [GitHub pull request 
documentation](https://help.github.com/send-pull-requests/)
-

[29/50] [abbrv] logging-log4j-scala git commit: Add download page

2018-04-03 Thread mattsicker 
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/master
Commit: 6cb937c2d622b88a0c9c0de08b33912196259a72
Parents: a42494a
Author: Matt Sicker 
Authored: Sat Mar 31 19:54:36 2018 -0500
Committer: Matt Sicker 
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 000..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

[02/50] [abbrv] logging-log4j-scala git commit: Reorganize api module

2018-04-03 Thread mattsicker 
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/72fe94f7/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala
--
diff --git a/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala 
b/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala
new file mode 100644
index 000..3b54db1
--- /dev/null
+++ b/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala
@@ -0,0 +1,425 @@
+/*
+ * 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
+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]) =
+

[32/50] [abbrv] logging-log4j-scala git commit: Improve links and header hierarchy

2018-04-03 Thread mattsicker 
Improve links and header hierarchy


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/a5510391
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/a5510391
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/a5510391

Branch: refs/heads/master
Commit: a551039140608e9f59e3aa7f4e5ed2a937753f19
Parents: a5726de
Author: Matt Sicker 
Authored: Sat Mar 31 20:22:50 2018 -0500
Committer: Matt Sicker 
Committed: Sat Mar 31 20:22:50 2018 -0500

--
 src/asciidoctor/usage.adoc | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/a5510391/src/asciidoctor/usage.adoc
--
diff --git a/src/asciidoctor/usage.adoc b/src/asciidoctor/usage.adoc
index 93381a4..528e999 100644
--- a/src/asciidoctor/usage.adoc
+++ b/src/asciidoctor/usage.adoc
@@ -16,7 +16,7 @@
 
 == Usage
 
-Using the Scala API is as simple as mixing in the `Logging` trait to your 
class. Example:
+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]
 
@@ -42,21 +42,21 @@ 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/[ScalaDocs]
+|https://logging.apache.org/log4j/scala/log4j-api-scala_2.10/scaladocs/#org.apache.logging.log4j.scala.package[ScalaDocs]
 
 |Scala 2.11
-|https://logging.apache.org/log4j/scala/log4j-api-scala_2.11/scaladocs/[ScalaDocs]
+|https://logging.apache.org/log4j/scala/log4j-api-scala_2.11/scaladocs/#org.apache.logging.log4j.scala.package[ScalaDocs]
 
 |Scala 2.12
-|https://logging.apache.org/log4j/scala/log4j-api-scala_2.12/scaladocs/[ScalaDocs]
+|https://logging.apache.org/log4j/scala/log4j-api-scala_2.12/scaladocs/org/apache/logging/log4j/scala/[ScalaDocs]
 |===
 
-== Configuration
+=== 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
+=== 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.
@@ -67,7 +67,7 @@ For example:
 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.

[18/50] [abbrv] logging-log4j-scala git commit: Extract methods in sbt plugin

2018-04-03 Thread mattsicker 
Extract methods in sbt plugin


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/d245e724
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/d245e724
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/d245e724

Branch: refs/heads/master
Commit: d245e724c8f3d7b6fa8f4f25c4a20807edb23527
Parents: f8d3f94
Author: Matt Sicker 
Authored: Fri Mar 30 17:44:46 2018 -0500
Committer: Matt Sicker 
Committed: Fri Mar 30 17:44:46 2018 -0500

--
 project/CopyResourcesPlugin.scala | 16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/d245e724/project/CopyResourcesPlugin.scala
--
diff --git a/project/CopyResourcesPlugin.scala 
b/project/CopyResourcesPlugin.scala
index 4c3b616..32b6104 100644
--- a/project/CopyResourcesPlugin.scala
+++ b/project/CopyResourcesPlugin.scala
@@ -28,11 +28,17 @@ object CopyResourcesPlugin extends AutoPlugin {
 val extraResources = taskKey[Seq[(File, String)]]("Additional files to 
copy into packages")
 
 lazy val baseCopyResourceSettings: Seq[Setting[_]] = Seq(
-  extraResources := Nil,
-  mappings in (Compile, packageBin) ++= extraResources.value,
-  mappings in (Compile, packageSrc) ++= extraResources.value,
-  mappings in (Compile, packageDoc) ++= extraResources.value
-)
+  extraResources := Nil
+) ++ addExtraResourcesInAll(Compile)(packageBin, packageSrc, packageDoc)
+
+def addExtraResourcesIn(configuration: Configuration, scope: Scoped): 
Setting[Task[Seq[(File, String)]]] =
+  mappings in (configuration, scope) ++= extraResources.value
+
+def addExtraResourcesInAll(configurations: Configuration*)(scopes: 
Scoped*): Seq[Setting[Task[Seq[(File, String) =
+  for {
+configuration <- configurations
+scope <- scopes
+  } yield addExtraResourcesIn(configuration, scope)
   }
 
   import autoImport._

[44/50] [abbrv] logging-log4j-scala git commit: Remove obsolete files

2018-04-03 Thread mattsicker 
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/be2e32be/src/site/resources/js/jquery.min.js
--
diff --git a/src/site/resources/js/jquery.min.js 
b/src/site/resources/js/jquery.min.js
deleted file mode 100644
index 198b3ff..000
--- a/src/site/resources/js/jquery.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v1.7.1 jquery.com | jquery.org/license */
-(function(a,b){function cy(a){return 
f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function 
cv(a){if(!ck[a]){var 
b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"":"")+""),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return
 ck[a]}function cu(a,b){var 
c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return 
c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function 
cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function 
ci(){try{return new a.XMLHttpRequest}catch(b){}}function 
cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var 
d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p
 ;for(g=1;g0){if(c!=="border")for(;g

[35/50] [abbrv] logging-log4j-scala git commit: Add links on homepage

2018-04-03 Thread mattsicker 
Add links on homepage


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/d9a1f89b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/d9a1f89b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/d9a1f89b

Branch: refs/heads/master
Commit: d9a1f89b87178674e667fdd1dfe446969da3a694
Parents: cead389
Author: Matt Sicker 
Authored: Sat Mar 31 20:31:37 2018 -0500
Committer: Matt Sicker 
Committed: Sat Mar 31 20:31:37 2018 -0500

--
 src/asciidoctor/index.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/d9a1f89b/src/asciidoctor/index.adoc
--
diff --git a/src/asciidoctor/index.adoc b/src/asciidoctor/index.adoc
index 319b5ee..4ded4de 100644
--- a/src/asciidoctor/index.adoc
+++ b/src/asciidoctor/index.adoc
@@ -17,9 +17,9 @@
 = Apache Log4j Scala API
 :toc: left
 
-Log4j Scala API is a Scala logging facade based on Log4j 2.
+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 are 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., Logback).
+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[]

[07/50] [abbrv] logging-log4j-scala git commit: Fix packaging issues with macro file

2018-04-03 Thread mattsicker 
Fix packaging issues with macro file


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/53cfa5db
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/53cfa5db
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/53cfa5db

Branch: refs/heads/master
Commit: 53cfa5db91e59f28026032ba0ab341001a3e78a9
Parents: 47ba596
Author: Matt Sicker 
Authored: Thu Mar 29 15:04:22 2018 -0500
Committer: Matt Sicker 
Committed: Thu Mar 29 15:04:22 2018 -0500

--
 Jenkinsfile |   4 +-
 build.sbt   |  42 +-
 project/Dependencies.scala  |  17 +-
 .../logging/log4j/scala/LoggerMacro.scala   | 425 +++
 .../logging/log4j/scala/LoggerMacro.scala   | 425 ---
 5 files changed, 466 insertions(+), 447 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/53cfa5db/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index a117fc0..032d4d1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -42,9 +42,9 @@ pipeline {
 when { branch 'master' }
 steps {
 ansiColor('xterm') {
+sh './sbt -batch "+ publish"'
 // FIXME: LOG4J2-2291
-//sh './sbt -batch "+ publish"'
-archiveArtifacts artifacts: 'target/**/*.jar', 
fingerprint: true
+archiveArtifacts artifacts: 'target/repository/**'
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/53cfa5db/build.sbt
--
diff --git a/build.sbt b/build.sbt
index 5cc1c21..118337c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,4 +1,5 @@
 import Dependencies._
+//import OsgiKeys._
 
 lazy val metadataSettings = Seq(
   organization := "org.apache.logging.log4j",
@@ -45,41 +46,48 @@ lazy val publishSettings = Seq(
   publishArtifact in Test := false,
   publishTo := {
 if (isSnapshot.value) {
-  Some("Apache Snapshots" at 
"https://repository.apache.org/content/repositories/snapshots;)
+  // FIXME: LOG4J2-2291
+  //Some("Apache Snapshots" at 
"https://repository.apache.org/content/repositories/snapshots;)
+  Some(Resolver.file("file", file("target/repository/")))
 } else {
   Some("Apache Releases" at 
"https://repository.apache.org/service/local/staging/deploy/maven2;)
 }
-  },
-  credentials += Credentials(Path.userHome / ".ivy2" / ".credentials"),
+  }
+//  credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
 //  managedResources
 //  resourceGenerators in Compile += inlineTask(Seq(file("LICENSE.txt"), 
file("NOTICE.txt")))
 )
 
 lazy val releaseSettings = Seq(
-  releaseCrossBuild := true
+  releaseCrossBuild := true,
+  apiURL := 
Some(url(s"https://logging.apache.org/log4j/scala/log4j-api-scala_${scalaBinaryVersion.value}/scaladocs/;))
 )
 
 lazy val apiDependencies = Seq(
   libraryDependencies ++= Seq(
-"org.scala-lang" % "scala-reflect" % scalaVersion.value,
-"org.apache.logging.log4j" % "log4j-api" % log4j,
-"org.apache.logging.log4j" % "log4j-api" % log4j % Test classifier "tests",
-"junit" % "junit" % junit % Test,
-"org.scalatest" %% "scalatest" % scalatest % Test,
-"org.mockito" % "mockito-core" % mockito % Test
+scalaReflect(scalaVersion.value),
+osgiCoreApi,
+log4jApi,
+log4jApiTests,
+junit,
+scalatest,
+mockito
   )
 )
 
 lazy val apiInputFiles = Seq(
-  sources in Compile := {
-val filteredFiles = {
-  for ((_, minor) <- CrossVersion.partialVersion(scalaVersion.value) if 
minor == 10)
-yield ((baseDirectory.value / "src" / "main" / "scala") ** 
"*Macro.scala").get
-}.getOrElse(Seq())
-(sources in Compile).value.filterNot(filteredFiles.contains)
+  unmanagedSources in Compile := {
+val Some((_, minor)) = CrossVersion.partialVersion(scalaVersion.value)
+val extras = if (minor > 10) ((baseDirectory.value / "src" / "main" / 
"scala-2.11+") ** "*.scala").get else Nil
+(unmanagedSources in Compile).value ++ extras
   }
 )
 
+//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")
   .settings(metadataSettings: _*)
@@ -88,6 +96,8 @@ lazy val root = (project in file("."))
   .settings(releaseSettings: _*)
   .settings(apiDependencies: _*)
   .settings(apiInputFiles: _*)
+//  .enablePlugins(SbtOsgi)

[15/50] [abbrv] logging-log4j-scala git commit: LOG4J2-2293: Add required license files to SBT output artifacts

2018-04-03 Thread mattsicker 
LOG4J2-2293: Add required license files to SBT output artifacts


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/1f4b789c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/1f4b789c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/1f4b789c

Branch: refs/heads/master
Commit: 1f4b789c3011a124d0d1c9ce3bceb29afb7c3ee8
Parents: 814f77d
Author: Matt Sicker 
Authored: Fri Mar 30 16:03:11 2018 -0500
Committer: Matt Sicker 
Committed: Fri Mar 30 16:03:11 2018 -0500

--
 build.sbt | 26 ++---
 project/CopyResourcesPlugin.scala | 42 ++
 src/changes/changes.xml   |  3 +++
 3 files changed, 68 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/1f4b789c/build.sbt
--
diff --git a/build.sbt b/build.sbt
index 386e479..5f52ed9 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,6 +1,24 @@
+/*
+ * 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 OsgiKeys._
 
+enablePlugins(org.apache.logging.log4j.scala.sbt.copyresources.CopyResourcesPlugin)
+
 lazy val metadataSettings = Seq(
   organization := "org.apache.logging.log4j",
   organizationName := "Apache Software Foundation",
@@ -58,9 +76,11 @@ lazy val publishSettings = Seq(
 } yield Credentials("Sonatype Nexus Repository Manager", 
"repository.apache.org", username, password)
   }.toList,
   // FIXME: https://github.com/sbt/sbt/issues/3519
-  updateOptions := updateOptions.value.withGigahorse(false)
-  //  managedResources
-//  resourceGenerators in Compile += inlineTask(Seq(file("LICENSE.txt"), 
file("NOTICE.txt")))
+  updateOptions := updateOptions.value.withGigahorse(false),
+  extraResources := Seq(
+(baseDirectory.value / "LICENSE.txt", "META-INF/LICENSE"),
+(baseDirectory.value / "NOTICE.txt", "META-INF/NOTICE")
+  )
 )
 
 lazy val releaseSettings = Seq(

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/1f4b789c/project/CopyResourcesPlugin.scala
--
diff --git a/project/CopyResourcesPlugin.scala 
b/project/CopyResourcesPlugin.scala
new file mode 100644
index 000..4c3b616
--- /dev/null
+++ b/project/CopyResourcesPlugin.scala
@@ -0,0 +1,42 @@
+/*
+ * 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.sbt.copyresources
+
+import sbt.Keys._
+import sbt._
+
+/**
+  * Simple SBT plugin to copy in configured files into all output jars.
+  */
+object CopyResourcesPlugin extends AutoPlugin {
+
+  object autoImport {
+val extraResources = taskKey[Seq[(File, String)]]("Additional files to 
copy into packages")
+
+lazy val baseCopyResourceSettings: Seq[Setting[_]] = Seq(
+  extraResources := Nil,
+  mappings in (Compile, packageBin) ++= extraResources.value,
+  mappings in (Compile, packageSrc) ++= extraResources.value,
+  mappings in (Compile, packageDoc) ++= extraResources.value
+)
+  }
+
+  import autoImport._
+
+  override lazy val projectSettings: Seq[Setting[_]] = baseCopyResourceSettings
+
+}

[36/50] [abbrv] logging-log4j-scala git commit: Fix typo

2018-04-03 Thread mattsicker 
Fix typo


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/8ef7ea21
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/8ef7ea21
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/8ef7ea21

Branch: refs/heads/master
Commit: 8ef7ea212e95137b72b40279ee75f2501174082d
Parents: d9a1f89
Author: Matt Sicker 
Authored: Sat Mar 31 22:15:29 2018 -0500
Committer: Matt Sicker 
Committed: Sat Mar 31 22:15:29 2018 -0500

--
 src/asciidoctor/download.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/8ef7ea21/src/asciidoctor/download.adoc
--
diff --git a/src/asciidoctor/download.adoc b/src/asciidoctor/download.adoc
index 2d11fc9..083c980 100644
--- a/src/asciidoctor/download.adoc
+++ b/src/asciidoctor/download.adoc
@@ -36,7 +36,7 @@ The checksum and signature are links to the originals on the 
main distribution s
 
|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)
+|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]
 |===

[40/50] [abbrv] logging-log4j-scala git commit: LOG4J2-2295: Add OSGi metadata to release jars

2018-04-03 Thread mattsicker 
LOG4J2-2295: Add OSGi metadata to release jars


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/59f47b87
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/59f47b87
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/59f47b87

Branch: refs/heads/master
Commit: 59f47b878d1a80978653e2b790d581717a180afc
Parents: 798a5cb
Author: Matt Sicker 
Authored: Mon Apr 2 10:56:50 2018 -0500
Committer: Matt Sicker 
Committed: Mon Apr 2 10:56:50 2018 -0500

--
 build.sbt| 14 +++---
 project/plugins.sbt  |  2 +-
 src/asciidoctor/changes.adoc |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/59f47b87/build.sbt
--
diff --git a/build.sbt b/build.sbt
index b91cbb0..5bb6b15 100644
--- a/build.sbt
+++ b/build.sbt
@@ -15,7 +15,7 @@
  * limitations under the license.
  */
 import Dependencies._
-//import OsgiKeys._
+import OsgiKeys._
 
 
enablePlugins(org.apache.logging.log4j.scala.sbt.copyresources.CopyResourcesPlugin)
 
@@ -108,10 +108,10 @@ lazy val apiDependencies = Seq(
   )
 )
 
-//lazy val bundleSettings = osgiSettings ++ Seq(
-//  bundleSymbolicName := "org.apache.logging.log4j.scala",
-//  exportPackage := Seq("org.apache.logging.log4j.scala")
-//)
+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")
@@ -124,8 +124,8 @@ lazy val root = (project in file("."))
   .settings(apiDependencies: _*)
   .enablePlugins(AsciidoctorPlugin)
   .enablePlugins(SiteScaladocPlugin)
-//  .enablePlugins(SbtOsgi)
-//  .settings(bundleSettings: _*)
+  .enablePlugins(SbtOsgi)
+  .settings(bundleSettings: _*)
 
 //lazy val nopublish = Seq(
 //  publish := {},

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/59f47b87/project/plugins.sbt
--
diff --git a/project/plugins.sbt b/project/plugins.sbt
index e50648c..2701fb5 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -19,5 +19,5 @@ addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.8")
 addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0")
 addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.2")
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.0")
-//addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3")
+addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3")
 addSbtPlugin("org.musigma" % "sbt-rat" % "0.2")

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/59f47b87/src/asciidoctor/changes.adoc
--
diff --git a/src/asciidoctor/changes.adoc b/src/asciidoctor/changes.adoc
index 748b0e9..fabd482 100644
--- a/src/asciidoctor/changes.adoc
+++ b/src/asciidoctor/changes.adoc
@@ -21,6 +21,7 @@
 [vertical]
 New Features::
 [horizontal]
+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.

[13/50] [abbrv] logging-log4j-scala git commit: Add LOG4J2-2296 changelog entry

2018-04-03 Thread mattsicker 
Add LOG4J2-2296 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/47899ea8
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/47899ea8
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/47899ea8

Branch: refs/heads/master
Commit: 47899ea8af30a10911ed0c3ba5e51515d798ec08
Parents: 5a358d7
Author: Matt Sicker 
Authored: Fri Mar 30 14:12:20 2018 -0500
Committer: Matt Sicker 
Committed: Fri Mar 30 14:12:20 2018 -0500

--
 src/changes/changes.xml | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/47899ea8/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 8ec0d27..8909c8b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,6 +31,9 @@
  - "remove" - Removed
 -->
 
+  
+Add sbt-site plugin and website configuration.
+  
   
 Add Jenkins pipeline for SBT build.

[33/50] [abbrv] logging-log4j-scala git commit: Add contributing info to site

2018-04-03 Thread mattsicker 
Add contributing info to site


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/7e2426b3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/7e2426b3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/7e2426b3

Branch: refs/heads/master
Commit: 7e2426b342adf58ff362ae55a36aa0ffbd522edf
Parents: a551039
Author: Matt Sicker 
Authored: Sat Mar 31 20:23:02 2018 -0500
Committer: Matt Sicker 
Committed: Sat Mar 31 20:23:02 2018 -0500

--
 src/asciidoctor/contributing.adoc | 66 ++
 src/asciidoctor/index.adoc|  2 ++
 2 files changed, 68 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/7e2426b3/src/asciidoctor/contributing.adoc
--
diff --git a/src/asciidoctor/contributing.adoc 
b/src/asciidoctor/contributing.adoc
new file mode 100644
index 000..4730d54
--- /dev/null
+++ b/src/asciidoctor/contributing.adoc
@@ -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
+
+ 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]
+

[38/50] [abbrv] logging-log4j-scala git commit: Fix grammatical error

2018-04-03 Thread mattsicker 
Fix grammatical error


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/011bef8f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/011bef8f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/011bef8f

Branch: refs/heads/master
Commit: 011bef8fcfb87bed96853aabb97c35bc83979bb9
Parents: 4e87e1f
Author: Matt Sicker 
Authored: Sun Apr 1 13:43:44 2018 -0500
Committer: Matt Sicker 
Committed: Sun Apr 1 13:43:44 2018 -0500

--
 src/asciidoctor/index.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/011bef8f/src/asciidoctor/index.adoc
--
diff --git a/src/asciidoctor/index.adoc b/src/asciidoctor/index.adoc
index 4ded4de..41239dc 100644
--- a/src/asciidoctor/index.adoc
+++ b/src/asciidoctor/index.adoc
@@ -18,7 +18,7 @@
 :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 are provided, and experimental 
support for pre-release versions of 2.13 is also provided.
+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.

[20/50] [abbrv] logging-log4j-scala git commit: Improve types

2018-04-03 Thread mattsicker 
Improve types


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/f0784dac
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/f0784dac
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/f0784dac

Branch: refs/heads/master
Commit: f0784daca2104a6e5a99c8764e119bf2e0430ba6
Parents: d8be038
Author: Matt Sicker 
Authored: Fri Mar 30 17:49:18 2018 -0500
Committer: Matt Sicker 
Committed: Fri Mar 30 17:49:18 2018 -0500

--
 project/CopyResourcesPlugin.scala | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/f0784dac/project/CopyResourcesPlugin.scala
--
diff --git a/project/CopyResourcesPlugin.scala 
b/project/CopyResourcesPlugin.scala
index 32b6104..1f62257 100644
--- a/project/CopyResourcesPlugin.scala
+++ b/project/CopyResourcesPlugin.scala
@@ -31,13 +31,13 @@ object CopyResourcesPlugin extends AutoPlugin {
   extraResources := Nil
 ) ++ addExtraResourcesInAll(Compile)(packageBin, packageSrc, packageDoc)
 
-def addExtraResourcesIn(configuration: Configuration, scope: Scoped): 
Setting[Task[Seq[(File, String)]]] =
-  mappings in (configuration, scope) ++= extraResources.value
+def addExtraResourcesIn(configuration: Configuration, task: 
ScopedTaskable[File]): Setting[Task[Seq[(File, String)]]] =
+  mappings in (configuration, task) ++= extraResources.value
 
-def addExtraResourcesInAll(configurations: Configuration*)(scopes: 
Scoped*): Seq[Setting[Task[Seq[(File, String) =
+def addExtraResourcesInAll(configurations: Configuration*)(tasks: 
ScopedTaskable[File]*): Seq[Setting[Task[Seq[(File, String) =
   for {
 configuration <- configurations
-scope <- scopes
+scope <- tasks
   } yield addExtraResourcesIn(configuration, scope)
   }

[04/50] [abbrv] logging-log4j-scala git commit: Reorganize api module

2018-04-03 Thread mattsicker 
Reorganize api module


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/72fe94f7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/72fe94f7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/72fe94f7

Branch: refs/heads/master
Commit: 72fe94f7cf604c5962d2a47b16ab3845f844da92
Parents: 3b425c9
Author: Matt Sicker 
Authored: Wed Mar 28 19:59:00 2018 -0500
Committer: Matt Sicker 
Committed: Wed Mar 28 19:59:00 2018 -0500

--
 .../logging/log4j/scala/LoggerMacro.scala   | 425 -
 .../org/apache/logging/log4j/scala/Logger.scala | 592 ---
 .../logging/log4j/scala/LoggerMacro.scala   | 425 -
 .../apache/logging/log4j/scala/Logging.scala|  30 -
 .../logging/log4j/scala/LoggingContext.scala|  84 ---
 .../apache/logging/log4j/scala/LoggerTest.scala | 552 -
 .../log4j/scala/LoggingContextTest.scala| 115 
 build.sbt   | 139 +++--
 .../logging/log4j/scala/LoggerMacro.scala   | 425 +
 .../org/apache/logging/log4j/scala/Logger.scala | 592 +++
 .../logging/log4j/scala/LoggerMacro.scala   | 425 +
 .../apache/logging/log4j/scala/Logging.scala|  30 +
 .../logging/log4j/scala/LoggingContext.scala|  84 +++
 .../apache/logging/log4j/scala/LoggerTest.scala | 552 +
 .../log4j/scala/LoggingContextTest.scala| 115 
 15 files changed, 2302 insertions(+), 2283 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/72fe94f7/api/src/main/scala-2.10/org/apache/logging/log4j/scala/LoggerMacro.scala
--
diff --git 
a/api/src/main/scala-2.10/org/apache/logging/log4j/scala/LoggerMacro.scala 
b/api/src/main/scala-2.10/org/apache/logging/log4j/scala/LoggerMacro.scala
deleted file mode 100644
index 24b3c8c..000
--- a/api/src/main/scala-2.10/org/apache/logging/log4j/scala/LoggerMacro.scala
+++ /dev/null
@@ -1,425 +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
-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]) =
-

[01/50] [abbrv] logging-log4j-scala git commit: Add minimal Jenkinsfile

2018-04-03 Thread mattsicker 
Repository: logging-log4j-scala
Updated Branches:
  refs/heads/master 184045cbc -> b5ff1c751


Add minimal Jenkinsfile


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/3b425c93
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/3b425c93
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/3b425c93

Branch: refs/heads/master
Commit: 3b425c939d060f940cb4c1c9c4c9f4ee3ce070c1
Parents: e29f871
Author: Matt Sicker 
Authored: Wed Mar 28 16:15:19 2018 -0500
Committer: Matt Sicker 
Committed: Wed Mar 28 16:15:19 2018 -0500

--
 Jenkinsfile | 50 ++
 1 file changed, 50 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/3b425c93/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..7825a9f
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,50 @@
+#!groovy
+/*
+ * 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.
+ */
+
+pipeline {
+agent {
+label 'ubuntu'
+}
+tools {
+jdk 'JDK 1.8 (latest)'
+}
+stages {
+stage('Build') {
+steps {
+ansiColor('xterm') {
+sh './sbt -batch "+ compile"'
+}
+}
+}
+stage('Test') {
+steps {
+ansiColor('xterm') {
+sh './sbt -batch "+ test"'
+}
+}
+}
+stage('Deploy') {
+steps {
+ansiColor('xterm') {
+sh './sbt -batch "+ publish"'
+}
+}
+}
+}
+}
+

[50/50] [abbrv] logging-log4j-scala git commit: LOG4J2-1882: Migrate to sbt

2018-04-03 Thread mattsicker 
LOG4J2-1882: Migrate to sbt


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/b5ff1c75
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/b5ff1c75
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/b5ff1c75

Branch: refs/heads/master
Commit: b5ff1c75185001db1ee1c9db2ba91ed557b44f7d
Parents: ffcbc03
Author: Matt Sicker 
Authored: Tue Apr 3 16:06:14 2018 -0500
Committer: Matt Sicker 
Committed: Tue Apr 3 16:06:14 2018 -0500

--
 src/asciidoctor/changes.adoc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/b5ff1c75/src/asciidoctor/changes.adoc
--
diff --git a/src/asciidoctor/changes.adoc b/src/asciidoctor/changes.adoc
index 6682e8c..a2b991c 100644
--- a/src/asciidoctor/changes.adoc
+++ b/src/asciidoctor/changes.adoc
@@ -21,13 +21,14 @@
 [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-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-2291::: Add Jenkins pipeline for sbt build.
 
 [vertical]
 Bug Fixes:: None.

[28/50] [abbrv] logging-log4j-scala git commit: Add build page

2018-04-03 Thread mattsicker 
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/master
Commit: a42494ae47b69c6d12aa4258704c35fcb3174edb
Parents: a95fbe6
Author: Matt Sicker 
Authored: Sat Mar 31 19:52:56 2018 -0500
Committer: Matt Sicker 
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 000..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"
+

[17/50] [abbrv] logging-log4j-scala git commit: LOG4J2-2298: Add changelog to site

2018-04-03 Thread mattsicker 
LOG4J2-2298: Add changelog to site


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/f8d3f94b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/f8d3f94b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/f8d3f94b

Branch: refs/heads/master
Commit: f8d3f94b89f9f64c729f6b818677ccb4a0cfe9c3
Parents: 5be05b5
Author: Matt Sicker 
Authored: Fri Mar 30 16:46:08 2018 -0500
Committer: Matt Sicker 
Committed: Fri Mar 30 16:46:08 2018 -0500

--
 src/asciidoctor/changes.adoc | 42 +++
 src/asciidoctor/index.adoc   | 57 ++-
 src/asciidoctor/usage.adoc   | 70 +++
 src/changes/changes.xml  | 60 -
 4 files changed, 115 insertions(+), 114 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/f8d3f94b/src/asciidoctor/changes.adoc
--
diff --git a/src/asciidoctor/changes.adoc b/src/asciidoctor/changes.adoc
new file mode 100644
index 000..890263a
--- /dev/null
+++ b/src/asciidoctor/changes.adoc
@@ -0,0 +1,42 @@
+
+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 11.1
+
+[vertical]
+New Features::
+[horizontal]
+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.
+
+[vertical]
+Bug Fixes:: None.
+
+[vertical]
+Changes::
+[horizontal]
+LOG4J2-2290::: Update Log4j from 2.9.1 to 2.11.0.
+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.

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/f8d3f94b/src/asciidoctor/index.adoc
--
diff --git a/src/asciidoctor/index.adoc b/src/asciidoctor/index.adoc
index b9595af..33e0ceb 100644
--- a/src/asciidoctor/index.adoc
+++ b/src/asciidoctor/index.adoc
@@ -15,72 +15,21 @@
 limitations under the License.
 
 = Apache Log4j Scala API
+:toc: left
 
 Log4j Scala API is a Scala logging facade based on Log4j 2.
 Support for Scala versions 2.10, 2.11, and 2.12 are 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., 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.
 
-== Usage
+include::usage.adoc[]
 
-Log4j Scala API requires Log4j API. An example SBT dependency setup:
-
-.build.sbt
-[source,scala]
-
-libraryDependencies ++= Seq(
-  "org.apache.logging.log4j" %% "log4j-api-scala" % "11.0",
-  "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]
-
-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}.")
-  }
-}
-
-
-== Configuration
-
-Log4j Scala API uses 
https://logging.apache.org/log4j/2.x/manual/configuration.html[Log4j 
configuration] by default.
-This

[11/50] [abbrv] logging-log4j-scala git commit: Add sbt branch to allowed snapshots branches for deployment tests

2018-04-03 Thread mattsicker 
Add sbt branch to allowed snapshots branches for deployment tests


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/938aada0
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/938aada0
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/938aada0

Branch: refs/heads/master
Commit: 938aada035261f608342fd16bba8cf22cb1158d9
Parents: e12bfd6
Author: Matt Sicker 
Authored: Fri Mar 30 14:02:25 2018 -0500
Committer: Matt Sicker 
Committed: Fri Mar 30 14:02:25 2018 -0500

--
 Jenkinsfile | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/938aada0/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 13614bb..c51e27c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,7 +39,12 @@ pipeline {
 }
 }
 stage('Deploy') {
-when { branch 'master' }
+when {
+anyOf {
+branch 'master'
+branch 'sbt'
+}
+}
 steps {
 ansiColor('xterm') {
 withCredentials([

[05/50] [abbrv] logging-log4j-scala git commit: Disable SBT deploy and add Jenkins artifact archival

2018-04-03 Thread mattsicker 
Disable SBT deploy and add Jenkins artifact archival


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/18068fb1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/18068fb1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/18068fb1

Branch: refs/heads/master
Commit: 18068fb1160fb34862d95dfa06adc4d68740c3b5
Parents: 72fe94f
Author: Matt Sicker 
Authored: Thu Mar 29 11:09:19 2018 -0500
Committer: Matt Sicker 
Committed: Thu Mar 29 11:09:19 2018 -0500

--
 Jenkinsfile | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/18068fb1/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 7825a9f..a58a304 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,6 +28,7 @@ pipeline {
 steps {
 ansiColor('xterm') {
 sh './sbt -batch "+ compile"'
+archiveArtifacts artifacts: 'target/**/*.jar', 
fingerprint: true, onlyIfSuccessful: true
 }
 }
 }
@@ -38,13 +39,17 @@ pipeline {
 }
 }
 }
+// FIXME: LOG4J2-2291
+/*
 stage('Deploy') {
+when { branch 'master' }
 steps {
 ansiColor('xterm') {
 sh './sbt -batch "+ publish"'
 }
 }
 }
+*/
 }
 }

[39/50] [abbrv] logging-log4j-scala git commit: Upgrade to sbt-rat 0.2

2018-04-03 Thread mattsicker 
Upgrade to sbt-rat 0.2


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/798a5cb9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/798a5cb9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/798a5cb9

Branch: refs/heads/master
Commit: 798a5cb968d8e600faca159c4d448e71f5094ddc
Parents: 011bef8
Author: Matt Sicker 
Authored: Sun Apr 1 13:46:03 2018 -0500
Committer: Matt Sicker 
Committed: Sun Apr 1 13:46:03 2018 -0500

--
 project/plugins.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/798a5cb9/project/plugins.sbt
--
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 3007056..e50648c 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -20,4 +20,4 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % 
"1.2.0")
 addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.2")
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.0")
 //addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3")
-addSbtPlugin("org.musigma" % "sbt-rat" % "0.1")
+addSbtPlugin("org.musigma" % "sbt-rat" % "0.2")

[10/50] [abbrv] logging-log4j-scala git commit: LOG4J2-2291: Add Jenkins pipeline for SBT build

2018-04-03 Thread mattsicker 
LOG4J2-2291: Add Jenkins pipeline for SBT build

Add credential id and config for publishing snapshots.


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/e12bfd6a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/e12bfd6a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/e12bfd6a

Branch: refs/heads/master
Commit: e12bfd6a347513df441af1208f4c155c4a809f6d
Parents: 722c1f5
Author: Matt Sicker 
Authored: Fri Mar 30 13:59:50 2018 -0500
Committer: Matt Sicker 
Committed: Fri Mar 30 13:59:50 2018 -0500

--
 Jenkinsfile | 12 
 build.sbt   | 17 +++--
 2 files changed, 19 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/e12bfd6a/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 032d4d1..13614bb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -42,12 +42,16 @@ pipeline {
 when { branch 'master' }
 steps {
 ansiColor('xterm') {
-sh './sbt -batch "+ publish"'
-// FIXME: LOG4J2-2291
-archiveArtifacts artifacts: 'target/repository/**'
+withCredentials([
+usernamePassword(
+credentialsId: 'logging-snapshots',
+passwordVariable: 'NEXUS_PASSWORD',
+usernameVariable: 'NEXUS_USERNAME')
+]) {
+sh './sbt -batch "+ publish"'
+}
 }
 }
 }
 }
 }
-

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/e12bfd6a/build.sbt
--
diff --git a/build.sbt b/build.sbt
index 6dba52b..386e479 100644
--- a/build.sbt
+++ b/build.sbt
@@ -46,15 +46,20 @@ lazy val publishSettings = Seq(
   publishArtifact in Test := false,
   publishTo := {
 if (isSnapshot.value) {
-  // FIXME: LOG4J2-2291
-  //Some("Apache Snapshots" at 
"https://repository.apache.org/content/repositories/snapshots;)
-  Some(Resolver.file("file", file("target/repository/")))
+  Some("Apache Snapshots" at 
"https://repository.apache.org/content/repositories/snapshots;)
 } else {
   Some("Apache Releases" at 
"https://repository.apache.org/service/local/staging/deploy/maven2;)
 }
-  }
-//  credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
-//  managedResources
+  },
+  credentials ++= {
+for {
+  username <- sys.env.get("NEXUS_USERNAME")
+  password <- sys.env.get("NEXUS_PASSWORD")
+} yield Credentials("Sonatype Nexus Repository Manager", 
"repository.apache.org", username, password)
+  }.toList,
+  // FIXME: https://github.com/sbt/sbt/issues/3519
+  updateOptions := updateOptions.value.withGigahorse(false)
+  //  managedResources
 //  resourceGenerators in Compile += inlineTask(Seq(file("LICENSE.txt"), 
file("NOTICE.txt")))
 )

[48/50] [abbrv] logging-log4j-scala git commit: LOG4J2-2303: Add release distribution script

2018-04-03 Thread mattsicker 
LOG4J2-2303: Add release distribution script


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/ddc513c5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/ddc513c5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/ddc513c5

Branch: refs/heads/master
Commit: ddc513c58cd302353c00898bace1a5d4f953d2e4
Parents: be2e32b
Author: Matt Sicker 
Authored: Tue Apr 3 16:00:11 2018 -0500
Committer: Matt Sicker 
Committed: Tue Apr 3 16:00:31 2018 -0500

--
 build.sbt|  3 +-
 create-distributions.sh  | 62 +
 project/Distributions.scala  | 96 +++
 src/asciidoctor/changes.adoc |  1 +
 4 files changed, 161 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/ddc513c5/build.sbt
--
diff --git a/build.sbt b/build.sbt
index 9398b25..722267f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -82,7 +82,7 @@ lazy val packagingSettings = Seq(
   ),
   unmanagedSources in Compile := {
 val Some((_, minor)) = CrossVersion.partialVersion(scalaVersion.value)
-val extras = if (minor > 10) ((baseDirectory.value / "src" / "main" / 
"scala-2.11+") ** "*.scala").get else Nil
+val extras = if (minor > 10) ((sourceDirectory.value / "main" / 
"scala-2.11+") ** "*.scala").get else Nil
 (unmanagedSources in Compile).value ++ extras
   }
 )
@@ -126,6 +126,7 @@ lazy val root = (project in file("."))
   .enablePlugins(SiteScaladocPlugin)
   .enablePlugins(SbtOsgi)
   .settings(bundleSettings: _*)
+  .enablePlugins(Distributions)
 
 lazy val nopublish = Seq(
   publish := {},

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/ddc513c5/create-distributions.sh
--
diff --git a/create-distributions.sh b/create-distributions.sh
new file mode 100755
index 000..9750ea6
--- /dev/null
+++ b/create-distributions.sh
@@ -0,0 +1,62 @@
+#!/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"
+}
+
+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} 
${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}

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/ddc513c5/project/Distributions.scala
--
diff --git a/project/Distributions.scala b/project/Distributions.scala
new file mode 100644
index 000..25b4b5a
--- /dev/null
+++ b/project/Distributions.scala
@@ -0,0 +1,96 @@
+/*
+ * 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

[09/50] [abbrv] logging-log4j-scala git commit: LOG4J2-2290: Update Log4j from 2.9.1 to 2.11.0

2018-04-03 Thread mattsicker 
LOG4J2-2290: Update Log4j from 2.9.1 to 2.11.0

Previously committed the project/Dependencies.scala with this upgraded version 
already.


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/722c1f5b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/722c1f5b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/722c1f5b

Branch: refs/heads/master
Commit: 722c1f5bdd814fff4337a485111a711dd4b0f5c1
Parents: b510c12
Author: Matt Sicker 
Authored: Fri Mar 30 13:16:21 2018 -0500
Committer: Matt Sicker 
Committed: Fri Mar 30 13:16:21 2018 -0500

--
 src/changes/changes.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/722c1f5b/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 1bf5182..0458f58 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -30,7 +30,10 @@
  - "update" - Change
  - "remove" - Removed
 -->
-
+
+  
+Update Log4j from 2.9.1 to 2.11.0.
+  
   
 Update log4j-api-scala_2.11 from Scala 2.11.8 to 2.11.11.

[31/50] [abbrv] logging-log4j-scala git commit: Add ScalaDoc links

2018-04-03 Thread mattsicker 
Add ScalaDoc links


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/a5726dee
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/a5726dee
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/a5726dee

Branch: refs/heads/master
Commit: a5726deeff75b0e1adcd4f0557003726341aab8d
Parents: e665ddf
Author: Matt Sicker 
Authored: Sat Mar 31 20:03:08 2018 -0500
Committer: Matt Sicker 
Committed: Sat Mar 31 20:03:08 2018 -0500

--
 src/asciidoctor/index.adoc |  1 -
 src/asciidoctor/usage.adoc | 15 +++
 2 files changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/a5726dee/src/asciidoctor/index.adoc
--
diff --git a/src/asciidoctor/index.adoc b/src/asciidoctor/index.adoc
index 6eccdfb..01ef6ce 100644
--- a/src/asciidoctor/index.adoc
+++ b/src/asciidoctor/index.adoc
@@ -34,7 +34,6 @@ include::build.adoc[]
 TODO:
 * Apache logo
 * License report
-* ScalaDocs links
 * Project links
 * Dependency report
 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/a5726dee/src/asciidoctor/usage.adoc
--
diff --git a/src/asciidoctor/usage.adoc b/src/asciidoctor/usage.adoc
index cc65bad..93381a4 100644
--- a/src/asciidoctor/usage.adoc
+++ b/src/asciidoctor/usage.adoc
@@ -36,6 +36,21 @@ class MyClass extends BaseClass with Logging {
 }
 
 
+=== API Documentation
+
+|===
+|Scala Version |API Link
+
+|Scala 2.10
+|https://logging.apache.org/log4j/scala/log4j-api-scala_2.10/scaladocs/[ScalaDocs]
+
+|Scala 2.11
+|https://logging.apache.org/log4j/scala/log4j-api-scala_2.11/scaladocs/[ScalaDocs]
+
+|Scala 2.12
+|https://logging.apache.org/log4j/scala/log4j-api-scala_2.12/scaladocs/[ScalaDocs]
+|===
+
 == Configuration
 
 Log4j Scala API uses 
https://logging.apache.org/log4j/2.x/manual/configuration.html[Log4j 
configuration] by default.

[45/50] [abbrv] logging-log4j-scala git commit: Remove obsolete files

2018-04-03 Thread mattsicker 
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/be2e32be/src/site/resources/css/site.css
--
diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css
deleted file mode 100644
index 5827e44..000
--- a/src/site/resources/css/site.css
+++ /dev/null
@@ -1,95 +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.
-*/
-
-div.clear { clear:both; visibility: hidden; }
-div.clear hr { display: none; }
-
-/* Tweaks to the bootstrap theme
-- */
-li { line-height: 20px; }
-tt { font: 12px Menlo, Monaco, "Courier New", monospace; 
-webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; 
padding: 3px 4px; background-color: #f7f7f9; border: 1px solid #e1e1e8; }
-tt, code { color: #4e648e }
-dt { margin: 15px 0 5px 0; font-size: 1.2em }
-
-.big-red { font-weight: bold; color: #D14 }
-.big-green { font-weight: bold; color: green }
-
-.layout-table { width: 100%; }
-.sidebar { width: 250px; vertical-align: top; }
-.content { padding-left: 20px; vertical-align: top; }
-
-.sidebar-nav { padding: 9px 0; }
-
-.logo-left { margin: 10px; float: left }
-.logo-right { margin: 5px; float: right; height: 100px }
-
-.navbar .nav { margin-left: 40px; }
-
-.nav-list { margin-bottom: 15px; }
-.nav-list li { line-height: 16px; }
-.nav-list li.nav-header { color: #333; }
-.nav-list li.nav-header i { margin-right: 5px; }
-
-.nav-list li a { background: no-repeat 16px 9px; padding-left: 34px; }
-.nav-list li.collapsed > a { background-image: url(../images/collapsed.gif) }
-.nav-list li.expanded > a { background-image: url(../images/expanded.gif) }
-
-.nav-list li.expanded ul { list-style: none; margin-left: 0; }
-.nav-list li.expanded li a { display: block; padding: 3px 15px 3px 45px; 
margin-left: -15px; margin-right: -15px; }
-.nav-list li.expanded li a:hover { text-decoration: none; background-color: 
#eee; }
-.nav-list li.expanded li.active a { background-color: #08C; color: white }
-
-.nav.nav-tabs { margin-bottom: 8px; }
-
-.content .section { margin-top: 20px; }
-.content .section:first-child { margin-top: 0; }
-.section h2 { margin-bottom: 10px; }
-.section h3 { margin-bottom: 10px; }
-.section h4 { margin-bottom: 10px; }
-
-.footer { background-color: whitesmoke; padding: 15px; margin-top: 15px; 
text-align: center; border-top: 1px solid #eee; }
-.footer p { font-size: 12px; margin: 0 }
-
-.table-not-wide { width: inherit;}
-.alert-heading { display: block; font-size: 14px; margin-bottom: 6px; 
font-weight: bold; }
-
-/* Pretty printing styles. Used with prettify.js.
- */
-.com { color: #93a1a1; }
-.lit { color: #195f91; }
-.pun, .opn, .clo { color: #93a1a1; }
-.fun { color: #dc322f; }
-.str, .atv { color: #D14; }
-.kwd, .linenums .tag { color: #1e347b; }
-.typ, .atn, .dec, .var { color: teal; }
-.pln { color: #48484c; }
-.prettyprint { padding: 8px; background-color: #f7f7f9; border: 1px solid 
#e1e1e8; }
-.prettyprint.linenums {
-  -webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
- -moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
-  box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
-}
-ol.linenums { margin: 0 0 0 33px; }
-ol.linenums li { padding-left: 12px; color: #bebec5; line-height: 18px; 
text-shadow: 0 1px 0 #fff; }
-
-/* Additional styles.
*/
-
-/* fixed width font links (e.g., to a JavaDoc page) */
-a.javadoc, a.javadoc:hover {
-font: 12px Menlo, Monaco, "Courier New", monospace;
-}

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/be2e32be/src/site/resources/images/collapsed.gif
--
diff --git a/src/site/resources/images/collapsed.gif 
b/src/site/resources/images/collapsed.gif
deleted file mode 100644
index f2509c9..000
Binary files a/src/site/resources/images/collapsed.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/be2e32be/src/site/resources/images/expanded.gif
--
diff --git

[08/50] [abbrv] logging-log4j-scala git commit: LOG4J2-2296: Add minimal website generator config

2018-04-03 Thread mattsicker 
LOG4J2-2296: Add minimal website generator config


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/b510c122
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/b510c122
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/b510c122

Branch: refs/heads/master
Commit: b510c122e94c6cfb0b957f6a8ed83ecdc1057142
Parents: 53cfa5d
Author: Matt Sicker 
Authored: Thu Mar 29 20:13:58 2018 -0500
Committer: Matt Sicker 
Committed: Thu Mar 29 20:13:58 2018 -0500

--
 build.sbt   |  1 +
 log4j-api-scala_2.10/src/site/markdown/index.md | 74 
 log4j-api-scala_2.11/src/site/markdown/index.md | 74 
 log4j-api-scala_2.12/src/site/markdown/index.md | 74 
 log4j-api-scala_2.13/src/site/markdown/index.md | 74 
 project/plugins.sbt |  2 +
 src/asciidoctor/index.adoc  | 88 
 7 files changed, 91 insertions(+), 296 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/b510c122/build.sbt
--
diff --git a/build.sbt b/build.sbt
index 118337c..6dba52b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -96,6 +96,7 @@ lazy val root = (project in file("."))
   .settings(releaseSettings: _*)
   .settings(apiDependencies: _*)
   .settings(apiInputFiles: _*)
+  .enablePlugins(AsciidoctorPlugin)
 //  .enablePlugins(SbtOsgi)
 //  .settings(bundleSettings: _*)
 

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/b510c122/log4j-api-scala_2.10/src/site/markdown/index.md
--
diff --git a/log4j-api-scala_2.10/src/site/markdown/index.md 
b/log4j-api-scala_2.10/src/site/markdown/index.md
deleted file mode 100644
index ce84e3d..000
--- a/log4j-api-scala_2.10/src/site/markdown/index.md
+++ /dev/null
@@ -1,74 +0,0 @@
-
-# Log4j Scala 2.10 API
-
-## Requirements
-
-Log4j Scala API for Scala 2.10 requires Log4j API, Java 7, the Scala runtime
-library, and the Scala reflection library. To use Log4j as a logging 
implementation,
-then Log4j Core must also be included. Instructions on using these 
dependencies are
-in the [dependency information page][dependencies], and additional information 
is
-included in the [Log4j artifacts][artifacts] page.
-
-## Example Usage
-
-
-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")
-  }
-}
-
-
-## Configuration
-
-Log4j Scala 2.10 API uses the standard [Log4j configuration][configuration]
-plugins. This supports XML, properties files, and a configuration builder DSL 
by
-default, and it optionally supports JSON and YAML formats with some additional
-Jackson dependencies.
-
-## Substituting Parameters
-
-In the Java API, parameters to a log message are interpolated using various
-strategies. In the Scala API, [string interpolation][interpolation] is used
-instead. As all logger methods are implemented as macros, string construction 
and
-method invocations will only occur when logging is enabled for the given log
-level. For example:
-
-
-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 [`Logging` trait][logging]
-will automatically name the Logger accordingly to the class it is being used 
in.
-
-[dependencies]: dependency-info.html
-[artifacts]: ../maven-artifacts.html
-[configuration]: ../configuration.html
-[interpolation]: 
http://docs.scala-lang.org/overviews/core/string-interpolation.html
-[logging]: scaladocs/index.html#org.apache.logging.log4j.scala.Logging
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/b510c122/log4j-api-scala_2.11/src/site/markdown/index.md
--
diff --git a/log4j-api-scala_2.11/src/site/markdown/index.md 
b/log4j-api-scala_2.11/src/site/markdown/index.md
deleted file mode 100644
index 7ababf1..000
--- a/log4j-api-scala_2.11/src/site/markdown/index.md
+++ /dev/null
@@ -1,74 +0,0 @@
-
-# Log4j Scala 2.11 API
-
-## Requirements
-
-Log4j Scala API for Scala

[47/50] [abbrv] logging-log4j-scala git commit: Remove obsolete files

2018-04-03 Thread mattsicker 
Remove obsolete files


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/be2e32be
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/be2e32be
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/be2e32be

Branch: refs/heads/master
Commit: be2e32be63fbcd47e4650f5c18068d591601a0eb
Parents: 2080b51
Author: Matt Sicker 
Authored: Mon Apr 2 16:24:09 2018 -0500
Committer: Matt Sicker 
Committed: Mon Apr 2 16:24:09 2018 -0500

--
 pom.xml | 207 
 src/site/resources/css/bootstrap.min.css|   9 -
 src/site/resources/css/site.css |  95 
 src/site/resources/images/collapsed.gif | Bin 820 -> 0 bytes
 src/site/resources/images/expanded.gif  | Bin 52 -> 0 bytes
 src/site/resources/images/logo.png  | Bin 31853 -> 0 bytes
 src/site/resources/images/ls-logo.jpg   | Bin 41915 -> 0 bytes
 src/site/resources/images/maven-feather.png | Bin 3330 -> 0 bytes
 .../img/glyphicons-halflings-white.png  | Bin 8777 -> 0 bytes
 src/site/resources/img/glyphicons-halflings.png | Bin 12799 -> 0 bytes
 src/site/resources/js/bootstrap.min.js  |   6 -
 src/site/resources/js/jquery.min.js |   4 -
 src/site/resources/js/prettify.min.js   |  41 --
 src/site/resources/js/site.js   | 106 
 src/site/site.vm| 515 ---
 src/site/site.xml   |  30 --
 16 files changed, 1013 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/be2e32be/pom.xml
--
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index c26cc7a..000
--- a/pom.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-
-
-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/maven-v4_0_0.xsd;>
-  4.0.0
-  
-org.apache.logging
-logging-parent
-1
-  
-
-  org.apache.logging.log4j
-  log4j-scala
-  12.0-SNAPSHOT
-  pom
-
-  
-3.0.5
-  
-  
-  Apache Log4j 2 Scala API
-  Apache Log4j 2 Scala API
-  http://logging.apache.org/log4j/2.x/
-
-  
-
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
-
https://git-wip-us.apache.org/repos/asf?p=logging-log4j-scala.git;a=summary
-log4j-scala-${Log4jScalaApiReleaseVersion}
-  
-
-  
-3.6
-${basedir}
-11.0
-2.9.1
-2.12.1
-3.8
-  
-
-  
-
-  
-org.apache.logging.log4j
-log4j-api-scala_2.10
-${project.version}
-  
-  
-org.apache.logging.log4j
-log4j-api-scala_2.11
-${project.version}
-  
-  
-org.apache.logging.log4j
-log4j-api-scala_2.12
-${project.version}
-  
-  
-org.apache.logging.log4j
-log4j-api
-${log4j.version}
-  
-  
-org.apache.logging.log4j
-log4j-api
-${log4j.version}
-test-jar
-test
-  
-  
-org.apache.logging.log4j
-log4j-core
-${log4j.version}
-  
-  
-org.apache.logging.log4j
-log4j-core
-${log4j.version}
-test-jar
-test
-  
-  
-junit
-junit
-4.12
-test
-  
-
-  
-
-  
-log4j-api-scala_2.10
-log4j-api-scala_2.11
-log4j-api-scala_2.12
-
-log4j-api-scala-sample
-  
-
-  
-
-  
-
-  org.apache.maven.plugins
-  maven-site-plugin
-  ${maven-site-plugin.version}
-  
-en
-${log4jParentDir}/src/site/site.vm
-  
-
-
-  org.apache.felix
-  maven-bundle-plugin
-  3.3.0
-  true
-  true
-  
-
-  
-manifest
-  
-  process-classes
-
-  
-
-
-
-  org.apache.rat
-  apache-rat-plugin
-  0.12
-  
-
-  
-  README.md
-  
-  src/site/resources/js/jquery.js
-  src/site/resources/js/jquery.min.js
-  
-  log4j-distribution/target/**/*
-  log4j-distribution/.project
-  log4j-distribution/.settings/**
-  velocity.log
-  
-  felix-cache/**
-  RELEASE-NOTES.md
-
-  
-
-  
-
-
-

[03/50] [abbrv] logging-log4j-scala git commit: Reorganize api module

2018-04-03 Thread mattsicker 
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/72fe94f7/api/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
--
diff --git a/api/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala 
b/api/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
deleted file mode 100644
index bd12742..000
--- a/api/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
+++ /dev/null
@@ -1,552 +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, 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.Matchers.{any, anyString, eq => eqv}
-import org.mockito.Mockito._
-import org.scalatest.junit.JUnitRunner
-import org.scalatest.mockito.MockitoSugar
-import org.scalatest.{FunSuite, Matchers}
-
-import scala.language.reflectiveCalls  // needed for Mockito mocking
-
-case class Custom(i: Int)
-
-trait Manager {
-  def fetchValue(): Int
-}
-
-@RunWith(classOf[JUnitRunner])
-class LoggerTest extends FunSuite with Matchers with MockitoSugar {
-
-  val msg = new ParameterizedMessage("msg {}", 17)
-  val entryMsg = new DefaultFlowMessageFactory().newEntryMessage(msg)
-  val cseqMsg: CharSequence = new StringBuilder().append("cseq msg")
-  val objectMsg = Custom(17)
-  val cause = new RuntimeException("cause")
-  val marker = MarkerManager.getMarker("marker")
-  val result = "foo"
-
-  def fixture =
-new {
-  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
-  }
-}
-
-  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(anyString(), 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(anyString(), 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(anyString(), 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(anyString(), 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(anyString(), 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 =

[23/50] [abbrv] logging-log4j-scala git commit: Fix typo

2018-04-03 Thread mattsicker 
Fix typo


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/9c4d5484
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/9c4d5484
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/9c4d5484

Branch: refs/heads/master
Commit: 9c4d5484cf2dd828ab3362c6bb63ed9e97c637e8
Parents: 421c39c
Author: Matt Sicker 
Authored: Fri Mar 30 19:48:55 2018 -0500
Committer: Matt Sicker 
Committed: Fri Mar 30 19:48:55 2018 -0500

--
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/9c4d5484/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 1af227b..90b3893 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -59,7 +59,7 @@ pipeline {
 }
 post {
 failure {
-emailext body: "See <${env.BUILD_URL}>", replyTo: 
'd...@logging.apache.org', subject: "[Scala] Jenkins build failure 
(#${env.BUILD_NUMBER})", 'notificati...@logging.apache.org'
+emailext body: "See <${env.BUILD_URL}>", replyTo: 
'd...@logging.apache.org', subject: "[Scala] Jenkins build failure 
(#${env.BUILD_NUMBER})", to: 'notificati...@logging.apache.org'
 }
 }
 }

[42/50] [abbrv] logging-log4j-scala git commit: Update build instructions

2018-04-03 Thread mattsicker 
Update build instructions


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/2080b517
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/2080b517
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/2080b517

Branch: refs/heads/master
Commit: 2080b517f4698768aa18e93eadb6419665715d1d
Parents: 94faa79
Author: Matt Sicker 
Authored: Mon Apr 2 15:48:45 2018 -0500
Committer: Matt Sicker 
Committed: Mon Apr 2 15:54:52 2018 -0500

--
 BUILDING.md | 4 
 README.md   | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/2080b517/BUILDING.md
--
diff --git a/BUILDING.md b/BUILDING.md
index 1fea4bb..a1bebb3 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -17,3 +17,7 @@
 # Building Log4j 2 Scala API
 
 Moved to [site docs](./src/asciidoctor/build.adoc).
+
+Summary:
+
+./sbt "+ publishM2"

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/2080b517/README.md
--
diff --git a/README.md b/README.md
index f2c2918..605ef66 100644
--- a/README.md
+++ b/README.md
@@ -19,8 +19,8 @@ SBT users can add the following dependencies to their 
`build.sbt` file:
 ```scala
 libraryDependencies ++= Seq(
   "org.apache.logging.log4j" %% "log4j-api-scala" % "11.0",
-  "org.apache.logging.log4j" % "log4j-api" % "2.8.2",
-  "org.apache.logging.log4j" % "log4j-core" % "2.8.2" % Runtime
+  "org.apache.logging.log4j" % "log4j-api" % "2.11.0",
+  "org.apache.logging.log4j" % "log4j-core" % "2.11.0" % Runtime
 )
 ```
 
@@ -77,11 +77,11 @@ JIRA issue in the Pull Request.
 
 ## Building From Source
 
-Log4j Scala API requires Maven 3 and Java 8 to build. To install to your local
+Log4j Scala API requires Java 8 to build. To install to your local
 Maven repository, execute the following:
 
 ```sh
-mvn install
+./sbt "+ publishM2"
 ```
 
 ## Contributing

[12/50] [abbrv] logging-log4j-scala git commit: Add LOG4J2-2291 changelog entry

2018-04-03 Thread mattsicker 
Add LOG4J2-2291 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/5a358d74
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/5a358d74
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/5a358d74

Branch: refs/heads/master
Commit: 5a358d74a97174c46ac54f68d6ddd33b84746c85
Parents: 938aada
Author: Matt Sicker 
Authored: Fri Mar 30 14:10:17 2018 -0500
Committer: Matt Sicker 
Committed: Fri Mar 30 14:10:17 2018 -0500

--
 src/changes/changes.xml | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/5a358d74/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 0458f58..8ec0d27 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,6 +31,9 @@
  - "remove" - Removed
 -->
 
+  
+Add Jenkins pipeline for SBT build.
+  
   
 Update Log4j from 2.9.1 to 2.11.0.

[14/50] [abbrv] logging-log4j-scala git commit: Add missing license headers

2018-04-03 Thread mattsicker 
Add missing license headers


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/814f77d3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/814f77d3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/814f77d3

Branch: refs/heads/master
Commit: 814f77d3eab094a24823bab8de6ec22566f232b4
Parents: 47899ea
Author: Matt Sicker 
Authored: Fri Mar 30 16:01:45 2018 -0500
Committer: Matt Sicker 
Committed: Fri Mar 30 16:01:45 2018 -0500

--
 project/Dependencies.scala | 16 
 project/build.properties   | 17 +
 project/plugins.sbt| 16 
 version.sbt| 18 +-
 4 files changed, 66 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/814f77d3/project/Dependencies.scala
--
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 0de9510..93b3aff 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -1,3 +1,19 @@
+/*
+ * 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 {

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/814f77d3/project/build.properties
--
diff --git a/project/build.properties b/project/build.properties
index 31334bb..c604a95 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1,18 @@
+#
+# 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.
+#
+
 sbt.version=1.1.1

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/814f77d3/project/plugins.sbt
--
diff --git a/project/plugins.sbt b/project/plugins.sbt
index df90981..0d7f53e 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.8")
 addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0")

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/814f77d3/version.sbt
--
diff --git a/version.sbt b/version.sbt
index 45d87d8..b8bcd26 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1,17 @@
-version in ThisBuild :=

[30/50] [abbrv] logging-log4j-scala git commit: Add changelog entry

2018-04-03 Thread mattsicker 
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/master
Commit: e665ddfbeed6ffcf10d47cdef3e48c8b773f41a1
Parents: 6cb937c
Author: Matt Sicker 
Authored: Sat Mar 31 19:55:49 2018 -0500
Committer: Matt Sicker 
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.

[16/50] [abbrv] logging-log4j-scala git commit: Add scaladocs to site output

2018-04-03 Thread mattsicker 
Add scaladocs to site output


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/5be05b5e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/5be05b5e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/5be05b5e

Branch: refs/heads/master
Commit: 5be05b5e59f9db7f51460562a66ae8b4f3a74a73
Parents: 1f4b789
Author: Matt Sicker 
Authored: Fri Mar 30 16:36:46 2018 -0500
Committer: Matt Sicker 
Committed: Fri Mar 30 16:36:46 2018 -0500

--
 build.sbt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/5be05b5e/build.sbt
--
diff --git a/build.sbt b/build.sbt
index 5f52ed9..00993c0 100644
--- a/build.sbt
+++ b/build.sbt
@@ -85,7 +85,8 @@ lazy val publishSettings = Seq(
 
 lazy val releaseSettings = Seq(
   releaseCrossBuild := true,
-  apiURL := 
Some(url(s"https://logging.apache.org/log4j/scala/log4j-api-scala_${scalaBinaryVersion.value}/scaladocs/;))
+  apiURL := 
Some(url(s"https://logging.apache.org/log4j/scala/api/${version.value}/;)),
+  siteSubdirName in SiteScaladoc := s"api/${version.value}"
 )
 
 lazy val apiDependencies = Seq(
@@ -122,6 +123,7 @@ lazy val root = (project in file("."))
   .settings(apiDependencies: _*)
   .settings(apiInputFiles: _*)
   .enablePlugins(AsciidoctorPlugin)
+  .enablePlugins(SiteScaladocPlugin)
 //  .enablePlugins(SbtOsgi)
 //  .settings(bundleSettings: _*)

[46/50] [abbrv] logging-log4j-scala git commit: Remove obsolete files

2018-04-03 Thread mattsicker 
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/be2e32be/src/site/resources/css/bootstrap.min.css
--
diff --git a/src/site/resources/css/bootstrap.min.css 
b/src/site/resources/css/bootstrap.min.css
deleted file mode 100644
index 43e16d7..000
--- a/src/site/resources/css/bootstrap.min.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Bootstrap v2.2.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- 
*/article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin
 dotted #333;outline:5px auto 
-webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{width:auto\9;height:auto;max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}#map_canvas
 img,.google-maps 
img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,html
 
input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}input[type="search"]{-webkit-box-siz
 
ing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0
 
a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}body{margin:0;font-family:"Helvetica
 
Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover{color:#005580;text-decoration:underline}.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.img-polaroid{padding:4px;background-color:#fff;border:1px
 solid #ccc;border:1px solid r
 gba(0,0,0,0.2);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.1);-moz-box-shadow:0 
1px 3px rgba(0,0,0,0.1);box-shadow:0 1px 3px 
rgba(0,0,0,0.1)}.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top
 .container,.navbar-fixed-top .container,.navbar-fixed-bottom 
.container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{
 
margin-left:260px}.offset2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid
 
[class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid
 [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row 
[class*="span"]+[class*="span"]{margin-left:2.127659574468085%}.row-fluid 
.span12{width:100%;*width:99.94680851063829%}.row-fluid 
.span11{width:91.48936170212765%;*width:91.43617021276594%}.row-fluid 
.span10{width:82.97872340425532%;*width:82.92553191489361%}.row-fluid 
.span9{width:74.46808510638297%;*width:74.41489361702126%}.row-fluid 
.span8{width:65.95744680851064%;*width:65.90425531914893%}.row-fluid 
.span7{width:57.44680851063829%;*width:57.39361702127659%}.row-fluid 
.span6{width:48.9
 3617021276595%;*width:48.88297872340425%}.row-fluid 
.span5{width:40.42553191489362%;*width:40.37234042553192%}.row-fluid 
.span4{width:31.914893617021278%;*width:31.861702127659576%}.row-fluid 
.span3{width:23.404255319148934%;*width:23.351063829787233%}.row-fluid

[06/50] [abbrv] logging-log4j-scala git commit: Move artifact archival to deploy stage

2018-04-03 Thread mattsicker 
Move artifact archival to deploy stage


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/47ba596b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/47ba596b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/47ba596b

Branch: refs/heads/master
Commit: 47ba596bc0e1631c4ee0a281c48f3f4c0321078a
Parents: 18068fb
Author: Matt Sicker 
Authored: Thu Mar 29 11:18:01 2018 -0500
Committer: Matt Sicker 
Committed: Thu Mar 29 11:18:01 2018 -0500

--
 Jenkinsfile | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/47ba596b/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index a58a304..a117fc0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,7 +28,6 @@ pipeline {
 steps {
 ansiColor('xterm') {
 sh './sbt -batch "+ compile"'
-archiveArtifacts artifacts: 'target/**/*.jar', 
fingerprint: true, onlyIfSuccessful: true
 }
 }
 }
@@ -39,17 +38,16 @@ pipeline {
 }
 }
 }
-// FIXME: LOG4J2-2291
-/*
 stage('Deploy') {
 when { branch 'master' }
 steps {
 ansiColor('xterm') {
-sh './sbt -batch "+ publish"'
+// FIXME: LOG4J2-2291
+//sh './sbt -batch "+ publish"'
+archiveArtifacts artifacts: 'target/**/*.jar', 
fingerprint: true
 }
 }
 }
-*/
 }
 }

logging-log4j-scala git commit: Remove obsolete files

2018-04-03 Thread mattsicker 
Repository: logging-log4j-scala
Updated Branches:
  refs/heads/sbt ddc513c58 -> ffcbc0362


Remove obsolete files


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/ffcbc036
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/ffcbc036
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/ffcbc036

Branch: refs/heads/sbt
Commit: ffcbc03624fbdef97289cbd531e54a5ce90a9434
Parents: ddc513c
Author: Matt Sicker 
Authored: Tue Apr 3 16:01:36 2018 -0500
Committer: Matt Sicker 
Committed: Tue Apr 3 16:01:36 2018 -0500

--
 log4j-scala-distribution/pom.xml  | 134 -
 log4j-scala-distribution/src/assembly/bin.xml |  58 -
 log4j-scala-distribution/src/assembly/src.xml |  76 
 3 files changed, 268 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/ffcbc036/log4j-scala-distribution/pom.xml
--
diff --git a/log4j-scala-distribution/pom.xml b/log4j-scala-distribution/pom.xml
deleted file mode 100644
index 80bb523..000
--- a/log4j-scala-distribution/pom.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-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;>
-  4.0.0
-  
-org.apache.logging.log4j
-log4j-scala
-12.0-SNAPSHOT
-../
-  
-  log4j-scala-distribution
-  pom
-  Apache Log4j Scala API Distribution
-  Scala wrapper for Log4j API
-  
-
-  org.apache.logging.log4j
-  log4j-api-scala_2.10
-  ${project.version}
-
-
-  org.apache.logging.log4j
-  log4j-api-scala_2.10
-  ${project.version}
-  sources
-
-
-  org.apache.logging.log4j
-  log4j-api-scala_2.10
-  ${project.version}
-  javadoc
-
-
-  org.apache.logging.log4j
-  log4j-api-scala_2.11
-  ${project.version}
-
-
-  org.apache.logging.log4j
-  log4j-api-scala_2.11
-  ${project.version}
-  sources
-
-
-  org.apache.logging.log4j
-  log4j-api-scala_2.11
-  ${project.version}
-  javadoc
-
-
-  org.apache.logging.log4j
-  log4j-api-scala_2.12
-  ${project.version}
-
-
-  org.apache.logging.log4j
-  log4j-api-scala_2.12
-  ${project.version}
-  sources
-
-
-  org.apache.logging.log4j
-  log4j-api-scala_2.12
-  ${project.version}
-  javadoc
-
-  
-  
-
-  
-maven-assembly-plugin
-
-  
-  
-log4j-scala-source-release-assembly
-package
-
-  single
-
-
-  apache-log4j-scala-${project.version}
-  
-src/assembly/src.xml
-  
-  gnu
-
-  
-  
-binary
-
-  apache-log4j-scala-${project.version}
-  
-src/assembly/bin.xml
-  
-  gnu
-
-
-  single
-
-package
-  
-
-  
-  
-org.apache.maven.plugins
-maven-site-plugin
-3.0
-
-  true
-  true
-
-  
-
-  
-

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/ffcbc036/log4j-scala-distribution/src/assembly/bin.xml
--
diff --git a/log4j-scala-distribution/src/assembly/bin.xml 
b/log4j-scala-distribution/src/assembly/bin.xml
deleted file mode 100644
index 7e95c5a..000
--- a/log4j-scala-distribution/src/assembly/bin.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-bin
-
-tar.gz
-zip
-
-apache-log4j-scala-${project.version}-bin
-false
-
-
-true
-
-
-
-
-
-org.apache.logging.log4j:log4j-*
-
-
-false
-
-
-
-
-
-..
-
-LICENSE.txt
-NOTICE.txt
-
-
-
-
-

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/ffcbc036/log4j-scala-distribution/src/assembly/src.xml
--
diff --git a/log4j-scala-distribution/src/assembly/src.xml 
b/log4j-scala-distribution/src/assembly/src.xml
deleted file mode 100644
index aa0dc59..000
--- a/log4j-scala-distribution/src/assembly/src.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-  src
-  
-zip
-

[2/7] logging-log4j-scala git commit: Remove obsolete files

2018-04-03 Thread mattsicker 
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/be2e32be/src/site/resources/js/prettify.min.js
--
diff --git a/src/site/resources/js/prettify.min.js 
b/src/site/resources/js/prettify.min.js
deleted file mode 100644
index 6623601..000
--- a/src/site/resources/js/prettify.min.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (C) 2006 Google Inc.
-//
-// Licensed 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.
-var q=null;window.PR_SHOULD_USE_CONTINUATION=!0;
-(function(){function L(a){function m(a){var f=a.charCodeAt(0);if(f!==92)return 
f;var 
b=a.charAt(1);return(f=r[b])?f:"0"<=b&<="7"?parseInt(a.substring(1),8):b==="u"||b==="x"?parseInt(a.substring(2),16):a.charCodeAt(1)}function
 
e(a){if(a<32)return(a<16?"\\x0":"\\x")+a.toString(16);a=String.fromCharCode(a);if(a==="\\"||a==="-"||a==="["||a==="]")a="\\"+a;return
 a}function h(a){for(var 
f=a.substring(1,a.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),a=
-[],b=[],o=f[0]==="^",c=o?1:0,i=f.length;c122||(d<65||j>90||b.push([Math.max(65,j)|32,Math.min(d,90)|32]),d<97||j>122||b.push([Math.max(97,j)&-33,Math.min(d,122)&-33]))}}b.sort(function(a,f){return
 
a[0]-f[0]||f[1]-a[1]});f=[];j=[NaN,NaN];for(c=0;ci[0]&&(i[1]+1>i[0]&("-"),b.push(e(i[1])));b.push("]");return
 b.join("")}function y(a){for(var 
f=a.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),b=f.length,d=[],c=0,i=0;c=2&==="["?f[c]=h(j):a!=="\\"&&(f[c]=j.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return
 f.join("")}for(var t=0,s=!1,l=!1,p=0,d=a.length;p=5&&"lang-"===b.substring(0,5))&&!(o&
 o[1]==="string"))c=!1,b="src";c||(r[f]=b)}i=d;d+=f.length;if(c){c=o[1];var 
j=f.indexOf(c),k=j+c.length;o[2]&&(k=f.length-o[2].length,j=k-c.length);b=b.substring(5);B(l+i,f.substring(0,j),e,p);B(l+i+j,c,C(b,c),p);B(l+i+k,f.substring(k),e,p)}else
 p.push(l+i,b)}a.e=p}var h={},y;(function(){for(var e=a.concat(m),
-l=[],p={},d=0,g=e.length;d=0;)h[n.charAt(k)]=r;r=r[1];n=""+r;p.hasOwnProperty(n)||(l.push(r),p[n]=q)}l.push(/[\S\s]/);y=L(l)})();var
 t=m.length;return e}function u(a){var

[7/7] logging-log4j-scala git commit: LOG4J2-2303: Add release distribution script

2018-04-03 Thread mattsicker 
LOG4J2-2303: Add release distribution script


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/ddc513c5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/ddc513c5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/ddc513c5

Branch: refs/heads/sbt
Commit: ddc513c58cd302353c00898bace1a5d4f953d2e4
Parents: be2e32b
Author: Matt Sicker 
Authored: Tue Apr 3 16:00:11 2018 -0500
Committer: Matt Sicker 
Committed: Tue Apr 3 16:00:31 2018 -0500

--
 build.sbt|  3 +-
 create-distributions.sh  | 62 +
 project/Distributions.scala  | 96 +++
 src/asciidoctor/changes.adoc |  1 +
 4 files changed, 161 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/ddc513c5/build.sbt
--
diff --git a/build.sbt b/build.sbt
index 9398b25..722267f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -82,7 +82,7 @@ lazy val packagingSettings = Seq(
   ),
   unmanagedSources in Compile := {
 val Some((_, minor)) = CrossVersion.partialVersion(scalaVersion.value)
-val extras = if (minor > 10) ((baseDirectory.value / "src" / "main" / 
"scala-2.11+") ** "*.scala").get else Nil
+val extras = if (minor > 10) ((sourceDirectory.value / "main" / 
"scala-2.11+") ** "*.scala").get else Nil
 (unmanagedSources in Compile).value ++ extras
   }
 )
@@ -126,6 +126,7 @@ lazy val root = (project in file("."))
   .enablePlugins(SiteScaladocPlugin)
   .enablePlugins(SbtOsgi)
   .settings(bundleSettings: _*)
+  .enablePlugins(Distributions)
 
 lazy val nopublish = Seq(
   publish := {},

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/ddc513c5/create-distributions.sh
--
diff --git a/create-distributions.sh b/create-distributions.sh
new file mode 100755
index 000..9750ea6
--- /dev/null
+++ b/create-distributions.sh
@@ -0,0 +1,62 @@
+#!/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"
+}
+
+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} 
${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}

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/ddc513c5/project/Distributions.scala
--
diff --git a/project/Distributions.scala b/project/Distributions.scala
new file mode 100644
index 000..25b4b5a
--- /dev/null
+++ b/project/Distributions.scala
@@ -0,0 +1,96 @@
+/*
+ * 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

[1/7] logging-log4j-scala git commit: Update build instructions

2018-04-03 Thread mattsicker 
Repository: logging-log4j-scala
Updated Branches:
  refs/heads/sbt 94faa7984 -> ddc513c58


Update build instructions


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/2080b517
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/2080b517
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/2080b517

Branch: refs/heads/sbt
Commit: 2080b517f4698768aa18e93eadb6419665715d1d
Parents: 94faa79
Author: Matt Sicker 
Authored: Mon Apr 2 15:48:45 2018 -0500
Committer: Matt Sicker 
Committed: Mon Apr 2 15:54:52 2018 -0500

--
 BUILDING.md | 4 
 README.md   | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/2080b517/BUILDING.md
--
diff --git a/BUILDING.md b/BUILDING.md
index 1fea4bb..a1bebb3 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -17,3 +17,7 @@
 # Building Log4j 2 Scala API
 
 Moved to [site docs](./src/asciidoctor/build.adoc).
+
+Summary:
+
+./sbt "+ publishM2"

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/2080b517/README.md
--
diff --git a/README.md b/README.md
index f2c2918..605ef66 100644
--- a/README.md
+++ b/README.md
@@ -19,8 +19,8 @@ SBT users can add the following dependencies to their 
`build.sbt` file:
 ```scala
 libraryDependencies ++= Seq(
   "org.apache.logging.log4j" %% "log4j-api-scala" % "11.0",
-  "org.apache.logging.log4j" % "log4j-api" % "2.8.2",
-  "org.apache.logging.log4j" % "log4j-core" % "2.8.2" % Runtime
+  "org.apache.logging.log4j" % "log4j-api" % "2.11.0",
+  "org.apache.logging.log4j" % "log4j-core" % "2.11.0" % Runtime
 )
 ```
 
@@ -77,11 +77,11 @@ JIRA issue in the Pull Request.
 
 ## Building From Source
 
-Log4j Scala API requires Maven 3 and Java 8 to build. To install to your local
+Log4j Scala API requires Java 8 to build. To install to your local
 Maven repository, execute the following:
 
 ```sh
-mvn install
+./sbt "+ publishM2"
 ```
 
 ## Contributing

[5/7] logging-log4j-scala git commit: Remove obsolete files

2018-04-03 Thread mattsicker 
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/be2e32be/src/site/resources/css/bootstrap.min.css
--
diff --git a/src/site/resources/css/bootstrap.min.css 
b/src/site/resources/css/bootstrap.min.css
deleted file mode 100644
index 43e16d7..000
--- a/src/site/resources/css/bootstrap.min.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Bootstrap v2.2.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- 
*/article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin
 dotted #333;outline:5px auto 
-webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{width:auto\9;height:auto;max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}#map_canvas
 img,.google-maps 
img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,html
 
input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}input[type="search"]{-webkit-box-siz
 
ing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0
 
a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}body{margin:0;font-family:"Helvetica
 
Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover{color:#005580;text-decoration:underline}.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.img-polaroid{padding:4px;background-color:#fff;border:1px
 solid #ccc;border:1px solid r
 gba(0,0,0,0.2);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.1);-moz-box-shadow:0 
1px 3px rgba(0,0,0,0.1);box-shadow:0 1px 3px 
rgba(0,0,0,0.1)}.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top
 .container,.navbar-fixed-top .container,.navbar-fixed-bottom 
.container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{
 
margin-left:260px}.offset2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid
 
[class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid
 [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row 
[class*="span"]+[class*="span"]{margin-left:2.127659574468085%}.row-fluid 
.span12{width:100%;*width:99.94680851063829%}.row-fluid 
.span11{width:91.48936170212765%;*width:91.43617021276594%}.row-fluid 
.span10{width:82.97872340425532%;*width:82.92553191489361%}.row-fluid 
.span9{width:74.46808510638297%;*width:74.41489361702126%}.row-fluid 
.span8{width:65.95744680851064%;*width:65.90425531914893%}.row-fluid 
.span7{width:57.44680851063829%;*width:57.39361702127659%}.row-fluid 
.span6{width:48.9
 3617021276595%;*width:48.88297872340425%}.row-fluid 
.span5{width:40.42553191489362%;*width:40.37234042553192%}.row-fluid 
.span4{width:31.914893617021278%;*width:31.861702127659576%}.row-fluid 
.span3{width:23.404255319148934%;*width:23.351063829787233%}.row-fluid

[4/7] logging-log4j-scala git commit: Remove obsolete files

2018-04-03 Thread mattsicker 
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/be2e32be/src/site/resources/css/site.css
--
diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css
deleted file mode 100644
index 5827e44..000
--- a/src/site/resources/css/site.css
+++ /dev/null
@@ -1,95 +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.
-*/
-
-div.clear { clear:both; visibility: hidden; }
-div.clear hr { display: none; }
-
-/* Tweaks to the bootstrap theme
-- */
-li { line-height: 20px; }
-tt { font: 12px Menlo, Monaco, "Courier New", monospace; 
-webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; 
padding: 3px 4px; background-color: #f7f7f9; border: 1px solid #e1e1e8; }
-tt, code { color: #4e648e }
-dt { margin: 15px 0 5px 0; font-size: 1.2em }
-
-.big-red { font-weight: bold; color: #D14 }
-.big-green { font-weight: bold; color: green }
-
-.layout-table { width: 100%; }
-.sidebar { width: 250px; vertical-align: top; }
-.content { padding-left: 20px; vertical-align: top; }
-
-.sidebar-nav { padding: 9px 0; }
-
-.logo-left { margin: 10px; float: left }
-.logo-right { margin: 5px; float: right; height: 100px }
-
-.navbar .nav { margin-left: 40px; }
-
-.nav-list { margin-bottom: 15px; }
-.nav-list li { line-height: 16px; }
-.nav-list li.nav-header { color: #333; }
-.nav-list li.nav-header i { margin-right: 5px; }
-
-.nav-list li a { background: no-repeat 16px 9px; padding-left: 34px; }
-.nav-list li.collapsed > a { background-image: url(../images/collapsed.gif) }
-.nav-list li.expanded > a { background-image: url(../images/expanded.gif) }
-
-.nav-list li.expanded ul { list-style: none; margin-left: 0; }
-.nav-list li.expanded li a { display: block; padding: 3px 15px 3px 45px; 
margin-left: -15px; margin-right: -15px; }
-.nav-list li.expanded li a:hover { text-decoration: none; background-color: 
#eee; }
-.nav-list li.expanded li.active a { background-color: #08C; color: white }
-
-.nav.nav-tabs { margin-bottom: 8px; }
-
-.content .section { margin-top: 20px; }
-.content .section:first-child { margin-top: 0; }
-.section h2 { margin-bottom: 10px; }
-.section h3 { margin-bottom: 10px; }
-.section h4 { margin-bottom: 10px; }
-
-.footer { background-color: whitesmoke; padding: 15px; margin-top: 15px; 
text-align: center; border-top: 1px solid #eee; }
-.footer p { font-size: 12px; margin: 0 }
-
-.table-not-wide { width: inherit;}
-.alert-heading { display: block; font-size: 14px; margin-bottom: 6px; 
font-weight: bold; }
-
-/* Pretty printing styles. Used with prettify.js.
- */
-.com { color: #93a1a1; }
-.lit { color: #195f91; }
-.pun, .opn, .clo { color: #93a1a1; }
-.fun { color: #dc322f; }
-.str, .atv { color: #D14; }
-.kwd, .linenums .tag { color: #1e347b; }
-.typ, .atn, .dec, .var { color: teal; }
-.pln { color: #48484c; }
-.prettyprint { padding: 8px; background-color: #f7f7f9; border: 1px solid 
#e1e1e8; }
-.prettyprint.linenums {
-  -webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
- -moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
-  box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
-}
-ol.linenums { margin: 0 0 0 33px; }
-ol.linenums li { padding-left: 12px; color: #bebec5; line-height: 18px; 
text-shadow: 0 1px 0 #fff; }
-
-/* Additional styles.
*/
-
-/* fixed width font links (e.g., to a JavaDoc page) */
-a.javadoc, a.javadoc:hover {
-font: 12px Menlo, Monaco, "Courier New", monospace;
-}

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/be2e32be/src/site/resources/images/collapsed.gif
--
diff --git a/src/site/resources/images/collapsed.gif 
b/src/site/resources/images/collapsed.gif
deleted file mode 100644
index f2509c9..000
Binary files a/src/site/resources/images/collapsed.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/be2e32be/src/site/resources/images/expanded.gif
--
diff --git

[3/7] logging-log4j-scala git commit: Remove obsolete files

2018-04-03 Thread mattsicker 
http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/be2e32be/src/site/resources/js/jquery.min.js
--
diff --git a/src/site/resources/js/jquery.min.js 
b/src/site/resources/js/jquery.min.js
deleted file mode 100644
index 198b3ff..000
--- a/src/site/resources/js/jquery.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v1.7.1 jquery.com | jquery.org/license */
-(function(a,b){function cy(a){return 
f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function 
cv(a){if(!ck[a]){var 
b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"":"")+""),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return
 ck[a]}function cu(a,b){var 
c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return 
c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function 
cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function 
ci(){try{return new a.XMLHttpRequest}catch(b){}}function 
cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var 
d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p
 ;for(g=1;g0){if(c!=="border")for(;g

[6/7] logging-log4j-scala git commit: Remove obsolete files

2018-04-03 Thread mattsicker 
Remove obsolete files


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/be2e32be
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/be2e32be
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/be2e32be

Branch: refs/heads/sbt
Commit: be2e32be63fbcd47e4650f5c18068d591601a0eb
Parents: 2080b51
Author: Matt Sicker 
Authored: Mon Apr 2 16:24:09 2018 -0500
Committer: Matt Sicker 
Committed: Mon Apr 2 16:24:09 2018 -0500

--
 pom.xml | 207 
 src/site/resources/css/bootstrap.min.css|   9 -
 src/site/resources/css/site.css |  95 
 src/site/resources/images/collapsed.gif | Bin 820 -> 0 bytes
 src/site/resources/images/expanded.gif  | Bin 52 -> 0 bytes
 src/site/resources/images/logo.png  | Bin 31853 -> 0 bytes
 src/site/resources/images/ls-logo.jpg   | Bin 41915 -> 0 bytes
 src/site/resources/images/maven-feather.png | Bin 3330 -> 0 bytes
 .../img/glyphicons-halflings-white.png  | Bin 8777 -> 0 bytes
 src/site/resources/img/glyphicons-halflings.png | Bin 12799 -> 0 bytes
 src/site/resources/js/bootstrap.min.js  |   6 -
 src/site/resources/js/jquery.min.js |   4 -
 src/site/resources/js/prettify.min.js   |  41 --
 src/site/resources/js/site.js   | 106 
 src/site/site.vm| 515 ---
 src/site/site.xml   |  30 --
 16 files changed, 1013 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/be2e32be/pom.xml
--
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index c26cc7a..000
--- a/pom.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-
-
-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/maven-v4_0_0.xsd;>
-  4.0.0
-  
-org.apache.logging
-logging-parent
-1
-  
-
-  org.apache.logging.log4j
-  log4j-scala
-  12.0-SNAPSHOT
-  pom
-
-  
-3.0.5
-  
-  
-  Apache Log4j 2 Scala API
-  Apache Log4j 2 Scala API
-  http://logging.apache.org/log4j/2.x/
-
-  
-
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
-
https://git-wip-us.apache.org/repos/asf?p=logging-log4j-scala.git;a=summary
-log4j-scala-${Log4jScalaApiReleaseVersion}
-  
-
-  
-3.6
-${basedir}
-11.0
-2.9.1
-2.12.1
-3.8
-  
-
-  
-
-  
-org.apache.logging.log4j
-log4j-api-scala_2.10
-${project.version}
-  
-  
-org.apache.logging.log4j
-log4j-api-scala_2.11
-${project.version}
-  
-  
-org.apache.logging.log4j
-log4j-api-scala_2.12
-${project.version}
-  
-  
-org.apache.logging.log4j
-log4j-api
-${log4j.version}
-  
-  
-org.apache.logging.log4j
-log4j-api
-${log4j.version}
-test-jar
-test
-  
-  
-org.apache.logging.log4j
-log4j-core
-${log4j.version}
-  
-  
-org.apache.logging.log4j
-log4j-core
-${log4j.version}
-test-jar
-test
-  
-  
-junit
-junit
-4.12
-test
-  
-
-  
-
-  
-log4j-api-scala_2.10
-log4j-api-scala_2.11
-log4j-api-scala_2.12
-
-log4j-api-scala-sample
-  
-
-  
-
-  
-
-  org.apache.maven.plugins
-  maven-site-plugin
-  ${maven-site-plugin.version}
-  
-en
-${log4jParentDir}/src/site/site.vm
-  
-
-
-  org.apache.felix
-  maven-bundle-plugin
-  3.3.0
-  true
-  true
-  
-
-  
-manifest
-  
-  process-classes
-
-  
-
-
-
-  org.apache.rat
-  apache-rat-plugin
-  0.12
-  
-
-  
-  README.md
-  
-  src/site/resources/js/jquery.js
-  src/site/resources/js/jquery.min.js
-  
-  log4j-distribution/target/**/*
-  log4j-distribution/.project
-  log4j-distribution/.settings/**
-  velocity.log
-  
-  felix-cache/**
-  RELEASE-NOTES.md
-
-  
-
-  
-
-
-  
-

[6/8] logging-log4j-kotlin git commit: Add rat check to build

2018-04-03 Thread mattsicker 
Add rat check to build


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/commit/8858c6f6
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/tree/8858c6f6
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/diff/8858c6f6

Branch: refs/heads/master
Commit: 8858c6f649c431763860683b498914a838ea2bfe
Parents: 7a4c91a
Author: Raman Gupta 
Authored: Tue Apr 3 12:39:55 2018 -0400
Committer: Raman Gupta 
Committed: Tue Apr 3 12:39:55 2018 -0400

--
 pom.xml | 13 +
 1 file changed, 13 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/8858c6f6/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 31af9ba..922bef4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,19 @@
   
 
   
+org.apache.rat
+apache-rat-plugin
+0.12
+
+  
+process-sources
+
+  check
+
+  
+
+  
+  
 org.jetbrains.kotlin
 kotlin-maven-plugin
 ${kotlin.version}

[3/8] logging-log4j-kotlin git commit: Add docs html5 output to maven

2018-04-03 Thread mattsicker 
Add docs html5 output to maven


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/commit/845862fb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/tree/845862fb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/diff/845862fb

Branch: refs/heads/master
Commit: 845862fb12d6e079e0738019bd344f1bed0acf3c
Parents: 42458fd
Author: Raman Gupta 
Authored: Mon Apr 2 20:45:44 2018 -0400
Committer: Raman Gupta 
Committed: Mon Apr 2 20:45:44 2018 -0400

--
 pom.xml | 17 +
 1 file changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/845862fb/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 31af9ba..d25bf56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,6 +114,23 @@
   
 
   
+  
+org.asciidoctor
+asciidoctor-maven-plugin
+1.5.6
+
+  
+output-html
+generate-resources
+
+  process-asciidoc
+
+  
+
+
+  html5
+
+

[4/8] logging-log4j-kotlin git commit: Simplify companion object declaration

2018-04-03 Thread mattsicker 
Simplify companion object declaration


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/commit/68f51ba1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/tree/68f51ba1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/diff/68f51ba1

Branch: refs/heads/master
Commit: 68f51ba17746ffd16c73c73b0d32a0aaefcd8c1c
Parents: 845862f
Author: Raman Gupta 
Authored: Tue Apr 3 12:17:55 2018 -0400
Committer: Raman Gupta 
Committed: Tue Apr 3 12:17:55 2018 -0400

--
 src/main/asciidoc/usage.adoc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/68f51ba1/src/main/asciidoc/usage.adoc
--
diff --git a/src/main/asciidoc/usage.adoc b/src/main/asciidoc/usage.adoc
index 5a40074..e49e9e2 100644
--- a/src/main/asciidoc/usage.adoc
+++ b/src/main/asciidoc/usage.adoc
@@ -39,9 +39,7 @@ The `Logging` interface can also be mixed into `object` 
declarations, including
 import org.apache.logging.log4j.kotlin.Logging
 
 class MyClass: BaseClass {
-  companion object : Logging {
-// other declarations
-  }
+  companion object : Logging
 
   ...
 }

[7/8] logging-log4j-kotlin git commit: Merge branch 'rat-check-fixes' into docs

2018-04-03 Thread mattsicker 
Merge branch 'rat-check-fixes' into docs


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/commit/2a2a773d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/tree/2a2a773d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/diff/2a2a773d

Branch: refs/heads/master
Commit: 2a2a773d6392fd2fe9dcffa813ba636aa29b229c
Parents: 68f51ba 8858c6f
Author: Raman Gupta 
Authored: Tue Apr 3 12:40:11 2018 -0400
Committer: Raman Gupta 
Committed: Tue Apr 3 12:40:11 2018 -0400

--
 .../org/apache/logging/log4j/kotlin/Suppliers.kt| 16 
 pom.xml | 13 +
 2 files changed, 29 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/2a2a773d/pom.xml
--

[2/8] logging-log4j-kotlin git commit: Added Kotlin API documentation

2018-04-03 Thread mattsicker 
Added Kotlin API documentation

These API docs are heavily based on the Scala API docs.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/commit/42458fd5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/tree/42458fd5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/diff/42458fd5

Branch: refs/heads/master
Commit: 42458fd54ff98a1d13ebba5db519278d6c1c083b
Parents: bb2e89d
Author: Raman Gupta 
Authored: Mon Apr 2 20:24:24 2018 -0400
Committer: Raman Gupta 
Committed: Mon Apr 2 20:45:22 2018 -0400

--
 src/main/asciidoc/build.adoc|  26 
 src/main/asciidoc/changes.adoc  |  27 
 src/main/asciidoc/contributing.adoc |  66 +++
 src/main/asciidoc/download.adoc |  69 
 src/main/asciidoc/index.adoc|  44 +
 src/main/asciidoc/usage.adoc| 107 +++
 6 files changed, 339 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/42458fd5/src/main/asciidoc/build.adoc
--
diff --git a/src/main/asciidoc/build.adoc b/src/main/asciidoc/build.adoc
new file mode 100644
index 000..cf7eca5
--- /dev/null
+++ b/src/main/asciidoc/build.adoc
@@ -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.
+
+== Building From Source
+
+NOTE: The following information is for developers who wish to modify Log4j 
Kotlin 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.
+
+.Building
+[source,bash]
+
+mvn package
+

http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/42458fd5/src/main/asciidoc/changes.adoc
--
diff --git a/src/main/asciidoc/changes.adoc b/src/main/asciidoc/changes.adoc
new file mode 100644
index 000..3c5b19b
--- /dev/null
+++ b/src/main/asciidoc/changes.adoc
@@ -0,0 +1,27 @@
+
+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 1.0
+
+[vertical]
+New Features::
+[horizontal]
+LOG4J2-1705::: Initial release
+
+[vertical]
+Bug Fixes:: None.

http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/42458fd5/src/main/asciidoc/contributing.adoc
--
diff --git a/src/main/asciidoc/contributing.adoc 
b/src/main/asciidoc/contributing.adoc
new file mode 100644
index 000..4730d54
--- /dev/null
+++ b/src/main/asciidoc/contributing.adoc
@@ -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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software

[1/8] logging-log4j-kotlin git commit: Instantiation test for various types of receivers

2018-04-03 Thread mattsicker 
Repository: logging-log4j-kotlin
Updated Branches:
  refs/heads/master b0282a9a4 -> bdd72d3b2


Instantiation test for various types of receivers


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/commit/bb2e89d6
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/tree/bb2e89d6
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/diff/bb2e89d6

Branch: refs/heads/master
Commit: bb2e89d658a68ce39294215f5eb3453080e8
Parents: cd789c4
Author: Raman Gupta 
Authored: Mon Apr 2 20:24:11 2018 -0400
Committer: Raman Gupta 
Committed: Mon Apr 2 20:24:11 2018 -0400

--
 .../LoggerReceiversTest.kt  | 53 
 1 file changed, 53 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/bb2e89d6/log4j-api-kotlin/src/test/kotlin/org.apache.logging.log4j.kotlin/LoggerReceiversTest.kt
--
diff --git 
a/log4j-api-kotlin/src/test/kotlin/org.apache.logging.log4j.kotlin/LoggerReceiversTest.kt
 
b/log4j-api-kotlin/src/test/kotlin/org.apache.logging.log4j.kotlin/LoggerReceiversTest.kt
new file mode 100644
index 000..41ebd33
--- /dev/null
+++ 
b/log4j-api-kotlin/src/test/kotlin/org.apache.logging.log4j.kotlin/LoggerReceiversTest.kt
@@ -0,0 +1,53 @@
+/*
+ * 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.kotlin
+
+import org.apache.logging.log4j.Level
+import org.apache.logging.log4j.junit.LoggerContextRule
+import org.apache.logging.log4j.kotlin.support.withListAppender
+import org.junit.Rule
+import org.junit.Test
+import kotlin.test.assertEquals
+
+class LoggerReceiversTest {
+  @Rule @JvmField var init = LoggerContextRule("InfoLogger.xml")
+
+  @Test
+  fun `Logging from a function instantiation via class receiver logs the 
correct class name`() {
+runTest(LoggerTest.logger())
+  }
+
+  @Test
+  fun `Logging from a function instantiation via object receiver logs the 
correct class name`() {
+runTest(LoggerTest().logger())
+  }
+
+  private fun runTest(log: KotlinLogger) {
+val msg = "This is an error log."
+val msgs = withListAppender { _, _ ->
+  log.error(msg)
+}
+
+assertEquals(1, msgs.size.toLong())
+
+msgs.first().also {
+  assertEquals(Level.ERROR, it.level)
+  assertEquals(msg, it.message.format)
+  assertEquals(LoggerTest::class.qualifiedName, it.loggerName)
+}
+  }
+}

[8/8] logging-log4j-kotlin git commit: Merge commit 'refs/pull/1/head' of https://github.com/apache/logging-log4j-kotlin

2018-04-03 Thread mattsicker 
Merge commit 'refs/pull/1/head' of 
https://github.com/apache/logging-log4j-kotlin


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/commit/bdd72d3b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/tree/bdd72d3b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/diff/bdd72d3b

Branch: refs/heads/master
Commit: bdd72d3b275cb0664d79d96df62b5e9b0aea185d
Parents: b0282a9 2a2a773
Author: Matt Sicker 
Authored: Tue Apr 3 12:20:17 2018 -0500
Committer: Matt Sicker 
Committed: Tue Apr 3 12:20:17 2018 -0500

--
 .../apache/logging/log4j/kotlin/Suppliers.kt|  16 +++
 .../LoggerReceiversTest.kt  |  53 ++
 pom.xml |  30 ++
 src/main/asciidoc/build.adoc|  26 +
 src/main/asciidoc/changes.adoc  |  27 +
 src/main/asciidoc/contributing.adoc |  66 
 src/main/asciidoc/download.adoc |  69 
 src/main/asciidoc/index.adoc|  44 
 src/main/asciidoc/usage.adoc| 105 +++
 9 files changed, 436 insertions(+)
--

[5/8] logging-log4j-kotlin git commit: Add missing license header

2018-04-03 Thread mattsicker 
Add missing license header


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/commit/7a4c91a9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/tree/7a4c91a9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/diff/7a4c91a9

Branch: refs/heads/master
Commit: 7a4c91a958968a9b202110eac1676a52011c9e4e
Parents: cd789c4
Author: Raman Gupta 
Authored: Tue Apr 3 12:19:09 2018 -0400
Committer: Raman Gupta 
Committed: Tue Apr 3 12:19:09 2018 -0400

--
 .../org/apache/logging/log4j/kotlin/Suppliers.kt| 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/7a4c91a9/log4j-api-kotlin/src/main/kotlin/org/apache/logging/log4j/kotlin/Suppliers.kt
--
diff --git 
a/log4j-api-kotlin/src/main/kotlin/org/apache/logging/log4j/kotlin/Suppliers.kt 
b/log4j-api-kotlin/src/main/kotlin/org/apache/logging/log4j/kotlin/Suppliers.kt
index 57bbf55..b98e9db 100644
--- 
a/log4j-api-kotlin/src/main/kotlin/org/apache/logging/log4j/kotlin/Suppliers.kt
+++ 
b/log4j-api-kotlin/src/main/kotlin/org/apache/logging/log4j/kotlin/Suppliers.kt
@@ -1,3 +1,19 @@
+/*
+ * 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.kotlin
 
 import org.apache.logging.log4j.util.Supplier

logging-log4j-kotlin git commit: Add minimal travis config

2018-04-03 Thread mattsicker 
Repository: logging-log4j-kotlin
Updated Branches:
  refs/heads/master cd789c4ed -> b0282a9a4


Add minimal travis config


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/commit/b0282a9a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/tree/b0282a9a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/diff/b0282a9a

Branch: refs/heads/master
Commit: b0282a9a455b2190e6fbccdeef9323b88a74958c
Parents: cd789c4
Author: Matt Sicker 
Authored: Tue Apr 3 12:16:15 2018 -0500
Committer: Matt Sicker 
Committed: Tue Apr 3 12:16:15 2018 -0500

--
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/b0282a9a/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000..b179f30
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,3 @@
+language: java
+jdk:
+  - openjdk8