This should say log4j 2.4 and greater requires Java 7 and 2.3 requires Java 6.
Ralph > On May 19, 2015, at 3:03 PM, ggreg...@apache.org wrote: > > Repository: logging-log4j2 > Updated Branches: > refs/heads/master ce4a9ca2a -> 72691934b > > > [LOG4J2-1017] Update Java platform from Java 6 to 7. > > Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo > Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/72691934 > Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/72691934 > Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/72691934 > > Branch: refs/heads/master > Commit: 72691934bc4db172861a42f05dc3623b47a7e33c > Parents: ce4a9ca > Author: Gary Gregory <garydgreg...@gmail.com> > Authored: Tue May 19 15:02:51 2015 -0700 > Committer: Gary Gregory <garydgreg...@gmail.com> > Committed: Tue May 19 15:02:51 2015 -0700 > > ---------------------------------------------------------------------- > src/changes/announcement.vm | 4 +- > src/site/xdoc/changelog.xml | 90 ++++++++++++++++++++-------------------- > src/site/xdoc/index.xml | 2 +- > 3 files changed, 48 insertions(+), 48 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/72691934/src/changes/announcement.vm > ---------------------------------------------------------------------- > diff --git a/src/changes/announcement.vm b/src/changes/announcement.vm > index 8dd4139..a5eb268 100644 > --- a/src/changes/announcement.vm > +++ b/src/changes/announcement.vm > @@ -131,8 +131,8 @@ o#if($!issue != "") $issue. #end ${action} #if($!dueto != > "")Thanks to $dueto. # > ## End of main loop > #end > > -Apache Log4j ${relVersion} requires a minimum of Java 6 to build and run. > This will be the last release of Log4j 2 to > -support Java 6. Future releases will require a minimum of Java 7. > +Apache Log4j ${relVersion} requires a minimum of Java 7 to build and run. > Log4j 2.3 and greater requires Java 7, > +version 2.2 required Java 6. > > Basic compatibility with Log4j 1.x is provided through the log4j-1.2-api > component, however it does not implement some of the > very implementation specific classes and methods. The package names and Maven > groupId have been changed to > > http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/72691934/src/site/xdoc/changelog.xml > ---------------------------------------------------------------------- > diff --git a/src/site/xdoc/changelog.xml b/src/site/xdoc/changelog.xml > index 355b13c..4d5d9ed 100644 > --- a/src/site/xdoc/changelog.xml > +++ b/src/site/xdoc/changelog.xml > @@ -1,45 +1,45 @@ > -<?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#a1.0-alpha1">JIRA > change log</a></p> > - <p><a href="changes-report.html#a1.0-alpha1">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>Java 6 is required</li> > - <li>The XML configuration has been simplified and is not > compatible with Log4j 1.x</li> > - <li>Configuration via property files is not supported.</li> > - <li>Configuration via JSON or YAML is supported.</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> > +<?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#a1.0-alpha1">JIRA > change log</a></p> > + <p><a href="changes-report.html#a1.0-alpha1">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.3 and greater requires Java > 7, version 2.2 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 not supported.</li> > + <li>Configuration via JSON or YAML is supported.</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> > > http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/72691934/src/site/xdoc/index.xml > ---------------------------------------------------------------------- > diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml > index 2d40323..f9b4880 100644 > --- a/src/site/xdoc/index.xml > +++ b/src/site/xdoc/index.xml > @@ -99,7 +99,7 @@ > > <subsection name="Requirements"> > <p> > - Log4j 2 requires Java 6. > + Log4j 2.3 and greater requires Java 7, version 2.2 required > Java 6. > Some features require optional dependencies; the documentation > for these features specifies the > dependencies. > </p> > --------------------------------------------------------------------- To unsubscribe, e-mail: log4j-dev-unsubscr...@logging.apache.org For additional commands, e-mail: log4j-dev-h...@logging.apache.org
