This is an automated email from the ASF dual-hosted git repository. rgoers pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j-server.git
commit e75bafd39d4a1aa1d15ea62b78f5baf5d40ba3ab Author: Mikael Ståldal <[email protected]> AuthorDate: Mon Dec 11 20:41:49 2017 +0100 Upgrade to latest Log4j --- log4j-server/pom.xml | 2 +- .../java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java | 4 ++-- pom.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml index d5493c3..6ef00c5 100644 --- a/log4j-server/pom.xml +++ b/log4j-server/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-tools</artifactId> - <version>2.9-SNAPSHOT</version> + <version>2.10.1-SNAPSHOT</version> <relativePath>../</relativePath> </parent> <artifactId>log4j-server</artifactId> diff --git a/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java b/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java index 1a4acb4..42a9e9e 100644 --- a/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java +++ b/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java @@ -42,9 +42,9 @@ public class SslXmlSocketServerTest extends AbstractSocketServerTest { private static void initServerSocketFactory() throws StoreConfigurationException { final KeyStoreConfiguration ksc = new KeyStoreConfiguration(TestConstants.KEYSTORE_FILE, - TestConstants.KEYSTORE_PWD, TestConstants.KEYSTORE_TYPE, null); + TestConstants.KEYSTORE_PWD(), TestConstants.KEYSTORE_TYPE, null); final TrustStoreConfiguration tsc = new TrustStoreConfiguration(TestConstants.TRUSTSTORE_FILE, - TestConstants.TRUSTSTORE_PWD, null, null); + TestConstants.TRUSTSTORE_PWD(), null, null); sslConfiguration = SslConfiguration.createSSLConfiguration(null, ksc, tsc); } diff --git a/pom.xml b/pom.xml index ca95638..b520cae 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ <artifactId>log4j-tools</artifactId> <packaging>pom</packaging> <name>Apache Log4j 2 Tools</name> - <version>2.9-SNAPSHOT</version> + <version>2.10.1-SNAPSHOT</version> <parent> <groupId>org.apache.logging</groupId> <artifactId>logging-parent</artifactId> @@ -166,7 +166,7 @@ <properties> <!-- make sure to update these for each release! --> <log4jParentDir>${basedir}</log4jParentDir> - <Log4jReleaseVersion>2.8.2</Log4jReleaseVersion> + <Log4jReleaseVersion>2.10.0</Log4jReleaseVersion> <!--<Log4jReleaseManager>Ralph Goers</Log4jReleaseManager>--> <!--<Log4jReleaseKey>B3D8E1BA</Log4jReleaseKey>--> <Log4jReleaseManager>Matt Sicker</Log4jReleaseManager>
