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/05/11 12:24:51 UTC

[jspwiki] 02/02: prepare release for 2.11.0.M4

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 0a1ec7e139783515220c285be3b1cadfc077745d
Author: juanpablo <ju...@apache.org>
AuthorDate: Sat May 11 14:24:29 2019 +0200

    prepare release for 2.11.0.M4
---
 ChangeLog                                               | 4 ++++
 jspwiki-main/src/main/java/org/apache/wiki/Release.java | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0cbcd3b..fa9c6b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-05-11  Juan Pablo Santos (juanpablo AT apache DOT org)
+
+       * prepare release for 2.11.0.M4
+
 2019-05-02  Juan Pablo Santos (juanpablo AT apache DOT org)
 
        * 2.11.0-M4-git-13
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 ee0ef7f..f40c625 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/Release.java
@@ -52,7 +52,7 @@ public final class Release {
      *  <p>
      *  If the POSTFIX is empty, it is not added to the version string.
      */
-    private static final String    POSTFIX       = "M4-git";
+    private static final String    POSTFIX       = "M4";
 
     /** The JSPWiki major version. */
     public static final int        VERSION       = 2;
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "13";
+    public static final String     BUILD         = "";
 
     /**
      *  This is the generic version string you should use when printing out the version.  It is of