logging-log4j2 git commit: [LOG4J2-2313] Update LMAX Disruptor from 3.3.7 to 3.4.2.

2018-04-09 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 45517769e -> 1d7351203


[LOG4J2-2313] Update LMAX Disruptor from 3.3.7 to 3.4.2.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1d735120
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1d735120
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1d735120

Branch: refs/heads/master
Commit: 1d735120361e4ff9b0cab92723e777c511030667
Parents: 4551776
Author: Gary Gregory 
Authored: Mon Apr 9 20:08:59 2018 -0600
Committer: Gary Gregory 
Committed: Mon Apr 9 20:08:59 2018 -0600

--
 pom.xml | 2 +-
 src/changes/changes.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1d735120/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6f250bb..b0de474 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,7 +184,7 @@
 2.9.5
 3.2.18.RELEASE
 1.8.0
-3.4.1
+3.4.2
 1.2.11
 2.14.3
 3.6.3

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1d735120/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 83ea138..2c91f6b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -134,7 +134,7 @@
 Update Jackson from 2.9.4 to 2.9.5.
   
   
-Update LMAX Disruptor from 3.3.8 to 3.4.1.
+Update LMAX Disruptor from 3.3.8 to 3.4.2.

logging-log4j2 git commit: [LOG4J2-2313] Update LMAX Disruptor from 3.3.7 to 3.4.2.

2018-04-09 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/release-2.x 463041147 -> ae68a63ab


[LOG4J2-2313] Update LMAX Disruptor from 3.3.7 to 3.4.2.

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

Branch: refs/heads/release-2.x
Commit: ae68a63ab35c13d4c1461782e376bfad10e7ef4f
Parents: 4630411
Author: Gary Gregory 
Authored: Mon Apr 9 18:59:44 2018 -0600
Committer: Gary Gregory 
Committed: Mon Apr 9 18:59:44 2018 -0600

--
 pom.xml | 2 +-
 src/changes/changes.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ae68a63a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 27180ab..7c697dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,7 +184,7 @@
 2.9.5
 3.2.18.RELEASE
 1.7.0 
-3.4.1
+3.4.2
 1.2.10 
 2.14.3
 3.6.3

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ae68a63a/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index c4140c8..117d933 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -50,7 +50,7 @@
Update Jackson from 2.9.4 to 2.9.5.
   
   
-   Update LMAX Disruptor from 3.3.7 to 3.4.1.
+   Update LMAX Disruptor from 3.3.7 to 3.4.2.

logging-log4j2 git commit: [LOG4J2-2313] Update LMAX Disruptor from 3.3.7 to 3.4.1. I was getting some odd 'JVM has quit' error messages so I updated the Surefire/Failsafe Maven plugins from 2.20.1 to

2018-04-09 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 1ee85dcb6 -> 45517769e


[LOG4J2-2313] Update LMAX Disruptor from 3.3.7 to 3.4.1. I was getting
some odd 'JVM has quit' error messages so I updated the
Surefire/Failsafe Maven plugins from 2.20.1 to 2.21.0 and that seems to
fix it. The Histogram class from LMAX has been removed so I copied it
into our test code base, it is licensed under the Apache 2.0 license.

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

Branch: refs/heads/master
Commit: 45517769e19e57e1cf2c399e7884a59ff335e60c
Parents: 1ee85dc
Author: Gary Gregory 
Authored: Mon Apr 9 18:00:00 2018 -0600
Committer: Gary Gregory 
Committed: Mon Apr 9 18:00:00 2018 -0600

--
 .../core/async/perftest/AbstractRunQueue.java   |   2 -
 .../log4j/core/async/perftest/Histogram.java| 390 +++
 .../core/async/perftest/IPerfTestRunner.java|   2 -
 .../async/perftest/MultiThreadPerfTest.java |   2 -
 .../log4j/core/async/perftest/PerfTest.java |   2 -
 .../log4j/core/async/perftest/RunLog4j1.java|   2 -
 .../log4j/core/async/perftest/RunLog4j2.java|   1 -
 .../log4j/core/async/perftest/RunLogback.java   |   2 -
 pom.xml |   6 +-
 src/changes/changes.xml |   6 +
 10 files changed, 399 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/45517769/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java
