Merge branch 'develop' into issues/JAL-3553+JAL-3978+JAL-3989+JAL-4014_merged_with_de...

Took Issues Resolved (1 issue) from releases.html 2.11.2.3 row and put
in help/markdown/releases/release-2_11_2_3.md
and regenerated releases.html with
gradle releasesTemplates

diff --git a/RELEASE b/RELEASE
index 0757fc5..557e9d9 100644 (file)
--- a/RELEASE
+++ b/RELEASE
@@ -1,2 +1,2 @@
 jalview.release=releases/Release_2_11_2_Branch
-jalview.version=2.11.2.2
+jalview.version=2.11.2.3

diff --git a/THIRDPARTYLIBS b/THIRDPARTYLIBS
index a202e97..72ff49e 100644 (file)
--- a/THIRDPARTYLIBS
+++ b/THIRDPARTYLIBS
@@ -29,7 +29,7 @@ httpclient-4.0.3.jar
 httpcore-4.0.1.jar
 httpmime-4.0.3.jar
 intervalstore-v1.0.jar
-jabaws-min-client-NO_LOG4J-2.2.0.jar   Apache license
+jabaws-min-client-NO_LOG4J-2.2.1.jar   Apache license - pre-release of JABAWS 2.2.1 client built from https://source.jalview.org/crucible/changelog/jabaws?cs=586260b9f877e0954513fcffb0aa27eaddc5d0ff 
 java-json.jar
 jaxrpc.jar
 jersey-client-1.19.4.jar       CDDL 1.1 + GPL2 w/ CPE - http://glassfish.java.net/public/CDDL+GPL_1_1.html

diff --git a/help/help/html/releases.html b/help/help/html/releases.html
index 70db82f..536ae76 100644 (file)
--- a/help/help/html/releases.html
+++ b/help/help/html/releases.html
@@ -89,7 +89,23 @@ td.issues_resolved {
     <tr>
 
       <td class="release" align="center" valign="top" nowrap>
-        <strong><a id="Jalview.2">2</a><a id="Jalview.2.11">.11</a><a id="Jalview.2.11.2">.2</a><a id="Jalview.2.11.2.2">.2</a></strong>
+        <strong><a id="Jalview.2">2</a><a id="Jalview.2.11">.11</a><a id="Jalview.2.11.2">.2</a><a id="Jalview.2.11.2.3">.3</a></strong>
+        <br />
+        <em>12/05/2022</em>
+      </td>
+      <td class="new_features" align="left" valign="top">
+
+      </td>
+      <td class="issues_resolved" align="left" valign="top">
+<ul>
+<li>Validation fails when trying to configure custom JABAWS server <!-- JAL-4008 --></li>
+</ul>
+
+      </td>
+    </tr>
+
+      <td class="release" align="center" valign="top" nowrap>
+        <strong>2.11.2<a id="Jalview.2.11.2.2">.2</a></strong>
         <br />
         <em>19/04/2022</em>
       </td>

diff --git a/help/markdown/releases/release-2_11_2_3.md b/help/markdown/releases/release-2_11_2_3.md
new file mode 100644 (file)
index 0000000..81f32ee
--- /dev/null
+++ b/help/markdown/releases/release-2_11_2_3.md
@@ -0,0 +1,9 @@
+---
+version: 2.11.2.3
+date: 2022-05-12
+channel: "release"
+---
+
+## Issues Resolved
+
+- <!-- JAL-4008 --> Validation fails when trying to configure custom JABAWS server

diff --git a/j11lib/jabaws-min-client-NO_LOG4J-2.2.0.jar b/j11lib/jabaws-min-client-NO_LOG4J-2.2.0.jar
deleted file mode 100644 (file)
index 3838eeb..0000000
Binary files a/j11lib/jabaws-min-client-NO_LOG4J-2.2.0.jar and /dev/null differ

diff --git a/j11lib/jabaws-min-client-NO_LOG4J-2.2.1.jar b/j11lib/jabaws-min-client-NO_LOG4J-2.2.1.jar
new file mode 100644 (file)
index 0000000..99aeda5
Binary files /dev/null and b/j11lib/jabaws-min-client-NO_LOG4J-2.2.1.jar differ

diff --git a/j8lib/jabaws-min-client-NO_LOG4J-2.2.0.jar b/j8lib/jabaws-min-client-NO_LOG4J-2.2.0.jar
deleted file mode 100644 (file)
index 3838eeb..0000000
Binary files a/j8lib/jabaws-min-client-NO_LOG4J-2.2.0.jar and /dev/null differ

diff --git a/j8lib/jabaws-min-client-NO_LOG4J-2.2.1.jar b/j8lib/jabaws-min-client-NO_LOG4J-2.2.1.jar
new file mode 100644 (file)
index 0000000..99aeda5
Binary files /dev/null and b/j8lib/jabaws-min-client-NO_LOG4J-2.2.1.jar differ