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

[jspwiki] 14/14: 2.11.0-M1-git-03

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 cdd4c8ce1c0d2dbdae0153f89338d25307e5bb01
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Oct 21 22:29:46 2018 +0200

    2.11.0-M1-git-03
---
 ChangeLog                                              | 16 ++++++++++++++++
 jspwiki-war/src/main/java/org/apache/wiki/Release.java |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 903c611..2cd2bed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2018-10-21  Juan Pablo Santos (juanpablo AT apache DOT org)
+
+       * 2.11.0-M1-git-03: Haddock is now the default template
+	     - to bring back the 2.10 template set the jspwiki.templateDir property to "210"
+
+	   * added the following pages to the core pages' bundles, as they enable some more haddock functionality
+	     - CSSBackgroundGradients: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Background%20Gradients
+	     - CSSBackgroundPatterns: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Background%20Patterns
+	     - CSSInstagramFilters: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Instagram%20Filters
+	     - CSSPrettifyThemeTomorrowNightBlue: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Prettify%20Theme%20Tomorrow%20Night%20Blue
+	     - CSSPrettifyThemeTomorrowPrism: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Prettify%20Theme%20Prism
+	     - CSSRibbon: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Ribbon
+	     - CSSStripedText: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Striped Text
+	     - CSSThemeCleanBlue: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Clean%20Blue%20Theme
+	     - CSSThemeDark: see https://jspwiki-wiki.apache.org/Wiki.jsp?page=Dark%20Theme
+
 2018-09-30  Juan Pablo Santos (juanpablo AT apache DOT org)
 
        * 2.11.0-M1-git-02: minimum required Servlet / JSP is now 3.1 / 2.3
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 8667c5e..f8ffdb4 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/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         = "2";
+    public static final String     BUILD         = "3";
 
     /**
      *  This is the generic version string you should use when printing out the version.  It is of