You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2015/07/05 16:39:42 UTC
logging-log4j2 git commit: LOG4J2-1017 doc updates for new Java 7
requirement from log4j-2.4: - add mention in Runtime Dependencies page - add
mention in log4j-api and log4j-core component top page - remove mention of
java 6 from other component top page
Repository: logging-log4j2
Updated Branches:
refs/heads/master b38f0cb56 -> 5e630d1c7
LOG4J2-1017 doc updates for new Java 7 requirement from log4j-2.4:
- add mention in Runtime Dependencies page
- add mention in log4j-api and log4j-core component top page
- remove mention of java 6 from other component top pages; instead
mention dependency on log4j-api/core
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5e630d1c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5e630d1c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5e630d1c
Branch: refs/heads/master
Commit: 5e630d1c7567840c8755674611eda621b7453da3
Parents: b38f0cb
Author: rpopma <rp...@apache.org>
Authored: Sun Jul 5 23:39:54 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Jul 5 23:39:54 2015 +0900
----------------------------------------------------------------------
log4j-1.2-api/src/site/xdoc/index.xml | 2 +-
log4j-api/src/site/xdoc/index.xml | 2 +-
log4j-core/src/site/xdoc/index.xml | 3 ++-
log4j-flume-ng/src/site/xdoc/index.xml.vm | 2 +-
log4j-iostreams/src/site/xdoc/index.xml | 2 +-
log4j-jcl/src/site/xdoc/index.xml | 2 +-
log4j-jmx-gui/src/site/xdoc/index.xml | 2 +-
log4j-jul/src/site/xdoc/index.xml | 2 +-
log4j-liquibase/src/site/xdoc/index.xml | 4 ++--
log4j-nosql/src/site/xdoc/index.xml.vm | 2 +-
log4j-slf4j-impl/src/site/xdoc/index.xml | 2 +-
log4j-taglib/src/site/xdoc/index.xml | 4 ++--
log4j-to-slf4j/src/site/xdoc/index.xml | 2 +-
log4j-web/src/site/xdoc/index.xml | 2 +-
src/site/xdoc/changelog.xml | 2 +-
src/site/xdoc/index.xml | 2 +-
src/site/xdoc/runtime-dependencies.xml | 3 +++
17 files changed, 22 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5e630d1c/log4j-1.2-api/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/site/xdoc/index.xml b/log4j-1.2-api/src/site/xdoc/index.xml
index 5932693..036ebba 100644
--- a/log4j-1.2-api/src/site/xdoc/index.xml
+++ b/log4j-1.2-api/src/site/xdoc/index.xml
@@ -34,7 +34,7 @@
<section name="Requirements">
<p>
- The Log4j 1.2 bridge requires at least Java 6 and is dependent on the Log4j 2 API and implementation.
+ The Log4j 1.2 bridge is dependent on the Log4j 2 API and implementation.
</p>
</section>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5e630d1c/log4j-api/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/log4j-api/src/site/xdoc/index.xml b/log4j-api/src/site/xdoc/index.xml
index d5670ef..7586c5c 100644
--- a/log4j-api/src/site/xdoc/index.xml
+++ b/log4j-api/src/site/xdoc/index.xml
@@ -34,7 +34,7 @@
<section name="Requirements">
<p>
- The Log4j 2 API requires at least Java 6.
+ As of version 2.4, the Log4j 2 API requires Java 7. Versions 2.3 and earlier require Java 6.
</p>
</section>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5e630d1c/log4j-core/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/site/xdoc/index.xml b/log4j-core/src/site/xdoc/index.xml
index 34ec8e0..bbff7de 100644
--- a/log4j-core/src/site/xdoc/index.xml
+++ b/log4j-core/src/site/xdoc/index.xml
@@ -32,7 +32,8 @@
<section name="Requirements">
<p>
- Log4j 2 requires Java 6. Some features may require optional
+ As of version 2.4, Log4j 2 requires Java 7. Versions 2.3 and earlier require Java 6.
+ Some features may require optional
<a href="dependencies.html">dependencies</a>. These dependencies are specified in the
documentation for those features.
</p>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5e630d1c/log4j-flume-ng/src/site/xdoc/index.xml.vm
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/site/xdoc/index.xml.vm b/log4j-flume-ng/src/site/xdoc/index.xml.vm
index 0d41a91..4f1f05a 100644
--- a/log4j-flume-ng/src/site/xdoc/index.xml.vm
+++ b/log4j-flume-ng/src/site/xdoc/index.xml.vm
@@ -236,7 +236,7 @@
<section name="Requirements">
<p>
- The Flume Appender requires at least Java 6.
+ The Flume Appender requires the Log4J 2 API.
</p>
</section>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5e630d1c/log4j-iostreams/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/site/xdoc/index.xml b/log4j-iostreams/src/site/xdoc/index.xml
index 3d436d5..188f007 100644
--- a/log4j-iostreams/src/site/xdoc/index.xml
+++ b/log4j-iostreams/src/site/xdoc/index.xml
@@ -37,7 +37,7 @@
</section>
<section name="Requirements">
<p>
- The Log4j IOStreams API extension requires Java 6 and the Log4j API. This component was introduced in Log4j 2.1.
+ The Log4j IOStreams API extension requires the Log4j 2 API. This component was introduced in Log4j 2.1.
</p>
</section>
<section name="Usage">
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5e630d1c/log4j-jcl/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/log4j-jcl/src/site/xdoc/index.xml b/log4j-jcl/src/site/xdoc/index.xml
index 484f5b7..aa80903 100644
--- a/log4j-jcl/src/site/xdoc/index.xml
+++ b/log4j-jcl/src/site/xdoc/index.xml
@@ -34,7 +34,7 @@
<section name="Requirements">
<p>
- The Commons Logging Bridge requires at least Java 6 and is dependent on the Log4j 2 API
+ The Commons Logging Bridge is dependent on the Log4j 2 API
and Commons Logging.
</p>
</section>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5e630d1c/log4j-jmx-gui/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/log4j-jmx-gui/src/site/xdoc/index.xml b/log4j-jmx-gui/src/site/xdoc/index.xml
index dc9ccd5..f732e4b 100644
--- a/log4j-jmx-gui/src/site/xdoc/index.xml
+++ b/log4j-jmx-gui/src/site/xdoc/index.xml
@@ -35,7 +35,7 @@
<section name="Requirements">
<p>
- The JMX GUI requires at least Java 6 and is dependent on Log4j 2 Core.
+ The JMX GUI is dependent on Log4j 2 Core.
</p>
</section>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5e630d1c/log4j-jul/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/log4j-jul/src/site/xdoc/index.xml b/log4j-jul/src/site/xdoc/index.xml
index 0d94907..b879666 100644
--- a/log4j-jul/src/site/xdoc/index.xml
+++ b/log4j-jul/src/site/xdoc/index.xml
@@ -35,7 +35,7 @@
</section>
<section name="Requirements">
<p>
- The JDK Logging Adapter requires at least Java 6 and is dependent on the Log4j API and optionally Log4j Core.
+ The JDK Logging Adapter is dependent on the Log4j API and optionally Log4j Core.
</p>
</section>
<section name="Usage">
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5e630d1c/log4j-liquibase/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/log4j-liquibase/src/site/xdoc/index.xml b/log4j-liquibase/src/site/xdoc/index.xml
index f054f46..46f70ba 100644
--- a/log4j-liquibase/src/site/xdoc/index.xml
+++ b/log4j-liquibase/src/site/xdoc/index.xml
@@ -19,7 +19,7 @@
<document>
<properties>
<title>Log4j 2 Liquibase Binding</title>
- <author email="mikael@staldal.nu">Mikael St�ldal</author>
+ <author email="mikael@staldal.nu">Mikael St�ldal</author>
</properties>
<body>
@@ -33,7 +33,7 @@
<section name="Requirements">
<p>
- The Log4j 2 Liquibase Binding requires at least Java 6 and has a dependency
+ The Log4j 2 Liquibase Binding has a dependency
on the Log4j 2 API as well as the Liquibase core.
</p>
</section>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5e630d1c/log4j-nosql/src/site/xdoc/index.xml.vm
----------------------------------------------------------------------
diff --git a/log4j-nosql/src/site/xdoc/index.xml.vm b/log4j-nosql/src/site/xdoc/index.xml.vm
index 93c68ad..3fb8caf 100644
--- a/log4j-nosql/src/site/xdoc/index.xml.vm
+++ b/log4j-nosql/src/site/xdoc/index.xml.vm
@@ -77,7 +77,7 @@
<section name="Requirements">
<p>
- The NoSQL Appenders requires at least Java 6.
+ The NoSQL Appenders is dependent on the Log4j 2 API and implementation.
</p>
</section>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5e630d1c/log4j-slf4j-impl/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/log4j-slf4j-impl/src/site/xdoc/index.xml b/log4j-slf4j-impl/src/site/xdoc/index.xml
index a6261eb..5b8af06 100644
--- a/log4j-slf4j-impl/src/site/xdoc/index.xml
+++ b/log4j-slf4j-impl/src/site/xdoc/index.xml
@@ -34,7 +34,7 @@
<section name="Requirements">
<p>
- The Log4j 2 SLF4J Binding requires at least Java 6 and has a dependency
+ The Log4j 2 SLF4J Binding has a dependency
on the Log4j 2 API as well as the SLF4J API.
</p>
</section>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5e630d1c/log4j-taglib/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/log4j-taglib/src/site/xdoc/index.xml b/log4j-taglib/src/site/xdoc/index.xml
index f993ba0..d6938b8 100644
--- a/log4j-taglib/src/site/xdoc/index.xml
+++ b/log4j-taglib/src/site/xdoc/index.xml
@@ -38,8 +38,8 @@
<section name="Requirements">
<p>
- The Log4j Tag Library requires at least Java 6, at least Servlet 2.5 (or Java EE 5), and at least
- JSP 2.1 (or Java EE 5).
+ The Log4j Tag Library requires at least Servlet 2.5 (or Java EE 5), at least
+ JSP 2.1 (or Java EE 5), and is dependent on the Log4j 2 API.
</p>
<p>
<b><em>Important Note!</em></b> For performance reasons, containers often ignore certain JARs known not to
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5e630d1c/log4j-to-slf4j/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/log4j-to-slf4j/src/site/xdoc/index.xml b/log4j-to-slf4j/src/site/xdoc/index.xml
index 90697f6..181c73b 100644
--- a/log4j-to-slf4j/src/site/xdoc/index.xml
+++ b/log4j-to-slf4j/src/site/xdoc/index.xml
@@ -36,7 +36,7 @@
<section name="Requirements">
<p>
- The Log4j 2 to SLF4J adapter requires at least Java 6.
+ The Log4j 2 to SLF4J adapter is dependent on the Log4j 2 API and the SLF4J API.
</p>
</section>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5e630d1c/log4j-web/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/log4j-web/src/site/xdoc/index.xml b/log4j-web/src/site/xdoc/index.xml
index d42f448..4d6cd33 100644
--- a/log4j-web/src/site/xdoc/index.xml
+++ b/log4j-web/src/site/xdoc/index.xml
@@ -51,7 +51,7 @@
<section name="Requirements">
<p>
- The Web module requires at least Java 6 and Servlet 2.5.
+ The Web module requires Servlet 2.5 and is dependent on the Log4j 2 API and implementation.
</p>
</section>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5e630d1c/src/site/xdoc/changelog.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/changelog.xml b/src/site/xdoc/changelog.xml
index 9d23125..66dd349 100644
--- a/src/site/xdoc/changelog.xml
+++ b/src/site/xdoc/changelog.xml
@@ -32,7 +32,7 @@
when upgrading to Log4j 2 in your project:</p>
<ul>
- <li>Log4j 2.4 and greater requires Java 7, version 2.3 required Java 6.</li>
+ <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 not supported.</li>
<li>Configuration via JSON or YAML is supported.</li>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5e630d1c/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index da1e833..7d72630 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -99,7 +99,7 @@
<subsection name="Requirements">
<p>
- Log4j 2.4 and greater requires Java 7, version 2.3 required Java 6.
+ Log4j 2.4 and greater requires Java 7, versions 2.0-alpha1 to 2.3 required Java 6.
Some features require optional dependencies; the documentation for these features specifies the
dependencies.
</p>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5e630d1c/src/site/xdoc/runtime-dependencies.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/runtime-dependencies.xml b/src/site/xdoc/runtime-dependencies.xml
index b671294..caf640d 100644
--- a/src/site/xdoc/runtime-dependencies.xml
+++ b/src/site/xdoc/runtime-dependencies.xml
@@ -28,6 +28,9 @@
Some Log4J features depend on external libraries. This page lists the required and optional
dependencies.
</p>
+ <p>
+ As of version 2.4, Log4J requires Java 7. Versions 2.3 and earlier require Java 6.
+ </p>
<a name="log4j-api" />
<h4>log4j-api</h4>