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 875b70a71865e4b0f28c04048e832466d2dce4e5 Author: Juan Pablo Santos RodrÃguez <[email protected]> AuthorDate: Wed Oct 19 22:23:49 2022 +0200 2.12.0-git-01 * closes #219 * closes #224 * closes #233 --- ChangeLog.md | 21 +++++++++++++++++++++ .../src/main/java/org/apache/wiki/api/Release.java | 8 ++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 7c9bfa3f8..a434bfea9 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -17,6 +17,27 @@ specific language governing permissions and limitations under the License. --> +**2022-10-19 Juan Pablo Santos (juanpablo AT apache DOT org)** + +* _2.12.0-git-01_ + +* Require at least Java 11 to build & run + +* Add missing licenses PR [#220](https://github.com/apache/jspwiki/pull/206) provided by [Arturo Bernal](https://github.com/arturobernalg), thanks! + +* Dependency updates + * commons-text to 1.10.0 + * Flexmark to 0.64.0 + * Gson to 2.9.1 (closes [#219](https://github.com/apache/jspwiki/pull/219)), thanks to dependabot + * JUnit to 5.9.1 + * Log4J to 2.19.0 + * Lucene to 9.4.0 + * NekoHTML to 2.1.2 + * Selenide to 6.9.0 (closes [#233](https://github.com/apache/jspwiki/pull/233)), thanks to dependabot + * Tika to 2.5.0 + * Tomcat to 9.0.68 + * Maven plugins: jar to 3.3.0, javadoc to 3.4.1, jxr to 3.3.0, project-info-reports to 3.4.1 (closes [#224](https://github.com/apache/jspwiki/pull/224), thanks to dependabot), wro4j to 1.10.1 + **2022-07-25 Juan Pablo Santos (juanpablo AT apache DOT org)** * _2.11.3-git-12_ 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 13e31e9e1..939753158 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,16 +50,16 @@ 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; /** The JSPWiki revision. */ - public static final int REVISION = 11; + public static final int REVISION = 12; /** The minor revision. */ - public static final int MINORREVISION = 3; + public static final int MINORREVISION = 0; /** 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
