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/01/25 17:55:09 UTC
[jspwiki] branch master updated: prepare another rc 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 3558fb4 prepare another rc release for 2.11.0.M1
3558fb4 is described below
commit 3558fb4ac0bdd6fbef2a773735a9371fe7072fef
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Jan 25 18:54:21 2019 +0100
prepare another rc 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 8e392b7..60339c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2019-01-20 Juan Pablo Santos (juanpablo AT apache DOT org)
+ * prepare release for 2.11.0.M1
+
+2019-01-20 Juan Pablo Santos (juanpablo AT apache DOT org)
+
* 2.11.0-M1-git-15: JSPWIKI-1086 - selenide-based functional tests infrastructure + login/logout
associated tests (selenium tests currently kept for reference)
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 eaaf2dc..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 = "15";
+ public static final String BUILD = "";
/**
* This is the generic version string you should use when printing out the version. It is of