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/10/10 21:30:36 UTC

[jspwiki] 08/08: 2.11.0-M6-git-01

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 25c8b7278b5a613f1dcff108ab4fc1417057cfc1
Author: juanpablo <ju...@apache.org>
AuthorDate: Thu Oct 10 23:29:39 2019 +0200

    2.11.0-M6-git-01
---
 ChangeLog                                               | 11 +++++++++--
 jspwiki-main/src/main/java/org/apache/wiki/Release.java |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 98e3cfd..9bc95bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,17 @@
-2019-07-09  Dirk Frederickx (brushed AT apache DOT org)
+2019-10-10  Juan Pablo Santos (juanpablo AT apache DOT org)
+
+       * 2.11.0-M6-git-01
+
+       * Introduce Awaitility to speed up tests formerly relaying on Thread.sleep(..)
+
+       * LuceneSearchProvider now uses an Executor to increase performance on searches
+
+2019-12-09  Dirk Frederickx (brushed AT apache DOT org)
 
        * 2.11.0-M5-git-19
 
        * Fix javascript build error,  and some favicon errors.
 
-
 2019-10-09  Juan Pablo Santos (juanpablo AT apache DOT org)
 
        * 2.11.0-M5-git-18
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 9629946..e9d28f9 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       = "M5";
+    private static final String    POSTFIX       = "M6";
 
     /** 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         = "git-01";
 
     /**
      *  This is the generic version string you should use when printing out the version.  It is of