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 2018/12/03 18:58:33 UTC
[jspwiki] branch master updated: prepare release for 2.11.0.M1
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 487ff84 prepare release for 2.11.0.M1
487ff84 is described below
commit 487ff84eb7a94977fb74e8c53025acd7f3e132b4
Author: juanpablo <ju...@apache.org>
AuthorDate: Mon Dec 3 19:57:58 2018 +0100
prepare release for 2.11.0.M1
---
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 1594dba..262c207 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-12-03 Juan Pablo Santos (juanpablo AT apache DOT org)
+
+ * prepare release for 2.11.0.M1
+
2018-11-20 Juan Pablo Santos (juanpablo AT apache DOT org)
* 2.11.0-M1-git-10: backwards-incompatible change - move TextUtil.getRequiredProperty to WikiEngine
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 24a57df..341492a 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 = "M1-git";
+ private static final String POSTFIX = "M1";
/** 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 = "10";
+ public static final String BUILD = "";
/**
* This is the generic version string you should use when printing out the version. It is of