[jspwiki] branch master updated: 2.11.0-M6-git-04

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git


The following commit(s) were added to refs/heads/master by this push:
     new b86466f  2.11.0-M6-git-04
b86466f is described below

commit b86466f2db5d21666537e336c6f252244b8abd4e
Author: juanpablo <ju...@apache.org>
AuthorDate: Tue Nov 5 20:19:19 2019 +0100

    2.11.0-M6-git-04
---
 ChangeLog.md                                            | 15 +++++++++++++++
 jspwiki-main/src/main/java/org/apache/wiki/Release.java |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 2191231..cfd62c7 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,21 @@ specific language governing permissions and limitations
 under the License.
 -->
 
+**2019-11-05  Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.11.0-M6-git-04_
+
+* [JSPWIKI-JSPWIKI-1120](https://issues.apache.org/jira/browse/JSPWIKI-JSPWIKI-1120): Strings and Boxed types should be compared using "equals()". 
+  Contributed by Haris Adzemovic, thanks!
+
+* Bringing in Docker support to ASF repo from https://github.com/metskem/docker-jspwiki. 
+  See https://jspwiki-wiki.apache.org/Wiki.jsp?page=Docker for details.
+  
+* Dependency updates
+  * Flexmark to 0.50.42
+  * Selenide to 5.5.0
+  * Tomcat to 8.5.47
+
 **2019-11-01  Juan Pablo Santos (juanpablo AT apache DOT org)**
 
 * _2.11.0-M6-git-03_
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/Release.java b/jspwiki-main/src/main/java/org/apache/wiki/Release.java
index 1aa5031..c74aaad 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "git-03";
+    public static final String     BUILD         = "git-04";
 
     /**
      *  This is the generic version string you should use when printing out the version.  It is of