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/07 00:35:14 UTC
[jspwiki] 03/03: 2.11.0-M1-git-11
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 2c46e6b9fcf37dbe9e83b5eda56d1d1152e85877
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Dec 7 01:34:40 2018 +0100
2.11.0-M1-git-11
---
ChangeLog | 5 +++++
jspwiki-main/src/main/java/org/apache/wiki/Release.java | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 262c207..a52ae2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-12-07 Juan Pablo Santos (juanpablo AT apache DOT org)
+
+ * 2.11.0-M1-git-11: fix from 2.11.0.M1-rc1 - revert change from commit 87bf9b941fdf (Nov/11/2018)
+ that ended up causing lots of ClassCastException
+
2018-12-03 Juan Pablo Santos (juanpablo AT apache DOT org)
* prepare release for 2.11.0.M1
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 341492a..f837fae 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";
+ private static final String POSTFIX = "M1-git";
/** 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 = "";
+ public static final String BUILD = "11";
/**
* This is the generic version string you should use when printing out the version. It is of