You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2019/08/23 22:43:53 UTC

[jspwiki] 03/03: 2.11.0-M5-git-12

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 d9f17df63726571e2a9e3bea6330604ee0c5c4c6
Author: juanpablo <ju...@apache.org>
AuthorDate: Sat Aug 24 00:42:47 2019 +0200

    2.11.0-M5-git-12
---
 ChangeLog                                               | 8 ++++++++
 jspwiki-main/src/main/java/org/apache/wiki/Release.java | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 888681f..db14b86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2019-21-08  Juan Pablo Santos (juanpablo AT apache DOT org)
+
+       * 2.11.0-M5-git-12
+
+       * [JSPWIKI-1115]: Upgrade flexmark to 0.50.28 and tomcat to 8.5.45
+
+       * Ended up removing/replacing all @Deprecated code
+
 2019-21-08  Dirk Frederickx (brushed AT apache DOT org)
 
        * 2.11.0-M5-git-11
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 5763e00..cc2852a 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         = "11";
+    public static final String     BUILD         = "12";
 
     /**
      *  This is the generic version string you should use when printing out the version.  It is of