[jspwiki] 03/03: 2.11.0-M6-git-03

[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

commit 8eb7d42b8ab299954acc741ed20ddbcd90c738cd
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Nov 1 17:27:38 2019 +0100

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

diff --git a/ChangeLog.md b/ChangeLog.md
index 56554b6..2191231 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,18 @@ specific language governing permissions and limitations
 under the License.
 -->
 
+**2019-11-01  Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.11.0-M6-git-03_
+
+* 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-10-12  Juan Pablo Santos (juanpablo AT apache DOT org)**
 
 * _2.11.0-M6-git-02_
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 6359706..1aa5031 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-02";
+    public static final String     BUILD         = "git-03";
 
     /**
      *  This is the generic version string you should use when printing out the version.  It is of