Repository: logging-log4j2 Updated Branches: refs/heads/master 189af7978 -> f01a5f09b
LOG4J2-2025 - reapply the patch Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f01a5f09 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f01a5f09 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f01a5f09 Branch: refs/heads/master Commit: f01a5f09bd72ece58cfc2c7307616e50d36810e9 Parents: 189af79 Author: Ralph Goers <[email protected]> Authored: Sun Oct 8 23:01:54 2017 -0700 Committer: Ralph Goers <[email protected]> Committed: Sun Oct 8 23:04:49 2017 -0700 ---------------------------------------------------------------------- log4j-appserver/pom.xml | 211 +++++++++++++++++++++++++++++++++++++++ log4j-appserver/pom.xml.sav | 211 --------------------------------------- log4j-distribution/pom.xml | 4 +- pom.xml | 2 +- src/changes/changes.xml | 15 ++- 5 files changed, 225 insertions(+), 218 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f01a5f09/log4j-appserver/pom.xml ---------------------------------------------------------------------- diff --git a/log4j-appserver/pom.xml b/log4j-appserver/pom.xml new file mode 100644 index 0000000..34822ef --- /dev/null +++ b/log4j-appserver/pom.xml @@ -0,0 +1,211 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ 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. + --> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <parent> + <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <version>2.9.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>log4j-appserver</artifactId> + <packaging>jar</packaging> + <name>Apache Log4j App Server Support</name> + <description>Provide Log4j as the logging implementation for application servers</description> + + <properties> + <log4jParentDir>${basedir}/..</log4jParentDir> + <docLabel>Web Documentation</docLabel> + <projectDir>/log4j-appserver</projectDir> + <tomcat.version>8.5.20</tomcat.version> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.0.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-catalina</artifactId> + <version>${tomcat.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-annotations-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jsp-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-el-api</artifactId> + </exclusion> + </exclusions> + </dependency> + + <!-- Test dependencies --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <!-- we compile against 3.0, but require 2.5 minimum --> + <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> + <Import-Package>javax.servlet;version="[2.5,4)",*</Import-Package> + <Export-Package>org.apache.logging.log4j.web</Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-changes-plugin</artifactId> + <version>${changes.plugin.version}</version> + <reportSets> + <reportSet> + <reports> + <report>changes-report</report> + </reports> + </reportSet> + </reportSets> + <configuration> + <issueLinkTemplate>%URL%/show_bug.cgi?id=%ISSUE%</issueLinkTemplate> + <useJql>true</useJql> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>${checkstyle.plugin.version}</version> + <configuration> + <!--<propertiesLocation>${vfs.parent.dir}/checkstyle.properties</propertiesLocation> --> + <configLocation>${log4jParentDir}/checkstyle.xml</configLocation> + <suppressionsLocation>${log4jParentDir}/checkstyle-suppressions.xml</suppressionsLocation> + <enableRulesSummary>false</enableRulesSummary> + <propertyExpansion>basedir=${basedir}</propertyExpansion> + <propertyExpansion>licensedir=${log4jParentDir}/checkstyle-header.txt</propertyExpansion> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc.plugin.version}</version> + <configuration> + <bottom><![CDATA[<p align="center">Copyright © {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br /> + Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, the Apache Logging project logo, + and the Apache Log4j logo are trademarks of The Apache Software Foundation.</p>]]></bottom> + <!-- module link generation is completely broken in the javadoc plugin for a multi-module non-aggregating + project --> + <detectOfflineLinks>false</detectOfflineLinks> + <linksource>true</linksource> + <links> + <link>http://docs.oracle.com/javaee/6/api/</link> + </links> + </configuration> + <reportSets> + <reportSet> + <id>non-aggregate</id> + <reports> + <report>javadoc</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>${findbugs.plugin.version}</version> + <configuration> + <fork>true</fork> + <jvmArgs>-Duser.language=en</jvmArgs> + <threshold>Normal</threshold> + <effort>Default</effort> + <excludeFilterFile>${log4jParentDir}/findbugs-exclude-filter.xml</excludeFilterFile> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>${jxr.plugin.version}</version> + <reportSets> + <reportSet> + <id>non-aggregate</id> + <reports> + <report>jxr</report> + </reports> + </reportSet> + <reportSet> + <id>aggregate</id> + <reports> + <report>aggregate</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <version>${pmd.plugin.version}</version> + <configuration> + <targetJdk>${maven.compiler.target}</targetJdk> + </configuration> + </plugin> + </plugins> + </reporting> +</project> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f01a5f09/log4j-appserver/pom.xml.sav ---------------------------------------------------------------------- diff --git a/log4j-appserver/pom.xml.sav b/log4j-appserver/pom.xml.sav deleted file mode 100644 index 34822ef..0000000 --- a/log4j-appserver/pom.xml.sav +++ /dev/null @@ -1,211 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ 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. - --> - -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <parent> - <artifactId>log4j</artifactId> - <groupId>org.apache.logging.log4j</groupId> - <version>2.9.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>log4j-appserver</artifactId> - <packaging>jar</packaging> - <name>Apache Log4j App Server Support</name> - <description>Provide Log4j as the logging implementation for application servers</description> - - <properties> - <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>Web Documentation</docLabel> - <projectDir>/log4j-appserver</projectDir> - <tomcat.version>8.5.20</tomcat.version> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-catalina</artifactId> - <version>${tomcat.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-annotations-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-jsp-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-el-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!-- Test dependencies --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <!-- we compile against 3.0, but require 2.5 minimum --> - <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> - <Import-Package>javax.servlet;version="[2.5,4)",*</Import-Package> - <Export-Package>org.apache.logging.log4j.web</Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-changes-plugin</artifactId> - <version>${changes.plugin.version}</version> - <reportSets> - <reportSet> - <reports> - <report>changes-report</report> - </reports> - </reportSet> - </reportSets> - <configuration> - <issueLinkTemplate>%URL%/show_bug.cgi?id=%ISSUE%</issueLinkTemplate> - <useJql>true</useJql> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> - <configuration> - <!--<propertiesLocation>${vfs.parent.dir}/checkstyle.properties</propertiesLocation> --> - <configLocation>${log4jParentDir}/checkstyle.xml</configLocation> - <suppressionsLocation>${log4jParentDir}/checkstyle-suppressions.xml</suppressionsLocation> - <enableRulesSummary>false</enableRulesSummary> - <propertyExpansion>basedir=${basedir}</propertyExpansion> - <propertyExpansion>licensedir=${log4jParentDir}/checkstyle-header.txt</propertyExpansion> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.plugin.version}</version> - <configuration> - <bottom><![CDATA[<p align="center">Copyright © {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.<br /> - Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, the Apache Logging project logo, - and the Apache Log4j logo are trademarks of The Apache Software Foundation.</p>]]></bottom> - <!-- module link generation is completely broken in the javadoc plugin for a multi-module non-aggregating - project --> - <detectOfflineLinks>false</detectOfflineLinks> - <linksource>true</linksource> - <links> - <link>http://docs.oracle.com/javaee/6/api/</link> - </links> - </configuration> - <reportSets> - <reportSet> - <id>non-aggregate</id> - <reports> - <report>javadoc</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>${findbugs.plugin.version}</version> - <configuration> - <fork>true</fork> - <jvmArgs>-Duser.language=en</jvmArgs> - <threshold>Normal</threshold> - <effort>Default</effort> - <excludeFilterFile>${log4jParentDir}/findbugs-exclude-filter.xml</excludeFilterFile> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>${jxr.plugin.version}</version> - <reportSets> - <reportSet> - <id>non-aggregate</id> - <reports> - <report>jxr</report> - </reports> - </reportSet> - <reportSet> - <id>aggregate</id> - <reports> - <report>aggregate</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>${pmd.plugin.version}</version> - <configuration> - <targetJdk>${maven.compiler.target}</targetJdk> - </configuration> - </plugin> - </plugins> - </reporting> -</project> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f01a5f09/log4j-distribution/pom.xml ---------------------------------------------------------------------- diff --git a/log4j-distribution/pom.xml b/log4j-distribution/pom.xml index 26e5f1d..a3f8619 100644 --- a/log4j-distribution/pom.xml +++ b/log4j-distribution/pom.xml @@ -272,7 +272,7 @@ <version>${project.version}</version> <classifier>javadoc</classifier> </dependency> - <!-- <dependency> + <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-appserver</artifactId> <version>${project.version}</version> @@ -288,7 +288,7 @@ <artifactId>log4j-appserver</artifactId> <version>${project.version}</version> <classifier>javadoc</classifier> - </dependency> --> + </dependency> </dependencies> <build> <plugins> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f01a5f09/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 007a1a3..d92a182 100644 --- a/pom.xml +++ b/pom.xml @@ -1295,7 +1295,7 @@ <module>log4j-iostreams</module> <module>log4j-jul</module> <module>log4j-liquibase</module> - <!--<module>log4j-appserver</module>--> + <module>log4j-appserver</module> </modules> <profiles> <profile> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f01a5f09/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index f376665..578cc6d 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -30,12 +30,16 @@ - "update" - Change - "remove" - Removed --> - <release version="2.9.2" date="2017-XX-XX" description="GA Release 2.9.2"> + <release version="2.10.0" date="2017-XX-XX" description="GA Release 2.10.0"> + <action issue="LOG4J2-2025" dev="rgoers" type="update"> + Provide support for overriding the Tomcat Log class in Tomcat 8.5+. + </action> <action issue="LOG4J2-1694" dev="mikes" type="add" due-to="Michal DvoÅák"> Add fields with fixed values to JSON/XML/YAML layouts. </action> <action issue="LOG4J2-2054" dev="rpopma" type="add"> - Provide ways to configure SSL that avoid plain-text passwords in the log4j configuration. The configuration may now specify a system environment variable that holds the password, or the path to a file that holds the password. + Provide ways to configure SSL that avoid plain-text passwords in the log4j configuration. The configuration may + now specify a system environment variable that holds the password, or the path to a file that holds the password. </action> <action issue="LOG4J2-2057" dev="rgoers" type="update"> Support new SLF4J binding mechanism introduced in SLF4J 1.8. @@ -47,10 +51,13 @@ If Log4j is used as the Tomcat logging implementation startup might fail if an application also uses Log4j. </action> <action issue="LOG4J2-1896" dev="rpopma" type="update"> - Update classes in org.apache.logging.log4j.core.net.ssl in APIs from String to a PasswordProvider producing char[] for passwords. + Update classes in org.apache.logging.log4j.core.net.ssl in APIs from String to a PasswordProvider producing + char[] for passwords. </action> <action issue="LOG4J2-2031" dev="rpopma" type="fix"> - Until this change, messages appeared out of order in log file any time when the async logging queue was full. With this change, messages are only logged out of order to prevent deadlock when Log4j2 detects recursive logging while the queue is full. + Until this change, messages appeared out of order in log file any time when the async logging queue was full. + With this change, messages are only logged out of order to prevent deadlock when Log4j2 detects recursive + logging while the queue is full. </action> <action issue="LOG4J2-2053" dev="ggregory" type="fix"> Exception java.nio.charset.UnsupportedCharsetException: cp65001 in 2.9.0.