index 82d6065..7ba9412 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java
@@ -21,8 +21,6 @@ import java.util.concurrent.BlockingQueue;
 
 import 
org.apache.logging.log4j.core.async.perftest.ResponseTimeTest.PrintingAsyncQueueFullPolicy;
 
-import com.lmax.disruptor.collections.Histogram;
-
 public abstract class AbstractRunQueue implements IPerfTestRunner {
 
 abstract BlockingQueue createQueue(int capacity);

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/45517769/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
new file mode 100644
index 000..bf0823b
--- /dev/null
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
@@ -0,0 +1,390 @@
+/*
+ * Copyright 2011 LMAX Ltd.
+ *
+ * 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.
+ */
+package org.apache.logging.log4j.core.async.perftest;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Arrays;
+
+/**
+ * Histogram for tracking the frequency of observations of values below 
interval upper bounds.
+ *
+ * This class is useful for recording timings across a large number of 
observations
+ * when high performance is required.
+ *
+ * The interval bounds are used to define the ranges of the histogram 
buckets. If provided bounds
+ * are [10,20,30,40,50] then there will be five buckets, accessible by index 
0-4. Any value
+ * 0-10 will fall into the first interval bar, values 11-20 will fall into the
+ * second bar, and so on.
+ */
+@Deprecated
+public final class Histogram
+{
+// tracks the upper intervals of each of the buckets/bars
+private final long[] upperBounds;
+// tracks the count of the corresponding bucket
+private final long[] counts;
+// minimum value so far observed
+private long minValue = Long.MAX_VALUE;
+// maximum value

logging-log4j2 git commit: [LOG4J2-2313] Update LMAX Disruptor from 3.3.7 to 3.4.1. I was getting some odd 'JVM has quit' error messages so I updated the Surefire/Failsafe Maven plugins from 2.20.1 to

2018-04-09 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/release-2.x 4b784946c -> 463041147


[LOG4J2-2313] Update LMAX Disruptor from 3.3.7 to 3.4.1. I was getting
some odd 'JVM has quit' error messages so I updated the
Surefire/Failsafe Maven plugins from 2.20.1 to 2.21.0 and that seems to
fix it. The Histogram class from LMAX has been removed so I copied it
into our test code base, it is licensed under the Apache 2.0 license.

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

Branch: refs/heads/release-2.x
Commit: 4630411471e35a4f2f87087bd1c78a5809cbd792
Parents: 4b78494
Author: Gary Gregory 
Authored: Mon Apr 9 17:06:28 2018 -0600
Committer: Gary Gregory 
Committed: Mon Apr 9 17:06:28 2018 -0600

--
 .../core/async/perftest/AbstractRunQueue.java   |   2 -
 .../log4j/core/async/perftest/Histogram.java| 390 +++
 .../core/async/perftest/IPerfTestRunner.java|   2 -
 .../async/perftest/MultiThreadPerfTest.java |   2 -
 .../log4j/core/async/perftest/PerfTest.java |   2 -
 .../log4j/core/async/perftest/RunLog4j1.java|   2 -
 .../log4j/core/async/perftest/RunLog4j2.java|   1 -
 .../log4j/core/async/perftest/RunLogback.java   |   2 -
 pom.xml |   6 +-
 src/changes/changes.xml |   3 +
 10 files changed, 396 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/46304114/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java
index 82d6065..7ba9412 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java
@@ -21,8 +21,6 @@ import java.util.concurrent.BlockingQueue;
 
 import 
org.apache.logging.log4j.core.async.perftest.ResponseTimeTest.PrintingAsyncQueueFullPolicy;
 
-import com.lmax.disruptor.collections.Histogram;
-
 public abstract class AbstractRunQueue implements IPerfTestRunner {
 
 abstract BlockingQueue createQueue(int capacity);

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/46304114/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
new file mode 100644
index 000..bf0823b
--- /dev/null
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/Histogram.java
@@ -0,0 +1,390 @@
+/*
+ * Copyright 2011 LMAX Ltd.
+ *
+ * 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.
+ */
+package org.apache.logging.log4j.core.async.perftest;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Arrays;
+
+/**
+ * Histogram for tracking the frequency of observations of values below 
interval upper bounds.
+ *
+ * This class is useful for recording timings across a large number of 
observations
+ * when high performance is required.
+ *
+ * The interval bounds are used to define the ranges of the histogram 
buckets. If provided bounds
+ * are [10,20,30,40,50] then there will be five buckets, accessible by index 
0-4. Any value
+ * 0-10 will fall into the first interval bar, values 11-20 will fall into the
+ * second bar, and so on.
+ */
+@Deprecated
+public final class Histogram
+{
+// tracks the upper intervals of each of the buckets/bars
+private final long[] upperBounds;
+// tracks the count of the corresponding bucket
+private final long[] counts;
+// minimum value so far observed
+private long minValue = Long.MAX_VALUE;
+//

[logging-log4j-scala] Git Push Summary

2018-04-09 Thread mattsicker 
Repository: logging-log4j-scala
Updated Tags:  refs/tags/v11.1-rc1 [created] 085f1dcc8

svn commit: r26240 - /dev/logging/log4j/scala/

2018-04-09 Thread mattsicker 
Author: mattsicker
Date: Mon Apr  9 19:16:54 2018
New Revision: 26240

Log:
Add Log4j Scala API 11.1-rc1

Added:
dev/logging/log4j/scala/apache-log4j-api-scala-11.1-bin.tar.gz   (with 
props)
dev/logging/log4j/scala/apache-log4j-api-scala-11.1-bin.tar.gz.asc
dev/logging/log4j/scala/apache-log4j-api-scala-11.1-bin.zip   (with props)
dev/logging/log4j/scala/apache-log4j-api-scala-11.1-bin.zip.asc
dev/logging/log4j/scala/apache-log4j-api-scala-11.1-src.tar.gz   (with 
props)
dev/logging/log4j/scala/apache-log4j-api-scala-11.1-src.tar.gz.asc
dev/logging/log4j/scala/apache-log4j-api-scala-11.1-src.zip   (with props)
dev/logging/log4j/scala/apache-log4j-api-scala-11.1-src.zip.asc

Added: dev/logging/log4j/scala/apache-log4j-api-scala-11.1-bin.tar.gz
==
Binary file - no diff available.

Propchange: dev/logging/log4j/scala/apache-log4j-api-scala-11.1-bin.tar.gz
--
svn:mime-type = application/octet-stream

Added: dev/logging/log4j/scala/apache-log4j-api-scala-11.1-bin.tar.gz.asc
==
--- dev/logging/log4j/scala/apache-log4j-api-scala-11.1-bin.tar.gz.asc (added)
+++ dev/logging/log4j/scala/apache-log4j-api-scala-11.1-bin.tar.gz.asc Mon Apr  
9 19:16:54 2018
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEnQpWqqDWDgwMfczAtMcIk7Yrq+gFAlrLu+cACgkQtMcIk7Yr
+q+iGDQ//egZmWomLd5S8cSJ+yXyTwawvRz1eayGD+kvkCGjcOoFZnwTcpLwy8D/i
+FvlqrXv5sLpaPgHsgHSVKY6Tv1IDLsaTh+W65nzgL2rdgoipJcftbZk4KML0if1u
+nuLGZhDxLo/8tZQeNRXW46pZOFoAERz54ysbJUqq/oTMKnnckpbWsZvfqzYJhNTT
++VlsK6kRzDXVf2aO9yjUnEkRx+speJ1vgusJNDjXtrXKWBSuPUTfLIViz4+mS5fd
+YG9Ok989dDWTMDQ+A2UU5QuYmPy9n14YnqayAvsUxGP2Z3zYehaukIVnvXFEC3m+
+EDYtw+FQk1yFAti6RaZLNAnjrt8VOAOvlw93OWLkky+gN0upIXlfSUDsNeMRXCPn
+90COgSuajEE8MrKp2czAz0rJmmYiUeVSlCBPnTf36g5pdrHg8VWlI4AR0Y0dOAf4
+ggnf5XWnezGZ6rz0T993UKqnZndduODcfSRGmLXieE/yrtVar7VHm1IaacbnR1aw
+O7BrMDlxU1A1081+eLiZOTZvBE1cIK0k+d5IlLOeLlUF75PCoQpCF4f8/v0R0WLd
+vGuoRsJR4lOaRffxn3qA2dvBCqUqF6hBiScJz0GfizO5EQ0UQvjSArIf1m6+v3jQ
+Bmkl/c2Mr6W5nBqjylGEhQ7AHQ2jeSevEpyPEVI9Dk36NXpE4Z0=
+=NWJs
+-END PGP SIGNATURE-

Added: dev/logging/log4j/scala/apache-log4j-api-scala-11.1-bin.zip
==
Binary file - no diff available.

Propchange: dev/logging/log4j/scala/apache-log4j-api-scala-11.1-bin.zip
--
svn:mime-type = application/octet-stream

Added: dev/logging/log4j/scala/apache-log4j-api-scala-11.1-bin.zip.asc
==
--- dev/logging/log4j/scala/apache-log4j-api-scala-11.1-bin.zip.asc (added)
+++ dev/logging/log4j/scala/apache-log4j-api-scala-11.1-bin.zip.asc Mon Apr  9 
19:16:54 2018
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEnQpWqqDWDgwMfczAtMcIk7Yrq+gFAlrLu+cACgkQtMcIk7Yr
+q+jgow/+I9ioWnFbigKxrtzakuXUc2fpje/l3D5BSbV7U14taRRBjoHMuAotRBv7
+fz7xntb5eexTyBnT+JuKYxvg999yTQ6yo2m2mqv0uep47w/9x4NbXrADLFW5EIzl
+5V2Rmn9+H2IOZLQOq562U4pDoWOrDZWkDjt921cSorv7aXANuheDgH49gMDZD0PE
+sLaj/jFjE9kTIPf5rOwECoX2c6f24p3L9LUjwrdX5TGrE0eMVWva/GoZJQoEDdH9
+7rrAjcwpk05Bnr0AvkpU/oYDlROPTRQH4cAjZ/RlRHQUPxgQsG1TGzKMTUsYexzW
+B2tE0AsUnTWFurMNcyQ/SVG4tnZkR8MbO2xmnPr23hYbZxfvQbSZLvyy+VN1lqH2
+MEK5DVRHXnrAfAoYwFVUzssoUWySjiWG19vNUN6ieKSkd5BYS6S5uPYr0kra031b
+wQ476hE7Gzk9mRDO4tkGocSPbjDCr/Sj8ySz2+2og01qu3fz8t0NGy9QROSG5klI
+7CttVFRk5MJM6b/tRO+Soez5BFEtgiorupG/wXqS+jp5XbIlZo24bV0OhyIP9QmN
+tDMDVowsTlEpvEfxqLtU1NCmMNgfXljQJLe+LTe6HO2nKl9prjIg4/tQbXtxHWni
+U9NY62gULsY4yDDYihrDoWyVYCHlC5z0pRUWdaIgJuMdx55ZqPM=
+=PHdv
+-END PGP SIGNATURE-

Added: dev/logging/log4j/scala/apache-log4j-api-scala-11.1-src.tar.gz
==
Binary file - no diff available.

Propchange: dev/logging/log4j/scala/apache-log4j-api-scala-11.1-src.tar.gz
--
svn:mime-type = application/octet-stream

Added: dev/logging/log4j/scala/apache-log4j-api-scala-11.1-src.tar.gz.asc
==
--- dev/logging/log4j/scala/apache-log4j-api-scala-11.1-src.tar.gz.asc (added)
+++ dev/logging/log4j/scala/apache-log4j-api-scala-11.1-src.tar.gz.asc Mon Apr  
9 19:16:54 2018
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEnQpWqqDWDgwMfczAtMcIk7Yrq+gFAlrLueQACgkQtMcIk7Yr
+q+j1eRAAi/ojSp/4jIUkH5x584gzYhiugJsK61kt3GLxnnu1YDV2fezFY04CBU1M
+7Hu/4iIHoVMbaDKTTqV5NdgYBcDhsGTjUtVttycUc9BPjZjx/LlHoLbCEKP9ujyh
+esI6iLIuqBI8i+ZMcacTYTv2ZutOHG+JPc4Zv6TBl/vYzOzYf7/gyMRPXH99PHH0
+p2Wg1eYtSNf9YqOrEaQD5JI6fOmnPSm3oL3GSanSfDSJ3KiWiU4YG/wEDVUbum1G

logging-log4j-scala git commit: Fix tag lookup

2018-04-09 Thread mattsicker 
Repository: logging-log4j-scala
Updated Branches:
  refs/heads/master dc389ab2a -> 49ecc5911


Fix tag lookup


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

Branch: refs/heads/master
Commit: 49ecc5911e4c434b1f1884b92e4b8b0eea42ce59
Parents: dc389ab
Author: Matt Sicker 
Authored: Mon Apr 9 14:12:58 2018 -0500
Committer: Matt Sicker 
Committed: Mon Apr 9 14:12:58 2018 -0500

--
 create-distributions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/49ecc591/create-distributions.sh
--
diff --git a/create-distributions.sh b/create-distributions.sh
index 9750ea6..ddf6dd9 100755
--- a/create-distributions.sh
+++ b/create-distributions.sh
@@ -22,7 +22,7 @@ function sign_file() {
 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}
+  git archive --prefix=apache-log4j-api-scala-${release_version}-src/ -o 
target/apache-log4j-api-scala-${release_version}-src.${out_format} 
v${release_version}
   sign_file target/apache-log4j-api-scala-${release_version}-src.${out_format}
 }

svn commit: r26239 - /dev/logging/log4j/scala/

2018-04-09 Thread mattsicker 
Author: mattsicker
Date: Mon Apr  9 19:09:09 2018
New Revision: 26239

Log:
Make scala directory

Added:
dev/logging/log4j/scala/

[2/2] logging-log4j-scala git commit: Setting version to 11.2-SNAPSHOT

2018-04-09 Thread mattsicker 
Setting version to 11.2-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/dc389ab2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/dc389ab2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/dc389ab2

Branch: refs/heads/master
Commit: dc389ab2adef8ea52684b7c3d0d049a6ba63e22f
Parents: 085f1dc
Author: Matt Sicker 
Authored: Mon Apr 9 13:51:02 2018 -0500
Committer: Matt Sicker 
Committed: Mon Apr 9 13:51:02 2018 -0500

--
 version.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/dc389ab2/version.sbt
--
diff --git a/version.sbt b/version.sbt
index 8543b23..020118b 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "11.1"
+version in ThisBuild := "11.2-SNAPSHOT"

[logging-log4j-scala] Git Push Summary

2018-04-09 Thread mattsicker 
Repository: logging-log4j-scala
Updated Tags:  refs/tags/v11.1 [created] 87d6ef5cf

[1/2] logging-log4j-scala git commit: Setting version to 11.1

2018-04-09 Thread mattsicker 
Repository: logging-log4j-scala
Updated Branches:
  refs/heads/master 71b5c0673 -> dc389ab2a


Setting version to 11.1


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

Branch: refs/heads/master
Commit: 085f1dcc88525469c0e209840e90b697219d78e0
Parents: 71b5c06
Author: Matt Sicker 
Authored: Mon Apr 9 13:49:51 2018 -0500
Committer: Matt Sicker 
Committed: Mon Apr 9 13:49:51 2018 -0500

--
 version.sbt | 18 +-
 1 file changed, 1 insertion(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/085f1dcc/version.sbt
--
diff --git a/version.sbt b/version.sbt
index e0f281a..8543b23 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1,17 +1 @@
-/*
- * 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.
- */
-version in ThisBuild := "11.1-SNAPSHOT"
+version in ThisBuild := "11.1"

logging-log4j-scala git commit: Disable commit signing

2018-04-09 Thread mattsicker 
Repository: logging-log4j-scala
Updated Branches:
  refs/heads/master caf4a2a2f -> 71b5c0673


Disable commit signing


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

Branch: refs/heads/master
Commit: 71b5c0673d4a574fe76700d8009f3e344a745962
Parents: caf4a2a
Author: Matt Sicker 
Authored: Mon Apr 9 13:32:34 2018 -0500
Committer: Matt Sicker 
Committed: Mon Apr 9 13:32:34 2018 -0500

--
 build.sbt | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/71b5c067/build.sbt
--
diff --git a/build.sbt b/build.sbt
index 47952f6..4e803e9 100644
--- a/build.sbt
+++ b/build.sbt
@@ -92,7 +92,6 @@ lazy val sourceSettings = Seq(
 lazy val releaseSettings = Seq(
   releaseCrossBuild := true,
   releasePublishArtifactsAction := PgpKeys.publishSigned.value,
-  releaseVcsSign := true,
   releaseProcess := {
 import ReleaseTransformations._
 Seq(

logging-log4j-scala git commit: Fix incorrect scope of audit check

2018-04-09 Thread mattsicker 
Repository: logging-log4j-scala
Updated Branches:
  refs/heads/master ed7190b57 -> caf4a2a2f


Fix incorrect scope of audit check


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

Branch: refs/heads/master
Commit: caf4a2a2f76fb796831e1f9a1f3550514783424f
Parents: ed7190b
Author: Matt Sicker 
Authored: Mon Apr 9 13:29:38 2018 -0500
Committer: Matt Sicker 
Committed: Mon Apr 9 13:29:38 2018 -0500

--
 build.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/caf4a2a2/build.sbt
--
diff --git a/build.sbt b/build.sbt
index fe8d95a..47952f6 100644
--- a/build.sbt
+++ b/build.sbt
@@ -99,7 +99,7 @@ lazy val releaseSettings = Seq(
   checkSnapshotDependencies,
   inquireVersions,
   runClean,
-  releaseStepTask(auditCheck),
+  releaseStepTask(auditCheck in Compile),
   runTest,
   setReleaseVersion,
   commitReleaseVersion,

[1/3] logging-log4j2 git commit: adding log4j2.forceTCLOnly option

2018-04-09 Thread mattsicker 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master ffd4ab638 -> 1ee85dcb6


adding log4j2.forceTCLOnly option


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

Branch: refs/heads/master
Commit: fbde9cd0efb8b50098724e668b0474116761cd81
Parents: ffd4ab6
Author: Romain Manni-Bucau 
Authored: Tue Jan 9 11:59:52 2018 +0100
Committer: Romain Manni-Bucau 
Committed: Mon Apr 9 12:01:39 2018 +0200

--
 .../apache/logging/log4j/util/LoaderUtil.java   | 50 -
 .../logging/log4j/util/LoaderUtilTest.java  | 58 
 2 files changed, 93 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fbde9cd0/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
--
diff --git 
a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java 
b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
index 2a153b1..84ce69f 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
@@ -44,6 +44,7 @@ public final class LoaderUtil {
  * @since 2.1
  */
 public static final String IGNORE_TCCL_PROPERTY = "log4j.ignoreTCL";
+public static final String FORCE_TCL_ONLY_PROPERTY = "log4j.forceTCLOnly";
 
 private static final SecurityManager SECURITY_MANAGER = 
System.getSecurityManager();
 
@@ -53,6 +54,8 @@ public final class LoaderUtil {
 
 private static final boolean GET_CLASS_LOADER_DISABLED;
 
+protected static Boolean forceTcclOnly;
+
 private static final PrivilegedAction TCCL_GETTER = new 
ThreadContextClassLoaderGetter();
 
 static {
@@ -109,21 +112,23 @@ public final class LoaderUtil {
 List classLoaders = new ArrayList<>();
 ClassLoader tcl = getThreadContextClassLoader();
 classLoaders.add(tcl);
-ClassLoader current = LoaderUtil.class.getClassLoader();
-if (current != tcl) {
-classLoaders.add(current);
-ClassLoader parent = current.getParent();
+if (!isForceTccl()) {
+ClassLoader current = LoaderUtil.class.getClassLoader();
+if (current != tcl) {
+classLoaders.add(current);
+ClassLoader parent = current.getParent();
+while (parent != null && !classLoaders.contains(parent)) {
+classLoaders.add(parent);
+}
+}
+ClassLoader parent = tcl.getParent();
 while (parent != null && !classLoaders.contains(parent)) {
 classLoaders.add(parent);
+parent = parent.getParent();
+}
+if (!classLoaders.contains(ClassLoader.getSystemClassLoader())) {
+classLoaders.add(ClassLoader.getSystemClassLoader());
 }
-}
-ClassLoader parent = tcl.getParent();
-while (parent != null && !classLoaders.contains(parent)) {
-classLoaders.add(parent);
-parent = parent.getParent();
-}
-if (!classLoaders.contains(ClassLoader.getSystemClassLoader())) {
-classLoaders.add(ClassLoader.getSystemClassLoader());
 }
 return classLoaders.toArray(new ClassLoader[classLoaders.size()]);
 }
@@ -260,6 +265,21 @@ public final class LoaderUtil {
 return ignoreTCCL;
 }
 
+private static boolean isForceTccl() {
+if (forceTcclOnly == null) {
+// PropertiesUtil.getProperties() uses that code path so don't use 
that!
+forceTcclOnly = System.getSecurityManager() == null ?
+Boolean.getBoolean(FORCE_TCL_ONLY_PROPERTY) :
+AccessController.doPrivileged(new 
PrivilegedAction() {
+@Override
+public Boolean run() {
+return Boolean.getBoolean(FORCE_TCL_ONLY_PROPERTY);
+}
+});
+}
+return forceTcclOnly;
+}
+
 /**
  * Finds classpath {@linkplain URL resources}.
  *
@@ -279,9 +299,9 @@ public final class LoaderUtil {
 static Collection findUrlResources(final String resource) {
 // @formatter:off
 final ClassLoader[] candidates = {
-getThreadContextClassLoader(), 
-LoaderUtil.class.getClassLoader(),
-GET_CLASS_LOADER_DISABLED ? null :

[2/3] logging-log4j2 git commit: fixing tests after rebase + adding jira in changes.xml

2018-04-09 Thread mattsicker 
fixing tests after rebase + adding jira in changes.xml


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/28c6ec24
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/28c6ec24
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/28c6ec24

Branch: refs/heads/master
Commit: 28c6ec246f084cea9d58e918c888ef82fc57eb57
Parents: fbde9cd
Author: Romain Manni-Bucau 
Authored: Mon Apr 9 13:53:44 2018 +0200
Committer: Romain Manni-Bucau 
Committed: Mon Apr 9 13:53:44 2018 +0200

--
 .../main/java/org/apache/logging/log4j/util/LoaderUtil.java| 6 +-
 src/changes/changes.xml| 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/28c6ec24/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
--
diff --git 
a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java 
b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
index 84ce69f..3923c7c 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
@@ -268,7 +268,8 @@ public final class LoaderUtil {
 private static boolean isForceTccl() {
 if (forceTcclOnly == null) {
 // PropertiesUtil.getProperties() uses that code path so don't use 
that!
-forceTcclOnly = System.getSecurityManager() == null ?
+try {
+forceTcclOnly = System.getSecurityManager() == null ?
 Boolean.getBoolean(FORCE_TCL_ONLY_PROPERTY) :
 AccessController.doPrivileged(new 
PrivilegedAction() {
 @Override
@@ -276,6 +277,9 @@ public final class LoaderUtil {
 return Boolean.getBoolean(FORCE_TCL_ONLY_PROPERTY);
 }
 });
+} catch (final SecurityException se) {
+forceTcclOnly = false;
+}
 }
 return forceTcclOnly;
 }

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/28c6ec24/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index ad7e632..9ebfc4a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,6 +31,9 @@
  - "remove" - Removed
 -->
 
+  
+Allow to force LOG4J2 to use TCCL only.
+  
   
 Convert documentation into AsciiDoc format.