From: Jim Procter <j.procter@dundee.ac.uk>
Date: Thu, 6 Jan 2022 09:45:17 +0000 (+0000)
Subject: Merge branch 'task/JAL-3934_update_log4j_again' into releases/Release_2_11_1_Branch
X-Git-Tag: Release_2_11_1_6~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=3ae956df5741ab7750035573ae876b9eb0b1f429;hp=2c0496537b3ea1fb76dca30c7c3b5d87c0333260;p=jalview.git

Merge branch 'task/JAL-3934_update_log4j_again' into releases/Release_2_11_1_Branch
---

diff --git a/RELEASE b/RELEASE
index 1acd0a7..70525f7 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,2 +1,2 @@
 jalview.release=releases/Release_2_11_1_Branch
-jalview.version=2.11.1.5
+jalview.version=2.11.1.6
diff --git a/help/help/html/releases.html b/help/help/html/releases.html
index 9d3c568..42dd7d7 100755
--- a/help/help/html/releases.html
+++ b/help/help/html/releases.html
@@ -56,6 +56,20 @@ li:before {
       <th><em>New Features</em></th>
       <th><em>Issues Resolved</em></th>
     </tr>
+        <tr>
+      <td width="60" align="center" nowrap><strong><a
+          id="Jalview.2.11.1">2.11.1</a><a id="Jalview.2.11.1.6">.6</a><br />
+          <em>6/01/2022</em></strong></td>
+
+      <td align="left" valign="top"><em>Security</em>
+        <ul>
+          <li>
+            <!-- JAL-3934 -->Version bump library dependency: Log4j 2.16.0 to 2.17.0.
+            </li>
+        </ul></td>
+      <td>
+      </td>
+    </tr>
     <tr>
       <td width="60" align="center" nowrap><strong><a
           id="Jalview.2.11.1">2.11.1</a><a id="Jalview.2.11.1.5">.5</a><br />
diff --git a/j11lib/log4j-1.2-api-2.16.0.jar b/j11lib/log4j-1.2-api-2.17.0.jar
similarity index 50%
rename from j11lib/log4j-1.2-api-2.16.0.jar
rename to j11lib/log4j-1.2-api-2.17.0.jar
index 6bfe217..a361ddc 100644
Binary files a/j11lib/log4j-1.2-api-2.16.0.jar and b/j11lib/log4j-1.2-api-2.17.0.jar differ
diff --git a/j11lib/log4j-api-2.16.0.jar b/j11lib/log4j-api-2.17.0.jar
similarity index 72%
rename from j11lib/log4j-api-2.16.0.jar
rename to j11lib/log4j-api-2.17.0.jar
index 2cdcc4b..77af535 100644
Binary files a/j11lib/log4j-api-2.16.0.jar and b/j11lib/log4j-api-2.17.0.jar differ
diff --git a/j8lib/log4j-core-2.16.0.jar b/j11lib/log4j-core-2.17.0.jar
similarity index 77%
rename from j8lib/log4j-core-2.16.0.jar
rename to j11lib/log4j-core-2.17.0.jar
index bc913bc..256ff3d 100644
Binary files a/j8lib/log4j-core-2.16.0.jar and b/j11lib/log4j-core-2.17.0.jar differ
diff --git a/j8lib/log4j-slf4j18-impl-2.16.0.jar b/j11lib/log4j-slf4j18-impl-2.17.0.jar
similarity index 70%
rename from j8lib/log4j-slf4j18-impl-2.16.0.jar
rename to j11lib/log4j-slf4j18-impl-2.17.0.jar
index ad6dd5b..43b077b 100644
Binary files a/j8lib/log4j-slf4j18-impl-2.16.0.jar and b/j11lib/log4j-slf4j18-impl-2.17.0.jar differ
diff --git a/j8lib/log4j-1.2-api-2.16.0.jar b/j8lib/log4j-1.2-api-2.17.0.jar
similarity index 50%
rename from j8lib/log4j-1.2-api-2.16.0.jar
rename to j8lib/log4j-1.2-api-2.17.0.jar
index 6bfe217..a361ddc 100644
Binary files a/j8lib/log4j-1.2-api-2.16.0.jar and b/j8lib/log4j-1.2-api-2.17.0.jar differ
diff --git a/j8lib/log4j-api-2.16.0.jar b/j8lib/log4j-api-2.17.0.jar
similarity index 72%
rename from j8lib/log4j-api-2.16.0.jar
rename to j8lib/log4j-api-2.17.0.jar
index 2cdcc4b..77af535 100644
Binary files a/j8lib/log4j-api-2.16.0.jar and b/j8lib/log4j-api-2.17.0.jar differ
diff --git a/j11lib/log4j-core-2.16.0.jar b/j8lib/log4j-core-2.17.0.jar
similarity index 77%
rename from j11lib/log4j-core-2.16.0.jar
rename to j8lib/log4j-core-2.17.0.jar
index bc913bc..256ff3d 100644
Binary files a/j11lib/log4j-core-2.16.0.jar and b/j8lib/log4j-core-2.17.0.jar differ
diff --git a/j11lib/log4j-slf4j18-impl-2.16.0.jar b/j8lib/log4j-slf4j18-impl-2.17.0.jar
similarity index 70%
rename from j11lib/log4j-slf4j18-impl-2.16.0.jar
rename to j8lib/log4j-slf4j18-impl-2.17.0.jar
index ad6dd5b..43b077b 100644
Binary files a/j11lib/log4j-slf4j18-impl-2.16.0.jar and b/j8lib/log4j-slf4j18-impl-2.17.0.jar differ