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 3089002c8fc3969b24957ee8815b430ec0833e3c Author: Juan Pablo Santos RodrÃguez <[email protected]> AuthorDate: Thu Dec 2 22:53:54 2021 +0100 2.11.1-git-01 --- ChangeLog.md | 35 +++++++++++++++++++++- .../src/main/java/org/apache/wiki/api/Release.java | 6 ++-- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index ac60dd7..e43ba4b 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -17,12 +17,45 @@ specific language governing permissions and limitations under the License. --> +**2021-12-02 Juan Pablo Santos (juanpablo AT apache DOT org)** + +* _2.11.1-git-01_ + +* Cache management moved to a new maven module, jspwiki-cache + * Cache backend can now be overriden by providing a custom CachingManager via [classmappings-extra.xml](https://jspwiki-wiki.apache.org/Wiki.jsp?page=JSPWikiPublicAPI#section-JSPWikiPublicAPI-RegisteringCustomManagersInTheWikiEngine) + * Default cache manager remains ehcache-based, with default configuration file located at ehcache-jspwiki.xml + * Tests wanting to invalidate cache(s) should call either `Engine#shutdown()` or `Engine#getManager( CachingManager.class ).shutdown()` + * The `jspwiki.cache.config-file` setting on the `jspwiki[-custom].properties` file allows to use a custom ehcache configuration file, located elsewhere on classpath + * Fixed [JSPWIKI-873](https://issues.apache.org/jira/projects/JSPWIKI/issues/JSPWIKI-873) - AttachmentManager#getAllAttachments() does not return more than exactly 1000 attachments + +* Introduced `TextUtil#get[Required|String]Property( Properties, String key, String deprecatedKey[, String defval] )` to allow deprecation of properties, so they can be removed later on + * Deprecated key will be looked first and, if found, a warning will be logged asking to move to the new property + * If there's no deprecated key on the properties set, the normal key will be looked, and if not found, the default value will be returned (or exception thrown) + * The idea is to move related configuration towards common "namespaces" + * A few properties are deprecated + * `jspwiki.usePageCache` -> `jspwiki.cache.enable` should be used instead + * `jspwiki.attachmentProvider` -> `jspwiki.attachment.provider` should be used instead + * `jspwiki.attachmentProvider.adapter.impl` -> `jspwiki.attachment.provider.adapter.impl` should be used instead + +* `WikiEngine#initComponent()` now asks the `mappedClass` if is `Initializable` instead of asking the `requestedClass` on `classmappings.xml`. + * This allows to decouple `Initializable` from the mapped managers, as it should only matter if their implementations are `Initializable` in order to init them. + +* Moved site generation to [jspwiki-site's Jenkinsfile](https://github.com/apache/jspwiki-site/blob/jbake/Jenkinsfile) + * This second build is decoupled from the main one, so CI feedback is gathered faster + +* Dockerfile's maven build does not rely on jspwiki-main:tests being available on a repo, thus avoiding [#1](https://jspwiki-wiki.apache.org/Wiki.jsp?page=Common%20problems%20when%20building%20JSPWiki#section-Common+problems+when+building+JSPWiki-JspwikiMainJarTestsX.Y.ZNotFoundAtJspwikiMarkdown) when building new versions + +* Dependency updates + * Awaitility to 4.1.1, thanks to dependabot [#152](https://github.com/apache/jspwiki/pull/152) + * JUnit to 5.8.2 + * Selenide to 6.1.1 + **2021-11-18 Juan Pablo Santos (juanpablo AT apache DOT org)** * _2.11.0-git-14_ * [JSPWIKI-1160](https://issues.apache.org/jira/browse/JSPWIKI-1160) - Ensure JSPWiki builds with JDKs 8, 11 and 17 - + * Dependency updates * Lucene to 8.11.0 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 21a1f86..15fa87a 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 = ""; + private static final String POSTFIX = "-git-"; /** The JSPWiki major version. */ public static final int VERSION = 2; @@ -59,7 +59,7 @@ public final class Release { public static final int REVISION = 11; /** The minor revision. */ - public static final int MINORREVISION = 0; + public static final int MINORREVISION = 1; /** The build number/identifier. This is a String as opposed to an integer, just so that people can add other identifiers to it. * The build number is incremented every time a committer checks in code, and reset when a release is made. @@ -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 = "01"; /** * This is the generic version string you should use when printing out the version. It is of
