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 4d7028a0b70d3e761af6591b86c43a8e3a8d61f3 Author: Juan Pablo Santos RodrÃguez <[email protected]> AuthorDate: Thu Dec 17 20:50:04 2020 +0100 2.11.0-git-01 --- ChangeLog.md | 13 ++++++++++++- jspwiki-api/src/main/java/org/apache/wiki/api/Release.java | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 8b818be..cc0b14f 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -17,6 +17,17 @@ specific language governing permissions and limitations under the License. --> +**2020-12-17 Juan Pablo Santos (juanpablo AT apache DOT org)** + +* _2.11.0-git-01_ + +* [JSPWIKI-1136](https://issues.apache.org/jira/browse/JSPWIKI-1136 ) - Refine Class member fields + * Merged [PR #16](https://github.com/apache/jspwiki/pull/16), contributed by Arturo Bernal, thanks! + +* Dependency updates + * Gson to 2.8.6 + * Tomcat to 9.0.41 + **2020-12-01 Juan Pablo Santos (juanpablo AT apache DOT org)** * _2.11.0-M8-git-06_ @@ -76,7 +87,7 @@ under the License. * _2.11.0-M8-git-02_ -* [JSPWIKI-1114](https://issues.apache.org/jira/browse/JSPWIKI-1131): Show only part of Weblog entry on the overview page. +* [JSPWIKI-1114](https://issues.apache.org/jira/browse/JSPWIKI-1114): Show only part of Weblog entry on the overview page. * Preview parameter cutting now only at newlines, patch suggested by Ulf Dittmer - thanks! * LuceneSearchProvider using now NIOFSDirectory instead of (deprecated) SimpleFSDirectory. Also, all Lucene's index diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java index b7edc8b..9dbfc0e 100644 --- a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java +++ b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java @@ -50,7 +50,7 @@ public final class Release { * <p> * If the POSTFIX is empty, it is not added to the version string. */ - private static final String POSTFIX = "M8"; + private static final String POSTFIX = ""; /** The JSPWiki major version. */ public static final int VERSION = 2; @@ -69,7 +69,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 = "git-01"; /** * This is the generic version string you should use when printing out the version. It is of
