You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by br...@apache.org on 2019/02/03 12:24:04 UTC
[jspwiki] branch master updated: 2.11.0-M2-git-01: resolve
JSPWIKI-1090
This is an automated email from the ASF dual-hosted git repository.
brushed pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new 21cf918 2.11.0-M2-git-01: resolve JSPWIKI-1090
21cf918 is described below
commit 21cf91819358a04bd3ae6c6067ce43454e8acd70
Author: brushed <di...@gmail.com>
AuthorDate: Sun Feb 3 13:12:38 2019 +0100
2.11.0-M2-git-01: resolve JSPWIKI-1090
JSPWIKI-1090: Fixed READER view, bug caused by the rename of the HADDOCK template
---
ChangeLog | 18 ++++++++++++------
.../src/main/java/org/apache/wiki/Release.java | 4 ++--
.../src/main/webapp/templates/reader/ViewTemplate.jsp | 2 +-
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b53a8ea..2ef205c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,21 @@
+2019-02-24 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.11.0-M2-git-01
+
+ * JSPWIKI-1090: Fixed READER view, bug caused by the rename of the HADDOCK template
+
2019-01-25 Juan Pablo Santos (juanpablo AT apache DOT org)
* prepare release for 2.11.0.M1
2019-01-20 Juan Pablo Santos (juanpablo AT apache DOT org)
- * 2.11.0-M1-git-15: JSPWIKI-1086 - selenide-based functional tests infrastructure + login/logout
+ * 2.11.0-M1-git-15: JSPWIKI-1086 - selenide-based functional tests infrastructure + login/logout
associated tests (selenium tests currently kept for reference)
* JSPWIKI-1085 - JSPWiki locale can be set server-side - to determine the locale used, the following order is used:
1.- user-preference settings
- 2.- if not set, see if there is a locale set server-side, as noted by
+ 2.- if not set, see if there is a locale set server-side, as noted by
jspwiki.preferences.default-locale setting on jspwiki[-custom].properties
3.- if not set, browser's preferred language setting
4.- if not set, JVM's default
@@ -17,7 +23,7 @@
* JSPWIKI-1087 - upgrade bundled dependencies
- commons-fileupload to 1.4
- flexmark to 0.40.12
- - hsqldb updated to 2.4.1
+ - hsqldb updated to 2.4.1
- cargo plugin to 1.7.1
2018-12-25 Juan Pablo Santos (juanpablo AT apache DOT org)
@@ -29,7 +35,7 @@
- junit to 5.3.2
- lucene to 7.6.0
- tomcat to 8.5.37
-
+
* escape entities on Captcha.jsp request parameters
* JSPWIKI-1084 - Jenkinsfile now builds both source and website, jspwiki-site job can still be triggered manually
@@ -51,7 +57,7 @@
2018-12-07 Juan Pablo Santos (juanpablo AT apache DOT org)
- * 2.11.0-M1-git-11: JSPWIKI-1082 - fix from 2.11.0.M1-rc1 - revert change from commit
+ * 2.11.0-M1-git-11: JSPWIKI-1082 - fix from 2.11.0.M1-rc1 - revert change from commit
87bf9b941fdf (Nov/11/2018) that ended up causing lots of ClassCastException
2018-12-03 Juan Pablo Santos (juanpablo AT apache DOT org)
@@ -78,7 +84,7 @@
2018-11-05 Juan Pablo Santos (juanpablo AT apache DOT org)
- * 2.11.0-M1-git-08: JSPWIKI-1080 try to load as many external third-party plugin jars as possible,
+ * 2.11.0-M1-git-08: JSPWIKI-1080 try to load as many external third-party plugin jars as possible,
instead of all-or-nothing
* small backwards-incompatible changes:
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 341492a..10844e9 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 = "M1";
+ private static final String POSTFIX = "M2-git";
/** 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 = "01";
/**
* This is the generic version string you should use when printing out the version. It is of
diff --git a/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp b/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp
index ae1e7a5..6b4fa4b 100644
--- a/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp
+++ b/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp
@@ -74,7 +74,7 @@ String.I18N.PREFIX = "javascript.";
<%-- FIXME: for now, reuse haddock's stylesheet --%>
<link rel="stylesheet" media="screen, projection, print" type="text/css"
- href="<wiki:Link format='url' templatefile='../../templates/haddock/haddock.css'/>"/>
+ href="<wiki:Link format='url' templatefile='../../templates/default/haddock.css'/>"/>
</head>