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 58df877a7bdce33d3ca54b19561ad0b03c1b9c67 Author: Juan Pablo Santos RodrÃguez <juanpablo.san...@gmail.com> AuthorDate: Fri May 5 22:35:47 2023 +0200 2.12.0-git-06 --- ChangeLog.md | 11 ++++++++++- jspwiki-api/src/main/java/org/apache/wiki/api/Release.java | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index dc5b6fe02..645f0caed 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -17,6 +17,16 @@ specific language governing permissions and limitations under the License. --> +**2023-05-05 Juan Pablo Santos (juanpablo AT apache DOT org)** + +* _2.12.0-git-06_ + +* Merged [#241](https://github.com/apache/jspwiki/pull/241), provided by [Arturo Bernal](https://github.com/arturobernalg), thanks! + +* Dependency updates + * Flexmark to 0.64.2 (closes [#270](https://github.com/apache/jspwiki/pull/270)), thanks to dependabot + * Mockito to 5.3.1 (closes [#269](https://github.com/apache/jspwiki/pull/269)), thanks to dependabot + **2023-04-28 Juan Pablo Santos (juanpablo AT apache DOT org)** * _2.12.0-git-05_ @@ -27,7 +37,6 @@ under the License. * Gson to 2.10.1 (closes [#265](https://github.com/apache/jspwiki/pull/265)), thanks to dependabot * Jaxen to 2.0.0 (closes [#264](https://github.com/apache/jspwiki/pull/264)), thanks to dependabot * JUnit to 5.9.3 - * Mockito to 5.3.1 * Selenide to 6.13.1 * Tomcat to 9.0.74 * Maven plugins: enforcer to 3.3.0 (closes [#266](https://github.com/apache/jspwiki/pull/266), thanks to dependabot), project-info-reports to 3.4.3 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 33b91e0d8..ed56713d1 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 @@ -69,7 +69,7 @@ public final class Release { * <p> * If the build identifier is empty, it is not added. */ - public static final String BUILD = "05"; + public static final String BUILD = "06"; /** * This is the generic version string you should use when printing out the version. It is of