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
commit 7d92f33b0ccf8d006a38db84b352e875e3469f14 Merge: f3e172351 78dd01566 Author: brushed <[email protected]> AuthorDate: Sun Mar 26 21:31:11 2023 +0200 Merge branch 'master' of https://github.com/apache/jspwiki .asf.yaml | 21 +++++- ChangeLog.md | 30 +++++++- LICENSE | 80 ++++++++++----------- .../main/java/org/apache/wiki/api/core/Engine.java | 3 + .../src/main/java/org/apache/wiki/WikiEngine.java | 4 +- .../org/apache/wiki/auth/DefaultUserManager.java | 2 +- .../wiki/references/DefaultReferenceManager.java | 2 +- .../apache/wiki/search/DefaultSearchManager.java | 2 +- .../wiki/ui/progress/DefaultProgressManager.java | 2 +- .../src/main/resources/ini/jspwiki.properties | 14 +++- jspwiki-portable/pom.xml | 2 +- .../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 35074 -> 35213 bytes .../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49000 -> 48971 bytes .../src/overlay/launchers/tomcat/woas.exe | Bin 3674840 -> 3682537 bytes .../org/apache/wiki/util/CommentedProperties.java | 2 +- .../java/org/apache/wiki/util/PropertyReader.java | 3 +- .../java/org/apache/wiki/util/CryptoUtilTest.java | 2 +- jspwiki-war/src/main/webapp/Install.jsp | 6 +- pom.xml | 44 ++++++------ 19 files changed, 141 insertions(+), 78 deletions(-) diff --cc ChangeLog.md index 2a43a250f,2c44c1a7f..c044b4fdc --- a/ChangeLog.md +++ b/ChangeLog.md @@@ -16,13 -16,35 +16,41 @@@ KIND, either express or implied. See t specific language governing permissions and limitations under the License. --> + **2023-03-24 Juan Pablo Santos (juanpablo AT apache DOT org)** + + * _2.12.0-git-04_ + + * ReferenceManager implementation can be set via `jspwiki.refManager` property on your `jspwiki[-custom].properties` file + * The provided implementation is expected to have a constructor receiving only an `Engine` + + * `.html`, `.htm` and `.js` attachments are now forcibly downloaded by default, if you want to open them rather than + downloading them, set the `jspwiki.attachment.forceDownload` property to empty on your `jspwiki[-custom].properties` file + + * Fixed CSS file used by Install.jsp - now that's a pretty jsp to look at! + + * Merged PRs [#231](https://github.com/apache/jspwiki/pull/231) and [#235](https://github.com/apache/jspwiki/pull/235), provided by [Arturo Bernal](https://github.com/arturobernalg), thanks! + + * Dependency updates + * commons-fileupload to 1.5 (closes [#260](https://github.com/apache/jspwiki/pull/260)), thanks to dependabot + * JUnit to 5.9.2 + * HSQLDB to 2.7.1 (closes [#244](https://github.com/apache/jspwiki/pull/244)), thanks to dependabot + * jetty-all to 9.4.51.v20230217 (closes [#261](https://github.com/apache/jspwiki/pull/261)), thanks to dependabot + * Log4j2 to 2.20.0 + * Lucene to 9.5.0 + * Mockito to 5.2.0 + * Selenide to 6.12.4 + * Tika to 2.7.0 + * Tomcat to 9.0.73 + * XStream on antrun plugin on portable module to 1.4.20 (closes [#256](https://github.com/apache/jspwiki/pull/256)), thanks to dependabot + * Maven plugins: assembly to 3.5.0, compiler to 3.11.0, dependency to 3.5.0, enforcer to 3.2.1, install to 3.1.1, javadoc to 3.5.0, + project info reports to 3.4.2, release to 3.0.0, resources to 3.3.1, surefire to 3.0.0, cargo to 1.10.6, jspc to 3.2.2 (closes [#257](https://github.com/apache/jspwiki/pull/257), thanks to dependabot) +**2023-03-26 Dirk Frederickx (brushed AT apache DOT org)** + +* _2.12.0-git-04_ + +* Remove files incorrectly added to the code base. + **2023-01-04 Juan Pablo Santos (juanpablo AT apache DOT org)** * _2.12.0-git-03_
