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/08/31 16:38:02 UTC
[jspwiki] 04/04: preparing 2.10.5 release
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 1d781de7b1de429e3ab31066ec4c5ff2c82ea6b2
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Aug 31 18:37:20 2018 +0200
preparing 2.10.5 release
---
ChangeLog | 6 ++++++
jspwiki-war/src/main/java/org/apache/wiki/Release.java | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ad8d94e..756022e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-08-31 Juan Pablo Santos (juanpablo AT apache DOT org)
+
+ * update flexmark to 0.34.22 and ASF parent pom to 21
+
+ * prepare release for 2.10.5
+
2018-08-31 Siegfried Goeschl (sgoeschl@apache.org)
* 2.10.5-git-09 : JSPWIKI-1073 Upgrade the jspwiki-portable build
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Release.java b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
index 0662e20..3db1eae 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/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 = "git";
+ private static final String POSTFIX = "";
/** 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 = "9";
+ public static final String BUILD = "";
/**
* This is the generic version string you should use when printing out the version. It is of