You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2017/05/11 12:58:15 UTC
[01/21] logging-log4j2 git commit: Add missing accessors.
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-1442 7f9f60be1 -> bcb726449
Add missing accessors.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/34ea230f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/34ea230f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/34ea230f
Branch: refs/heads/LOG4J2-1442
Commit: 34ea230f2d2d7118f1b56cb81a8ea5317efb0992
Parents: 9ce722c
Author: Gary Gregory <gg...@apache.org>
Authored: Thu May 4 10:26:21 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Thu May 4 10:26:21 2017 -0700
----------------------------------------------------------------------
.../log4j/core/net/ssl/SslConfiguration.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/34ea230f/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
index c3f1b49..857aa5b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
@@ -275,4 +275,20 @@ public class SslConfiguration {
}
return true;
}
+
+ public KeyStoreConfiguration getKeyStoreConfig() {
+ return keyStoreConfig;
+ }
+
+ public TrustStoreConfiguration getTrustStoreConfig() {
+ return trustStoreConfig;
+ }
+
+ public SSLContext getSslContext() {
+ return sslContext;
+ }
+
+ public String getProtocol() {
+ return protocol;
+ }
}
[15/21] logging-log4j2 git commit: Update tests from Logback 1.2.2 to
1.2.3.
Posted by mi...@apache.org.
Update tests from Logback 1.2.2 to 1.2.3.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1da6ca3b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1da6ca3b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1da6ca3b
Branch: refs/heads/LOG4J2-1442
Commit: 1da6ca3b766fee684c61703ad7530058bbca23e1
Parents: 7891bc8
Author: Gary Gregory <gg...@apache.org>
Authored: Sun May 7 10:16:25 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun May 7 10:16:25 2017 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1da6ca3b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e9e7ef0..411a952 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,7 +177,7 @@
<Log4jReleaseKey>FA1C814D</Log4jReleaseKey>
<!-- note that any properties you want available in velocity templates must not use periods! -->
<slf4jVersion>1.7.24</slf4jVersion>
- <logbackVersion>1.2.2</logbackVersion>
+ <logbackVersion>1.2.3</logbackVersion>
<jackson1Version>1.9.13</jackson1Version>
<jackson2Version>2.8.7</jackson2Version>
<springVersion>3.2.18.RELEASE</springVersion>
[05/21] logging-log4j2 git commit: Better instructions for building.
Posted by mi...@apache.org.
Better instructions for building.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/afe9295b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/afe9295b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/afe9295b
Branch: refs/heads/LOG4J2-1442
Commit: afe9295b9fe2da98ce0a41fbf7d85890711d5f04
Parents: 272de26
Author: Gary Gregory <gg...@apache.org>
Authored: Thu May 4 22:35:26 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Thu May 4 22:35:26 2017 -0700
----------------------------------------------------------------------
src/site/markdown/build.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/afe9295b/src/site/markdown/build.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/build.md b/src/site/markdown/build.md
index 2a4b29d..a4ccc7a 100644
--- a/src/site/markdown/build.md
+++ b/src/site/markdown/build.md
@@ -39,7 +39,8 @@ following when invoking Maven.
[Windows] -t ./toolchains-sample-win.xml
```
-To build and install Log4j in your local Maven cache, from the root directory run: `mvn install`
+To build and install Log4j in your local Maven cache, from the parent project directory, and
+using Java 7 or 8, run: `mvn install`
Note that if your `/etc/hosts` file does not include an entry for your computer's hostname, then
many unit tests may execute slowly due to DNS lookups to translate your hostname to an IP address in
[13/21] logging-log4j2 git commit: Update Maven Surfire and Failsafe
plugins from 2.19.1 to 2.20.
Posted by mi...@apache.org.
Update Maven Surfire and Failsafe plugins from 2.19.1 to 2.20.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a5fa4bd7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a5fa4bd7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a5fa4bd7
Branch: refs/heads/LOG4J2-1442
Commit: a5fa4bd7b9884a832473793229517625e0b44b8c
Parents: dee4777
Author: Gary Gregory <gg...@apache.org>
Authored: Sun May 7 09:47:40 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun May 7 09:47:40 2017 -0700
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a5fa4bd7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e75adbf..e9e7ef0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -191,8 +191,8 @@
<javadoc.plugin.version>2.10.4</javadoc.plugin.version>
<!-- surefire.plugin.version 2.18 yields http://jira.codehaus.org/browse/SUREFIRE-1121, which is fixed in 2.18.1 -->
<!-- surefire.plugin.version 2.19 yields https://issues.apache.org/jira/browse/SUREFIRE-1193. -->
- <surefire.plugin.version>2.19.1</surefire.plugin.version>
- <failsafe.plugin.version>2.19.1</failsafe.plugin.version>
+ <surefire.plugin.version>2.20</surefire.plugin.version>
+ <failsafe.plugin.version>2.20</failsafe.plugin.version>
<checkstyle.plugin.version>2.17</checkstyle.plugin.version>
<rat.plugin.version>0.12</rat.plugin.version>
<pdf.plugin.version>1.2</pdf.plugin.version>
[07/21] logging-log4j2 git commit: Remove duplicate Timer class
Posted by mi...@apache.org.
Remove duplicate Timer class
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/26332912
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/26332912
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/26332912
Branch: refs/heads/LOG4J2-1442
Commit: 26332912ad655670265a85577c22a5e7f1369bb3
Parents: 1b9bcd1
Author: Mikael Ståldal <mi...@magine.com>
Authored: Fri May 5 10:34:31 2017 +0200
Committer: Mikael Ståldal <mi...@magine.com>
Committed: Fri May 5 10:34:31 2017 +0200
----------------------------------------------------------------------
.../logging/log4j/core/SimplePerfTest.java | 2 +-
.../logging/log4j/core/ThreadedPerfTest.java | 2 +-
.../apache/logging/log4j/core/util/Timer.java | 273 -------------------
3 files changed, 2 insertions(+), 275 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/26332912/log4j-core-its/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java
----------------------------------------------------------------------
diff --git a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java
index e4ae209..4256f85 100644
--- a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java
+++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.categories.PerformanceTests;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.DefaultConfiguration;
-import org.apache.logging.log4j.core.util.Timer;
+import org.apache.logging.log4j.Timer;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/26332912/log4j-core-its/src/test/java/org/apache/logging/log4j/core/ThreadedPerfTest.java
----------------------------------------------------------------------
diff --git a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/ThreadedPerfTest.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/ThreadedPerfTest.java
index 781ae8a..6717913 100644
--- a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/ThreadedPerfTest.java
+++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/ThreadedPerfTest.java
@@ -22,7 +22,7 @@ import java.util.concurrent.Executors;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.categories.PerformanceTests;
-import org.apache.logging.log4j.core.util.Timer;
+import org.apache.logging.log4j.Timer;
import org.junit.Test;
import org.junit.experimental.categories.Category;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/26332912/log4j-core/src/test/java/org/apache/logging/log4j/core/util/Timer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/util/Timer.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/util/Timer.java
deleted file mode 100644
index 829c5d1..0000000
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/util/Timer.java
+++ /dev/null
@@ -1,273 +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.core.util;
-
-import java.io.Serializable;
-import java.text.DecimalFormat;
-
-import org.apache.logging.log4j.util.Strings;
-
-/**
- *
- */
-public class Timer implements Serializable
-{
- /**
- * Generated serial version ID.
- */
- private static final long serialVersionUID = 1313460139390794926L;
- private final String m_name; // The timer's name
- private String m_status; // The timer's status
- private long m_startTime; // The start time
- private long m_elapsedTime; // The elapsed time
- private final int m_iterations;
- private static long NANO_PER_SECOND = 1000000000L;
- private static long NANO_PER_MINUTE = NANO_PER_SECOND * 60;
- private static long NANO_PER_HOUR = NANO_PER_MINUTE * 60;
-
-
- /**
- * Constructor.
- * @param name the timer name.
- */
- public Timer(final String name)
- {
- this(name, 0);
- }
-
- /**
- * Constructor.
- *
- * @param name the timer name.
- */
- public Timer(final String name, final int iterations)
- {
- m_name = name;
- m_startTime = 0;
- m_status = "Stopped";
- m_iterations = (iterations > 0) ? iterations : 0;
- }
-
- /**
- * Start the timer.
- */
- public void start()
- {
- m_startTime = System.nanoTime();
- m_elapsedTime = 0;
- m_status = "Start";
- }
-
- /**
- * Stop the timer.
- */
- public void stop()
- {
- m_elapsedTime += System.nanoTime() - m_startTime;
- m_startTime = 0;
- m_status = "Stop";
- }
-
- /**
- * Pause the timer.
- */
- public void pause()
- {
- m_elapsedTime += System.nanoTime() - m_startTime;
- m_startTime = 0;
- m_status = "Pause";
- }
-
- /**
- * Resume the timer.
- */
- public void resume()
- {
- m_startTime = System.nanoTime();
- m_status = "Resume";
- }
-
- /**
- * Accessor for the name.
- * @return the timer's name.
- */
- public String getName()
- {
- return m_name;
- }
-
- /**
- * Access the elapsed time.
- *
- * @return the elapsed time.
- */
- public long getElapsedTime()
- {
- return m_elapsedTime / 1000000;
- }
-
- /**
- * Access the elapsed time.
- *
- * @return the elapsed time.
- */
- public long getElapsedNanoTime()
- {
- return m_elapsedTime;
- }
-
- /**
- * Returns the name of the last operation performed on this timer (Start, Stop, Pause or
- * Resume).
- * @return the string representing the last operation performed.
- */
- public String getStatus()
- {
- return m_status;
- }
-
- /**
- * Returns the String representation of the timer based upon its current state
- */
- @Override
- public String toString()
- {
- final StringBuilder result = new StringBuilder("Timer ").append(m_name);
- if (m_status.equals("Start"))
- {
- result.append(" started");
- }
- else if (m_status.equals("Pause"))
- {
- result.append(" paused");
- }
- else if (m_status.equals("Resume"))
- {
- result.append(" resumed");
- }
- else if (m_status.equals("Stop"))
- {
- long nanoseconds = m_elapsedTime;
- // Get elapsed hours
- long hours = nanoseconds / NANO_PER_HOUR;
- // Get remaining nanoseconds
- nanoseconds = nanoseconds % NANO_PER_HOUR;
- // Get minutes
- long minutes = nanoseconds / NANO_PER_MINUTE;
- // Get remaining nanoseconds
- nanoseconds = nanoseconds % NANO_PER_MINUTE;
- // Get seconds
- long seconds = nanoseconds / NANO_PER_SECOND;
- // Get remaining nanoseconds
- nanoseconds = nanoseconds % NANO_PER_SECOND;
-
- String elapsed = Strings.EMPTY;
-
- if (hours > 0)
- {
- elapsed += hours + " hours ";
- }
- if (minutes > 0 || hours > 0)
- {
- elapsed += minutes + " minutes ";
- }
-
- DecimalFormat numFormat = null;
- numFormat = new DecimalFormat("#0");
- elapsed += numFormat.format(seconds) + '.';
- numFormat = new DecimalFormat("000000000");
- elapsed += numFormat.format(nanoseconds) + " seconds";
- result.append(" stopped. Elapsed time: ").append(elapsed);
- if (m_iterations > 0)
- {
- nanoseconds = m_elapsedTime / m_iterations;
- // Get elapsed hours
- hours = nanoseconds / NANO_PER_HOUR;
- // Get remaining nanoseconds
- nanoseconds = nanoseconds % NANO_PER_HOUR;
- // Get minutes
- minutes = nanoseconds / NANO_PER_MINUTE;
- // Get remaining nanoseconds
- nanoseconds = nanoseconds % NANO_PER_MINUTE;
- // Get seconds
- seconds = nanoseconds / NANO_PER_SECOND;
- // Get remaining nanoseconds
- nanoseconds = nanoseconds % NANO_PER_SECOND;
-
- elapsed = Strings.EMPTY;
-
- if (hours > 0)
- {
- elapsed += hours + " hours ";
- }
- if (minutes > 0 || hours > 0)
- {
- elapsed += minutes + " minutes ";
- }
-
- numFormat = new DecimalFormat("#0");
- elapsed += numFormat.format(seconds) + '.';
- numFormat = new DecimalFormat("000000000");
- elapsed += numFormat.format(nanoseconds) + " seconds";
- result.append(" Average per iteration: ").append(elapsed);
- }
- }
- else
- {
- result.append(' ').append(m_status);
- }
- return result.toString();
- }
-
- @Override
- public boolean equals(final Object o) {
- if (this == o) {
- return true;
- }
- if (!(o instanceof Timer)) {
- return false;
- }
-
- final Timer timer = (Timer) o;
-
- if (m_elapsedTime != timer.m_elapsedTime) {
- return false;
- }
- if (m_startTime != timer.m_startTime) {
- return false;
- }
- if (m_name != null ? !m_name.equals(timer.m_name) : timer.m_name != null) {
- return false;
- }
- if (m_status != null ? !m_status.equals(timer.m_status) : timer.m_status != null) {
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result;
- result = (m_name != null ? m_name.hashCode() : 0);
- result = 29 * result + (m_status != null ? m_status.hashCode() : 0);
- result = 29 * result + (int) (m_startTime ^ (m_startTime >>> 32));
- result = 29 * result + (int) (m_elapsedTime ^ (m_elapsedTime >>> 32));
- return result;
- }
-
-}
[18/21] logging-log4j2 git commit: Fix typo
Posted by mi...@apache.org.
Fix typo
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2a1383a8
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2a1383a8
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2a1383a8
Branch: refs/heads/LOG4J2-1442
Commit: 2a1383a8e35a1c3d73d7ea31408a699c06bce8fb
Parents: 4b8ca68
Author: Mikael Ståldal <mi...@magine.com>
Authored: Mon May 8 15:57:56 2017 +0200
Committer: Mikael Ståldal <mi...@magine.com>
Committed: Mon May 8 15:57:56 2017 +0200
----------------------------------------------------------------------
BUILDING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2a1383a8/BUILDING.md
----------------------------------------------------------------------
diff --git a/BUILDING.md b/BUILDING.md
index 06497cd..9ad551e 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -21,7 +21,7 @@ version 9, and Apache Maven 3.x.
Log4j 2.x uses the Java 9 compiler in addition to
the Java version installed in the path. This is accomplished by using Maven's toolchains support.
-Log4j 2 provides sample toolchains XML filea in the root folder. This may be used by
+Log4j 2 provides sample toolchains XML files in the root folder. This may be used by
modifying it and installing the file as toolchains.xml in the .m2 folder or by using the
following when invoking Maven.
[14/21] logging-log4j2 git commit: Remove mention of [LOG4J2-1899]
per discussion in https://issues.apache.org/jira/browse/LOG4J2-1896 (Add
missing getters to classes in package org.apache.logging.log4j.core.net.ssl.
Already did this but worth noting in
Posted by mi...@apache.org.
Remove mention of [LOG4J2-1899] per discussion in
https://issues.apache.org/jira/browse/LOG4J2-1896
(Add missing getters to classes in package
org.apache.logging.log4j.core.net.ssl. Already did this but worth noting
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/7891bc82
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7891bc82
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7891bc82
Branch: refs/heads/LOG4J2-1442
Commit: 7891bc8280d0c89ebe3916404b85d49b63a11128
Parents: a5fa4bd
Author: Gary Gregory <gg...@apache.org>
Authored: Sun May 7 09:58:58 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun May 7 09:58:58 2017 -0700
----------------------------------------------------------------------
src/changes/changes.xml | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7891bc82/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 9023d60..8ef6901 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -76,9 +76,6 @@
<action issue="LOG4J2-1877" dev="ggregory" type="update" due-to="Chandra Tungathurthi">
Missing documentation for Max index limit in DefaultRolloverStrategy.
</action>
- <action issue="LOG4J2-1896" dev="ggregory" type="update">
- Update org.apache.logging.log4j.core.net.ssl.StoreConfiguration from a String to char[] to represent its password.
- </action>
<action issue="LOG4J2-1899" dev="ggregory" type="update">
Add missing getters to classes in package org.apache.logging.log4j.core.net.ssl.
</action>
[12/21] logging-log4j2 git commit: [LOG4J2-1900] Update JAnsi from
1.15 to 1.16.
Posted by mi...@apache.org.
[LOG4J2-1900] Update JAnsi from 1.15 to 1.16.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/dee4777f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/dee4777f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/dee4777f
Branch: refs/heads/LOG4J2-1442
Commit: dee4777f9d8f166f823571bcbe071f1624720310
Parents: 29d5f11
Author: Gary Gregory <gg...@apache.org>
Authored: Sat May 6 21:56:24 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sat May 6 21:56:24 2017 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
src/changes/changes.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/dee4777f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2ff0acd..e75adbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -393,7 +393,7 @@
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
- <version>1.15</version>
+ <version>1.16</version>
<optional>true</optional>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/dee4777f/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index d6f199a..9023d60 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -82,6 +82,9 @@
<action issue="LOG4J2-1899" dev="ggregory" type="update">
Add missing getters to classes in package org.apache.logging.log4j.core.net.ssl.
</action>
+ <action issue="LOG4J2-1900" dev="ggregory" type="update">
+ Update JAnsi from 1.15 to 1.16.
+ </action>
</release>
<release version="2.8.2" date="2017-04-02" description="GA Release 2.8.2">
<action issue="LOG4J2-1861" dev="mattsicker" type="fix">
[06/21] logging-log4j2 git commit: Sample toolchains.xml for Linux
Posted by mi...@apache.org.
Sample toolchains.xml for Linux
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1b9bcd19
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1b9bcd19
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1b9bcd19
Branch: refs/heads/LOG4J2-1442
Commit: 1b9bcd19e99eee344efb31420de679f6ffee229b
Parents: afe9295
Author: Mikael Ståldal <mi...@magine.com>
Authored: Fri May 5 10:26:44 2017 +0200
Committer: Mikael Ståldal <mi...@magine.com>
Committed: Fri May 5 10:28:50 2017 +0200
----------------------------------------------------------------------
BUILDING.md | 12 +++++++---
src/site/markdown/build.md | 3 ++-
toolchains-sample-linux.xml | 52 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 63 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1b9bcd19/BUILDING.md
----------------------------------------------------------------------
diff --git a/BUILDING.md b/BUILDING.md
index 305641c..06497cd 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -21,9 +21,15 @@ version 9, and Apache Maven 3.x.
Log4j 2.x uses the Java 9 compiler in addition to
the Java version installed in the path. This is accomplished by using Maven's toolchains support.
-Log4j 2 provides a sample toolchains XML file in the root folder. This may be used by
-modifying it and installing the file as toolchains.xml in the .m2 folder or by using
-`-t ./toolchains-sample.xml` when invoking Maven.
+Log4j 2 provides sample toolchains XML filea in the root folder. This may be used by
+modifying it and installing the file as toolchains.xml in the .m2 folder or by using the
+following when invoking Maven.
+
+```
+[Macintosh] -t ./toolchains-sample-mac.xml
+[Windows] -t ./toolchains-sample-win.xml
+[Linux] -t ./toolchains-sample-linux.xml
+```
To perform the license release audit, a.k.a. "RAT check", run.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1b9bcd19/src/site/markdown/build.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/build.md b/src/site/markdown/build.md
index a4ccc7a..43e5c35 100644
--- a/src/site/markdown/build.md
+++ b/src/site/markdown/build.md
@@ -29,7 +29,7 @@ most current source code can be found at
obtained by downloading it using the instructions at [Log4j Downloads](download.html).
Log4j 2.x uses Maven 3 as its build tool. Log4j 2.x uses the Java 9 compiler in addition to
-the Java version installed in the path. This is accomplished by usin Maven's toolchains support.
+the Java version installed in the path. This is accomplished by using Maven's toolchains support.
Log4j 2 provides sample toolchains XML files in the root folder. This may be used by
modifying it and installing the file as toolchains.xml in the .m2 folder or by using the
following when invoking Maven.
@@ -37,6 +37,7 @@ following when invoking Maven.
```
[Macintosh] -t ./toolchains-sample-mac.xml
[Windows] -t ./toolchains-sample-win.xml
+[Linux] -t ./toolchains-sample-linux.xml
```
To build and install Log4j in your local Maven cache, from the parent project directory, and
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1b9bcd19/toolchains-sample-linux.xml
----------------------------------------------------------------------
diff --git a/toolchains-sample-linux.xml b/toolchains-sample-linux.xml
new file mode 100644
index 0000000..ced6843
--- /dev/null
+++ b/toolchains-sample-linux.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF8"?>
+<!--
+ ~ 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.
+ -->
+<toolchains>
+ <!-- JDK toolchains -->
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>1.7</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/usr/lib/jvm/java-7-openjdk-amd64</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>1.8</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/usr/lib/jvm/java-8-openjdk-amd64</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>9</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/usr/lib/jvm/java-9-openjdk-amd64</jdkHome>
+ </configuration>
+ </toolchain>
+
+ <!-- other toolchains -->
+</toolchains>
[21/21] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-1442
Posted by mi...@apache.org.
Merge branch 'master' into LOG4J2-1442
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/bcb72644
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/bcb72644
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/bcb72644
Branch: refs/heads/LOG4J2-1442
Commit: bcb7264491b89a4cb9f672a276cc00ff48c484cd
Parents: 7f9f60b 68e43b8
Author: Mikael Ståldal <mi...@magine.com>
Authored: Wed May 10 14:12:34 2017 +0200
Committer: Mikael Ståldal <mi...@magine.com>
Committed: Wed May 10 14:12:34 2017 +0200
----------------------------------------------------------------------
.travis-toolchains.xml | 37 +++
.travis.yml | 20 +-
BUILDING.md | 12 +-
.../java/org/apache/logging/log4j/Timer.java | 25 +-
.../logging/log4j/core/SimplePerfTest.java | 2 +-
.../logging/log4j/core/ThreadedPerfTest.java | 2 +-
.../net/ssl/AbstractKeyStoreConfiguration.java | 4 +
.../core/net/ssl/KeyStoreConfiguration.java | 4 +
.../log4j/core/net/ssl/SslConfiguration.java | 16 ++
.../log4j/core/net/ssl/StoreConfiguration.java | 44 ++-
.../core/net/ssl/TrustStoreConfiguration.java | 4 +
.../logging/log4j/core/util/WatchManager.java | 6 +
.../apache/logging/log4j/core/util/Timer.java | 273 -------------------
pom.xml | 10 +-
src/changes/changes.xml | 9 +
src/site/markdown/build.md | 18 +-
src/site/site.xml | 7 +-
toolchains-sample-linux.xml | 52 ++++
toolchains-sample-mac.xml | 52 ++++
toolchains-sample-win.xml | 52 ++++
toolchains-sample.xml | 52 ----
21 files changed, 320 insertions(+), 381 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bcb72644/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bcb72644/src/changes/changes.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bcb72644/src/site/site.xml
----------------------------------------------------------------------
[11/21] logging-log4j2 git commit: [LOG4J2-1899] Add missing getters
to classes in package org.apache.logging.log4j.core.net.ssl. Already did this
but worth noting in changes.xml.
Posted by mi...@apache.org.
[LOG4J2-1899]
Add missing getters to classes in package
org.apache.logging.log4j.core.net.ssl. Already did this but worth noting
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/29d5f11a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/29d5f11a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/29d5f11a
Branch: refs/heads/LOG4J2-1442
Commit: 29d5f11ab81ab7a036194769b37c4bf2203fcd9c
Parents: fb33772
Author: Gary Gregory <gg...@apache.org>
Authored: Sat May 6 21:29:53 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sat May 6 21:29:53 2017 -0700
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/29d5f11a/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index c40d3bb..d6f199a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -79,6 +79,9 @@
<action issue="LOG4J2-1896" dev="ggregory" type="update">
Update org.apache.logging.log4j.core.net.ssl.StoreConfiguration from a String to char[] to represent its password.
</action>
+ <action issue="LOG4J2-1899" dev="ggregory" type="update">
+ Add missing getters to classes in package org.apache.logging.log4j.core.net.ssl.
+ </action>
</release>
<release version="2.8.2" date="2017-04-02" description="GA Release 2.8.2">
<action issue="LOG4J2-1861" dev="mattsicker" type="fix">
[16/21] logging-log4j2 git commit: Make Scala a sibling of Java in
the manual and site.
Posted by mi...@apache.org.
Make Scala a sibling of Java in the manual and site.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/08ee42f2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/08ee42f2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/08ee42f2
Branch: refs/heads/LOG4J2-1442
Commit: 08ee42f2e466e25c2acc7738de5a47dfc77017ae
Parents: 1da6ca3
Author: Gary Gregory <gg...@apache.org>
Authored: Sun May 7 10:42:33 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun May 7 10:42:33 2017 -0700
----------------------------------------------------------------------
src/site/site.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/08ee42f2/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index e380c82..981157a 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -36,8 +36,8 @@
<item name="Implementation" href="/log4j-core/apidocs/index.html" />
<item name="JSP Tag Library" href="/log4j-taglib/apidocs/index.html" />
<item name="JSP Tag Library (TLD Doc)" href="/log4j-taglib/tlddoc/index.html" />
- <item name="Scala API (Scaladoc)" href="/log4j-api-scala_2.11/scaladocs/index.html#org.apache.logging.log4j.scala.package" />
</item>
+ <item name="Scaladoc" href="/log4j-api-scala_2.11/scaladocs/index.html#org.apache.logging.log4j.scala.package" />
<item name="Maven, Ivy, Gradle Artifacts" href="/maven-artifacts.html"/>
<item name="Runtime Dependencies" href="/runtime-dependencies.html"/>
<item name="Changelog" href="/changelog.html"/>
@@ -68,14 +68,15 @@
<item name="Architecture" href="/manual/architecture.html"/>
<item name="Log4j 1.x Migration" href="manual/migration.html"/>
- <item name="API" href="/manual/api.html" collapse="true">
+ <item name="Java API" href="/manual/api.html" collapse="true">
<item name="Flow Tracing" href="manual/flowtracing.html"/>
<item name="Markers" href="manual/markers.html"/>
<item name="Event Logging" href="/manual/eventlogging.html"/>
<item name="Messages" href="/manual/messages.html"/>
<item name="ThreadContext" href="/manual/thread-context.html"/>
- <item name="Scala API" href="/manual/scala-api.html"/>
</item>
+
+ <item name="Scala API" href="/manual/scala-api.html"/>
<item name="Configuration" href="/manual/configuration.html" collapse="true">
<item name="Automatic Configuration" href="/manual/configuration.html#AutomaticConfiguration"/>
[19/21] logging-log4j2 git commit: [LOG4J2-1903] Update SLF4J from
1.7.24 to 1.7.25.
Posted by mi...@apache.org.
[LOG4J2-1903] Update SLF4J from 1.7.24 to 1.7.25.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/95a8c4fa
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/95a8c4fa
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/95a8c4fa
Branch: refs/heads/LOG4J2-1442
Commit: 95a8c4fa7ddbd47dd71d4e5b0c2e546590426567
Parents: 2a1383a
Author: Gary Gregory <gg...@apache.org>
Authored: Mon May 8 14:13:04 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon May 8 14:13:04 2017 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
src/changes/changes.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/95a8c4fa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 411a952..7fd9ded 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,7 +176,7 @@
<Log4jReleaseManager>Matt Sicker</Log4jReleaseManager>
<Log4jReleaseKey>FA1C814D</Log4jReleaseKey>
<!-- note that any properties you want available in velocity templates must not use periods! -->
- <slf4jVersion>1.7.24</slf4jVersion>
+ <slf4jVersion>1.7.25</slf4jVersion>
<logbackVersion>1.2.3</logbackVersion>
<jackson1Version>1.9.13</jackson1Version>
<jackson2Version>2.8.7</jackson2Version>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/95a8c4fa/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 8ef6901..9681eb4 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -82,6 +82,9 @@
<action issue="LOG4J2-1900" dev="ggregory" type="update">
Update JAnsi from 1.15 to 1.16.
</action>
+ <action issue="LOG4J2-" dev="ggregory" type="update">
+ Update SLF4J from 1.7.24 to 1.7.25.
+ </action>
</release>
<release version="2.8.2" date="2017-04-02" description="GA Release 2.8.2">
<action issue="LOG4J2-1861" dev="mattsicker" type="fix">
[17/21] logging-log4j2 git commit: Fix Travis-CI build. Closes #76
https://github.com/apache/logging-log4j2/pull/76
Posted by mi...@apache.org.
Fix Travis-CI build. Closes #76
https://github.com/apache/logging-log4j2/pull/76
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4b8ca689
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4b8ca689
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4b8ca689
Branch: refs/heads/LOG4J2-1442
Commit: 4b8ca689b18d8e6c4b486572b0a129bce6c1724a
Parents: 08ee42f
Author: Gary Gregory <gg...@apache.org>
Authored: Sun May 7 10:48:00 2017 -0700
Committer: Pascal Schumacher <pa...@apache.org>
Committed: Sun May 7 10:48:00 2017 -0700
----------------------------------------------------------------------
.travis-toolchains.xml | 37 +++++++++++++++++++++++++++++++++++++
.travis.yml | 20 ++++++++++++++++++--
2 files changed, 55 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4b8ca689/.travis-toolchains.xml
----------------------------------------------------------------------
diff --git a/.travis-toolchains.xml b/.travis-toolchains.xml
new file mode 100644
index 0000000..3f72e01
--- /dev/null
+++ b/.travis-toolchains.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF8"?>
+<toolchains xmlns="http://maven.apache.org/TOOLCHAINS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/TOOLCHAINS/1.1.0 http://maven.apache.org/xsd/toolchains-1.1.0.xsd">
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <id>java7</id>
+ <version>1.7</version>
+ <vendor>oracle</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/usr/lib/jvm/java-7-oracle</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <id>java8</id>
+ <version>1.8</version>
+ <vendor>oracle</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/usr/lib/jvm/java-8-oracle</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <id>java9</id>
+ <version>9</version>
+ <vendor>oracle</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/usr/lib/jvm/java-9-oracle</jdkHome>
+ </configuration>
+ </toolchain>
+</toolchains>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4b8ca689/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 8de6f78..8c8131e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,10 +11,26 @@
# limitations under the License.
language: java
-sudo: false
+# sudo enabled because sudo vms have more memory: https://docs.travis-ci.com/user/ci-environment/
+sudo: true
jdk:
- oraclejdk7
+env:
+ global:
+ JAVA_OPTS=-Xmx4g
+
+addons:
+ apt:
+ packages:
+ - oracle-java9-installer
+
+install:
+ - ./mvnw --toolchains=./.travis-toolchains.xml install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
+
+script:
+ - ./mvnw --toolchains=./.travis-toolchains.xml test -B
+
after_success:
- - mvn --show-version -pl !log4j-bom jacoco:prepare-agent test jacoco:report coveralls:report
+ - ./mvnw --show-version -pl !log4j-bom jacoco:prepare-agent test jacoco:report coveralls:report
\ No newline at end of file
[02/21] logging-log4j2 git commit: Add missing accessors.
Posted by mi...@apache.org.
Add missing accessors.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3e3e5f8a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3e3e5f8a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3e3e5f8a
Branch: refs/heads/LOG4J2-1442
Commit: 3e3e5f8a6633e36bcab0ca9a81ef7f73ea3ce05c
Parents: 34ea230
Author: Gary Gregory <gg...@apache.org>
Authored: Thu May 4 10:28:52 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Thu May 4 10:28:52 2017 -0700
----------------------------------------------------------------------
.../log4j/core/net/ssl/AbstractKeyStoreConfiguration.java | 4 ++++
.../apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java | 4 ++++
.../logging/log4j/core/net/ssl/TrustStoreConfiguration.java | 4 ++++
3 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3e3e5f8a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
index d893a1e..569ea8d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/AbstractKeyStoreConfiguration.java
@@ -111,4 +111,8 @@ public class AbstractKeyStoreConfiguration extends StoreConfiguration<KeyStore>
return true;
}
+ public String getKeyStoreType() {
+ return keyStoreType;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3e3e5f8a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
index db844c7..8a97474 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
@@ -107,4 +107,8 @@ public class KeyStoreConfiguration extends AbstractKeyStoreConfiguration {
}
return true;
}
+
+ public String getKeyManagerFactoryAlgorithm() {
+ return keyManagerFactoryAlgorithm;
+ }
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3e3e5f8a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
index 839365b..1053582 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
@@ -102,4 +102,8 @@ public class TrustStoreConfiguration extends AbstractKeyStoreConfiguration {
}
return true;
}
+
+ public String getTrustManagerFactoryAlgorithm() {
+ return trustManagerFactoryAlgorithm;
+ }
}
[20/21] logging-log4j2 git commit: Make Timer implement
StringBuilderFormattable
Posted by mi...@apache.org.
Make Timer implement StringBuilderFormattable
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/68e43b84
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/68e43b84
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/68e43b84
Branch: refs/heads/LOG4J2-1442
Commit: 68e43b84d8705cb6ff2bbcc999ae7e1f2665e5d9
Parents: 95a8c4f
Author: Mikael Ståldal <mi...@magine.com>
Authored: Wed May 10 14:12:05 2017 +0200
Committer: Mikael Ståldal <mi...@magine.com>
Committed: Wed May 10 14:12:05 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/Timer.java | 25 +++++++++++++-------
1 file changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/68e43b84/log4j-api/src/test/java/org/apache/logging/log4j/Timer.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/Timer.java b/log4j-api/src/test/java/org/apache/logging/log4j/Timer.java
index cca30b5..2a4780a 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/Timer.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/Timer.java
@@ -19,12 +19,13 @@ package org.apache.logging.log4j;
import java.io.Serializable;
import java.text.DecimalFormat;
+import org.apache.logging.log4j.util.StringBuilderFormattable;
import org.apache.logging.log4j.util.Strings;
/**
*
*/
-public class Timer implements Serializable
+public class Timer implements Serializable, StringBuilderFormattable
{
private static final long serialVersionUID = 9175191792439630013L;
@@ -144,16 +145,23 @@ public class Timer implements Serializable
@Override
public String toString()
{
- final StringBuilder result = new StringBuilder("Timer ").append(name);
+ final StringBuilder result = new StringBuilder();
+ formatTo(result);
+ return result.toString();
+ }
+
+ @Override
+ public void formatTo(StringBuilder buffer) {
+ buffer.append("Timer ").append(name);
switch (status) {
case "Start":
- result.append(" started");
+ buffer.append(" started");
break;
case "Pause":
- result.append(" paused");
+ buffer.append(" paused");
break;
case "Resume":
- result.append(" resumed");
+ buffer.append(" resumed");
break;
case "Stop":
long nanoseconds = elapsedTime;
@@ -184,7 +192,7 @@ public class Timer implements Serializable
elapsed += numFormat.format(seconds) + '.';
numFormat = new DecimalFormat("000000000");
elapsed += numFormat.format(nanoseconds) + " seconds";
- result.append(" stopped. Elapsed time: ").append(elapsed);
+ buffer.append(" stopped. Elapsed time: ").append(elapsed);
if (iterations > 0) {
nanoseconds = elapsedTime / iterations;
// Get elapsed hours
@@ -213,14 +221,13 @@ public class Timer implements Serializable
elapsed += numFormat.format(seconds) + '.';
numFormat = new DecimalFormat("000000000");
elapsed += numFormat.format(nanoseconds) + " seconds";
- result.append(" Average per iteration: ").append(elapsed);
+ buffer.append(" Average per iteration: ").append(elapsed);
}
break;
default:
- result.append(' ').append(status);
+ buffer.append(' ').append(status);
break;
}
- return result.toString();
}
@Override
[10/21] logging-log4j2 git commit: Add toString().
Posted by mi...@apache.org.
Add toString().
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/fb33772a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fb33772a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fb33772a
Branch: refs/heads/LOG4J2-1442
Commit: fb33772a7d29877e3291d3b73cdc14f2ef238819
Parents: d7d88b1
Author: Gary Gregory <gg...@apache.org>
Authored: Sat May 6 13:18:06 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sat May 6 13:18:06 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/util/WatchManager.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fb33772a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
index df99998..b0eb943 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
@@ -119,4 +119,10 @@ public class WatchManager extends AbstractLifeCycle {
this.lastModified = lastModified;
}
}
+
+ @Override
+ public String toString() {
+ return "WatchManager [intervalSeconds=" + intervalSeconds + ", watchers=" + watchers + ", scheduler="
+ + scheduler + ", future=" + future + "]";
+ }
}
[08/21] logging-log4j2 git commit: [LOG4J2-1896] Update
org.apache.logging.log4j.core.net.ssl.StoreConfiguration from a String to
char[] to represent its password.
Posted by mi...@apache.org.
[LOG4J2-1896]
Update org.apache.logging.log4j.core.net.ssl.StoreConfiguration from a
String to char[] to represent its password.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/422d0902
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/422d0902
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/422d0902
Branch: refs/heads/LOG4J2-1442
Commit: 422d09022acfe3f34e3dbcf32d87ac50198ad560
Parents: afe9295
Author: Gary Gregory <gg...@apache.org>
Authored: Sat May 6 12:46:03 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sat May 6 12:46:03 2017 -0700
----------------------------------------------------------------------
.../log4j/core/net/ssl/StoreConfiguration.java | 44 ++++++++------------
src/changes/changes.xml | 3 ++
2 files changed, 21 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/422d0902/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java
index f342fd5..8002287 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java
@@ -16,6 +16,8 @@
*/
package org.apache.logging.log4j.core.net.ssl;
+import java.util.Arrays;
+
import org.apache.logging.log4j.status.StatusLogger;
/**
@@ -25,11 +27,11 @@ public class StoreConfiguration<T> {
protected static final StatusLogger LOGGER = StatusLogger.getLogger();
private String location;
- private String password;
+ private char[] password;
public StoreConfiguration(final String location, final String password) {
this.location = location;
- this.password = password;
+ this.password = password == null ? null : password.toCharArray();
}
public String getLocation() {
@@ -41,15 +43,15 @@ public class StoreConfiguration<T> {
}
public String getPassword() {
- return this.password;
+ return String.valueOf(this.password);
}
public char[] getPasswordAsCharArray() {
- return this.password == null ? null : this.password.toCharArray();
+ return this.password;
}
public void setPassword(final String password) {
- this.password = password;
+ this.password = password == null ? null : password.toCharArray();
}
/**
@@ -63,37 +65,27 @@ public class StoreConfiguration<T> {
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((this.location == null) ? 0 : this.location.hashCode());
- result = prime * result + ((this.password == null) ? 0 : this.password.hashCode());
+ result = prime * result + ((location == null) ? 0 : location.hashCode());
+ result = prime * result + Arrays.hashCode(password);
return result;
}
@Override
- public boolean equals(final Object obj) {
- if (this == obj) {
+ public boolean equals(Object obj) {
+ if (this == obj)
return true;
- }
- if (obj == null) {
+ if (obj == null)
return false;
- }
- if (!(obj instanceof StoreConfiguration)) {
+ if (getClass() != obj.getClass())
return false;
- }
- final StoreConfiguration<?> other = (StoreConfiguration<?>) obj;
- if (this.location == null) {
- if (other.location != null) {
+ StoreConfiguration other = (StoreConfiguration) obj;
+ if (location == null) {
+ if (other.location != null)
return false;
- }
- } else if (!this.location.equals(other.location)) {
+ } else if (!location.equals(other.location))
return false;
- }
- if (this.password == null) {
- if (other.password != null) {
- return false;
- }
- } else if (!this.password.equals(other.password)) {
+ if (!Arrays.equals(password, other.password))
return false;
- }
return true;
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/422d0902/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 379c21e..c40d3bb 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -76,6 +76,9 @@
<action issue="LOG4J2-1877" dev="ggregory" type="update" due-to="Chandra Tungathurthi">
Missing documentation for Max index limit in DefaultRolloverStrategy.
</action>
+ <action issue="LOG4J2-1896" dev="ggregory" type="update">
+ Update org.apache.logging.log4j.core.net.ssl.StoreConfiguration from a String to char[] to represent its password.
+ </action>
</release>
<release version="2.8.2" date="2017-04-02" description="GA Release 2.8.2">
<action issue="LOG4J2-1861" dev="mattsicker" type="fix">
[04/21] logging-log4j2 git commit: Update the build help for Windows
and Mac example toolchains.
Posted by mi...@apache.org.
Update the build help for Windows and Mac example toolchains.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/272de26b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/272de26b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/272de26b
Branch: refs/heads/LOG4J2-1442
Commit: 272de26b9becd7c6cf4ff972e2aaee745ec9c506
Parents: 4d2ff5c
Author: Gary Gregory <gg...@apache.org>
Authored: Thu May 4 21:09:41 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Thu May 4 21:09:41 2017 -0700
----------------------------------------------------------------------
src/site/markdown/build.md | 14 +++++++----
toolchains-sample-mac.xml | 52 +++++++++++++++++++++++++++++++++++++++++
toolchains-sample.xml | 52 -----------------------------------------
3 files changed, 61 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/272de26b/src/site/markdown/build.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/build.md b/src/site/markdown/build.md
index b63d985..2a4b29d 100644
--- a/src/site/markdown/build.md
+++ b/src/site/markdown/build.md
@@ -30,12 +30,16 @@ obtained by downloading it using the instructions at [Log4j Downloads](download.
Log4j 2.x uses Maven 3 as its build tool. Log4j 2.x uses the Java 9 compiler in addition to
the Java version installed in the path. This is accomplished by usin Maven's toolchains support.
-Log4j 2 provides a sample toolchains XML file in the root folder. This may be used by
-modifying it and installing the file as toolchains.xml in the .m2 folder or by using
--t ./toolchains-sample.xml when invoking Maven.
+Log4j 2 provides sample toolchains XML files in the root folder. This may be used by
+modifying it and installing the file as toolchains.xml in the .m2 folder or by using the
+following when invoking Maven.
-To build and install Log4j in your local Maven cache, from
-the root directory run: `mvn install`
+```
+[Macintosh] -t ./toolchains-sample-mac.xml
+[Windows] -t ./toolchains-sample-win.xml
+```
+
+To build and install Log4j in your local Maven cache, from the root directory run: `mvn install`
Note that if your `/etc/hosts` file does not include an entry for your computer's hostname, then
many unit tests may execute slowly due to DNS lookups to translate your hostname to an IP address in
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/272de26b/toolchains-sample-mac.xml
----------------------------------------------------------------------
diff --git a/toolchains-sample-mac.xml b/toolchains-sample-mac.xml
new file mode 100644
index 0000000..ce360ad
--- /dev/null
+++ b/toolchains-sample-mac.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF8"?>
+<!--
+ ~ 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.
+ -->
+<toolchains>
+ <!-- JDK toolchains -->
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>1.7</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/Library/Java/JavaVirtualMachines/java7/Contents/Home</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>1.8</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/Library/Java/JavaVirtualMachines/java8/Contents/Home</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>9</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/Library/Java/JavaVirtualMachines/java9/Contents/Home</jdkHome>
+ </configuration>
+ </toolchain>
+
+ <!-- other toolchains -->
+</toolchains>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/272de26b/toolchains-sample.xml
----------------------------------------------------------------------
diff --git a/toolchains-sample.xml b/toolchains-sample.xml
deleted file mode 100644
index ce360ad..0000000
--- a/toolchains-sample.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF8"?>
-<!--
- ~ 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.
- -->
-<toolchains>
- <!-- JDK toolchains -->
- <toolchain>
- <type>jdk</type>
- <provides>
- <version>1.7</version>
- <vendor>sun</vendor>
- </provides>
- <configuration>
- <jdkHome>/Library/Java/JavaVirtualMachines/java7/Contents/Home</jdkHome>
- </configuration>
- </toolchain>
- <toolchain>
- <type>jdk</type>
- <provides>
- <version>1.8</version>
- <vendor>sun</vendor>
- </provides>
- <configuration>
- <jdkHome>/Library/Java/JavaVirtualMachines/java8/Contents/Home</jdkHome>
- </configuration>
- </toolchain>
- <toolchain>
- <type>jdk</type>
- <provides>
- <version>9</version>
- <vendor>sun</vendor>
- </provides>
- <configuration>
- <jdkHome>/Library/Java/JavaVirtualMachines/java9/Contents/Home</jdkHome>
- </configuration>
- </toolchain>
-
- <!-- other toolchains -->
-</toolchains>
[09/21] logging-log4j2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Posted by mi...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d7d88b13
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d7d88b13
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d7d88b13
Branch: refs/heads/LOG4J2-1442
Commit: d7d88b13c5ee60572387e500442f2396fe616718
Parents: 422d090 2633291
Author: Gary Gregory <gg...@apache.org>
Authored: Sat May 6 12:46:34 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sat May 6 12:46:34 2017 -0700
----------------------------------------------------------------------
BUILDING.md | 12 +-
.../logging/log4j/core/SimplePerfTest.java | 2 +-
.../logging/log4j/core/ThreadedPerfTest.java | 2 +-
.../apache/logging/log4j/core/util/Timer.java | 273 -------------------
src/site/markdown/build.md | 3 +-
toolchains-sample-linux.xml | 52 ++++
6 files changed, 65 insertions(+), 279 deletions(-)
----------------------------------------------------------------------
[03/21] logging-log4j2 git commit: Add a Windows Maven toolchain
example.
Posted by mi...@apache.org.
Add a Windows Maven toolchain example.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4d2ff5cb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4d2ff5cb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4d2ff5cb
Branch: refs/heads/LOG4J2-1442
Commit: 4d2ff5cb6e1a4ac20483c5d0febb2d8d790186bd
Parents: 3e3e5f8
Author: Gary Gregory <gg...@apache.org>
Authored: Thu May 4 21:04:07 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Thu May 4 21:04:07 2017 -0700
----------------------------------------------------------------------
toolchains-sample-win.xml | 52 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4d2ff5cb/toolchains-sample-win.xml
----------------------------------------------------------------------
diff --git a/toolchains-sample-win.xml b/toolchains-sample-win.xml
new file mode 100644
index 0000000..64c30ac
--- /dev/null
+++ b/toolchains-sample-win.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF8"?>
+<!--
+ ~ 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.
+ -->
+<toolchains>
+ <!-- JDK toolchains -->
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>1.7</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>C:\Program Files\Java\jdk1.7.0_80</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>1.8</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>C:\Program Files\Java\jdk1.8.0_131</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>9</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>C:\Program Files\Java\jdk-9</jdkHome>
+ </configuration>
+ </toolchain>
+
+ <!-- other toolchains -->
+</toolchains>