This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new a238a6f Updates production by Jenkins
a238a6f is described below
commit a238a6f99ad75499b7b035c714d3f7970280ae44
Author: jenkins <bui...@apache.org>
AuthorDate: Thu Dec 7 06:30:46 2017 +0000
Updates production by Jenkins
---
content/downloads.html | 12 +++---
.../how-to-create-a-struts2-web-application.html | 45 ++++++++++++----------
2 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/content/downloads.html b/content/downloads.html
index 80e118a..35166f9 100644
--- a/content/downloads.html
+++ b/content/downloads.html
@@ -250,7 +250,7 @@
<td>
</td>
<td>
- <a href="/docs/version-notes-2334.html">Version notes</a>
+ <a
href="https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.3.34";>Version
notes</a>
</td>
</tr>
@@ -291,7 +291,7 @@
<td>
</td>
<td>
- <a href="/docs/version-notes-2333.html">Version notes</a>
+ <a
href="https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.3.33";>Version
notes</a>
</td>
</tr>
<tr>
@@ -310,7 +310,7 @@
<a href="/docs/s2-047.html">S2-047</a>
</td>
<td>
- <a href="/docs/version-notes-25101.html">Version notes</a>
+ <a
href="https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.5.10.1";>Version
notes</a>
</td>
</tr>
<tr>
@@ -322,7 +322,7 @@
<a href="/docs/s2-048.html">S2-048</a>
</td>
<td>
- <a href="/docs/version-notes-2332.html">Version notes</a>
+ <a
href="https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.3.32";>Version
notes</a>
</td>
</tr>
<tr>
@@ -342,7 +342,7 @@
<a href="/docs/s2-045.html">S2-045</a>
</td>
<td>
- <a href="/docs/version-notes-2510.html">Version notes</a>
+ <a
href="https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.5.10";>Version
notes</a>
</td>
</tr>
<tr>
@@ -362,7 +362,7 @@
<a href="/docs/s2-045.html">S2-045</a>
</td>
<td>
- <a href="/docs/version-notes-258.html">Version notes</a>
+ <a
href="https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.5.8";>Version
notes</a>
</td>
</tr>
<tr>
diff --git
a/content/getting-started/how-to-create-a-struts2-web-application.html
b/content/getting-started/how-to-create-a-struts2-web-application.html
index 347a8da..b3fd7d5 100644
--- a/content/getting-started/how-to-create-a-struts2-web-application.html
+++ b/content/getting-started/how-to-create-a-struts2-web-application.html
@@ -278,24 +278,8 @@ you do not need to specify a separate dependency node for
javassist.</p>
<h3 id="step-4---add-logging">Step 4 - Add Logging</h3>
-<p>To see what’s happening under the hood, the example application for this
tutorial uses log4j2. You’ll need to add a dependency node for log4j2 to the
pom:</p>
-
-<p><strong>pom.xml log4j dependency node</strong></p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code><span
class="nt"><dependency></span>
- <span class="nt"><groupId></span>org.apache.logging.log4j<span
class="nt"></groupId></span>
- <span class="nt"><artifactId></span>log4j-core<span
class="nt"></artifactId></span>
- <span class="nt"><version></span>${log4j2.version}<span
class="nt"></version></span>
-<span class="nt"></dependency></span>
-<span class="nt"><dependency></span>
- <span class="nt"><groupId></span>org.apache.logging.log4j<span
class="nt"></groupId></span>
- <span class="nt"><artifactId></span>log4j-api<span
class="nt"></artifactId></span>
- <span class="nt"><version></span>${log4j2.version}<span
class="nt"></version></span>
-<span class="nt"></dependency></span>
-</code></pre>
-</div>
-
-<p>Using both <code class="highlighter-rouge">log4j-core</code> and <code
class="highlighter-rouge">log4j-api</code> allows to use <a
href="//logging.apache.org/log4j/2.x/maven-artifacts.html">the latest version
of Log4j2</a> without a clash with version provided by the framework. Setup a
<code class="highlighter-rouge">log4j2.xml</code> configuration in the <code
class="highlighter-rouge">src/main/resources</code> folder which contains the
following</p>
+<p>To see what’s happening under the hood, the example application for this
tutorial uses log4j2.
+Setup a <code class="highlighter-rouge">log4j2.xml</code> configuration in the
<code class="highlighter-rouge">src/main/resources</code> folder which contains
the following</p>
<p><strong>log4j2.xml</strong></p>
@@ -319,15 +303,36 @@ you do not need to specify a separate dependency node for
javassist.</p>
<p>Note the above log4j2 configuration specifies the console as the log
target.</p>
+<p>You’ll need to add a dependency node for log4j2 to the pom:</p>
+
+<p><strong>pom.xml log4j dependency node</strong></p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span
class="nt"><dependency></span>
+ <span class="nt"><groupId></span>org.apache.logging.log4j<span
class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>log4j-core<span
class="nt"></artifactId></span>
+ <span class="nt"><version></span>${log4j2.version}<span
class="nt"></version></span>
+<span class="nt"></dependency></span>
+<span class="nt"><dependency></span>
+ <span class="nt"><groupId></span>org.apache.logging.log4j<span
class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>log4j-api<span
class="nt"></artifactId></span>
+ <span class="nt"><version></span>${log4j2.version}<span
class="nt"></version></span>
+<span class="nt"></dependency></span>
+</code></pre>
+</div>
+
+<p>Using both <code class="highlighter-rouge">log4j-core</code> and <code
class="highlighter-rouge">log4j-api</code> allows to use <a
href="//logging.apache.org/log4j/2.x/maven-artifacts.html">the latest version
of Log4j2</a> without a clash with version provided by the framework.</p>
+
<p>Optionally, if using maven bom “bill of materials” in <code
class="highlighter-rouge">dependencyManagement</code> section for both Struts
and log4j2,
-<code class="highlighter-rouge">pom.xml</code> will look like. Note that this
way you can omit <code class="highlighter-rouge">version</code> line for every
used module</p>
+<code class="highlighter-rouge">pom.xml</code> will look like. Note that this
way you can omit <code class="highlighter-rouge">version</code> line for every
used module,
+and all <code class="highlighter-rouge">struts2-*</code> and <code
class="highlighter-rouge">log4j-*</code> modules are managed to be of the same
version.
+The <code class="highlighter-rouge">struts2-bom</code> is available since
2.3.20.</p>
<div class="highlighter-rouge"><pre class="highlight"><code><span
class="nt"><properties></span>
<span class="nt"><project.build.sourceEncoding></span>UTF-8<span
class="nt"></project.build.sourceEncoding></span>
<span
class="nt"><project.reporting.outputEncoding></span>UTF-8<span
class="nt"></project.reporting.outputEncoding></span>
<span class="nt"><java.version></span>1.8<span
class="nt"></java.version></span>
- <span class="nt"><struts2.version></span>2.5.14<span
class="nt"></struts2.version></span>
+ <span class="nt"><struts2.version></span>2.5.14.1<span
class="nt"></struts2.version></span>
<span class="nt"><log4j2.version></span>2.10.0<span
class="nt"></log4j2.version></span>
<span class="nt"></properties></span>
--
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" <commits@struts.apache.org>'].
