Repository: logging-log4j2 Updated Branches: refs/heads/master 0221bbbbd -> 8a84bf260
Convert changelog.xml to markdown Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8a84bf26 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8a84bf26 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8a84bf26 Branch: refs/heads/master Commit: 8a84bf26076e5420983da4bf7807a69297dd1951 Parents: 0221bbb Author: Matt Sicker <[email protected]> Authored: Sun Jan 15 19:25:42 2017 -0600 Committer: Matt Sicker <[email protected]> Committed: Sun Jan 15 19:25:42 2017 -0600 ---------------------------------------------------------------------- src/site/markdown/changelog.md | 33 ++++++++++++++++++++++++++++ src/site/xdoc/changelog.xml | 43 ------------------------------------- 2 files changed, 33 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8a84bf26/src/site/markdown/changelog.md ---------------------------------------------------------------------- diff --git a/src/site/markdown/changelog.md b/src/site/markdown/changelog.md new file mode 100644 index 0000000..e7799ec --- /dev/null +++ b/src/site/markdown/changelog.md @@ -0,0 +1,33 @@ +<!-- + 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. +--> + +# Release Changelog + +[JIRA-generated changelog](jira-report.html) + +[Manual change log](changes-report.html) + +Apache Log4j 2 is not compatible with the previous versions. Please have the following in mind when upgrading to +Log4j 2 in your project: + +* Log4j 2.4 and greater requires Java 7, versions 2.0-alpha1 to 2.3 required Java 6. +* The XML configuration has been simplified and is not compatible with Log4j 1.x. +* Configuration via property files is supported from version 2.4, but is not compatible with Log4j 1.x. +* Configuration via JSON or YAML is supported, but these formats require +[additional runtime dependencies](runtime-dependencies.html). +* Although Log4j 2 is not directly compatible with Log4j 1.x a compatibility bridge has been provided to reduce the +need to make coding changes. http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8a84bf26/src/site/xdoc/changelog.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/changelog.xml b/src/site/xdoc/changelog.xml deleted file mode 100644 index 122bc99..0000000 --- a/src/site/xdoc/changelog.xml +++ /dev/null @@ -1,43 +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. --> -<document - xmlns="http://maven.apache.org/XDOC/2.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> - - <properties> - <title>Releases</title> - </properties> - - <body> - <section name="Release Change Logs"> - <p> - <a href="jira-report.html">JIRA change log</a> - </p> - <p> - <a href="changes-report.html">Manual change log</a> - </p> - - <p>Apache Log4j 2 is not compatible with the previous versions. Please have the following in mind - when upgrading to Log4j 2 in your project: - </p> - - <ul> - <li>Log4j 2.4 and greater requires Java 7, versions 2.0-alpha1 to 2.3 required Java 6.</li> - <li>The XML configuration has been simplified and is not compatible with Log4j 1.x</li> - <li>Configuration via property files is supported from version 2.4, but is not compatible with Log4j 1.x.</li> - <li>Configuration via JSON or YAML is supported, but these formats require - <a href="runtime-dependencies.html">additional runtime dependencies</a>.</li> - <li>Although Log4j 2 is not directly compatible with Log4j 1.x a compatibility bridge - has been provided to reduce the need to make coding changes. - </li> - </ul> - - </section> - </body> -</document>
