[jspwiki] 14/14: 2.11.0-M6-git-05

[ju...@apache.org]

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 4c517135f1cead730c74fe12250d1e55b2472a0f
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Dec 6 23:39:50 2019 +0100

    2.11.0-M6-git-05
---
 ChangeLog.md                                         | 20 ++++++++++++++++++++
 .../src/main/java/org/apache/wiki/Release.java       |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index b8f853c..a040a6e 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,26 @@ specific language governing permissions and limitations
 under the License.
 -->
 
+**2019-11-01  Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.11.0-M6-git-05_
+
+* Couple of methods moved out of `WikiEngine`
+    * `safeGetQueryParameter`: moved as an static method on `HttpUtil`; it now requires content encoding as a parameter
+    * `getRequiredProperty`: moved back as an static method to `TextUtil` - it now throws a `NoSuchElementException` (unchecked) instead of `NoRequiredPropertyException` (checked)
+
+* Maven plugins changes
+    * Change javadocs' doclet to [UMLDoclet](https://github.com/talsma-ict/umldoclet), which can be used with JDK >= 9 (see associated note on [`mvn_cheat-sheet.md`](https://github.com/apache/jspwiki/blob/master/mvn_cheat-sheet.md#3-reports-specific) for details)
+    * Set `compilerVersion` to `jdk.version` on jspc-maven-plugin 
+  
+* Dependency updates
+    * Flexmark to 0.50.44
+    * Lucene to 8.3.1
+    * Selenide to 5.5.1
+    * SLF4J to 1.7.29
+    * Tika to 1.23
+    * Tomcat to 8.5.49
+
 **2019-11-05  Juan Pablo Santos (juanpablo AT apache DOT org)**
 
 * _2.11.0-M6-git-04_
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 c74aaad..c2f10c9 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "git-04";
+    public static final String     BUILD         = "git-05";
 
     /**
      *  This is the generic version string you should use when printing out the version.  It is of