You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2018/09/17 20:43:57 UTC

[jspwiki] 02/03: 2.11.0-M1-git-01: minimum required to build/run is now Java 8 / Maven 3.5.0

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 4699d94ba7e89663cd237469968b801b2a20548c
Author: juanpablo <ju...@apache.org>
AuthorDate: Mon Sep 17 21:13:20 2018 +0200

    2.11.0-M1-git-01: minimum required to build/run is now Java 8 / Maven 3.5.0
---
 ChangeLog                                              | 4 ++++
 README                                                 | 2 +-
 README.md                                              | 2 +-
 jspwiki-war/src/main/java/org/apache/wiki/Release.java | 8 ++++----
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 756022e..35a38f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-09-14  Juan Pablo Santos (juanpablo AT apache DOT org)
+
+       * 2.11.0-M1-git-01: minimum required to build/run is now Java 8 / Maven 3.5.0
+
 2018-08-31  Juan Pablo Santos (juanpablo AT apache DOT org)
 
 	   * update flexmark to 0.34.22 and ASF parent pom to 21
diff --git a/README b/README
index de834c9..616dc2a 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Apache JSPWiki 2.10 - Documentation
+Apache JSPWiki 2.11 - Documentation
 ===============================================
 
     Licensed to the Apache Software Foundation (ASF) under one
diff --git a/README.md b/README.md
index 0445128..c1897e5 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Apache JSPWiki 2.10 - Documentation
+# Apache JSPWiki 2.11 - Documentation
 
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Release.java b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
index 3db1eae..ee978c3 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
@@ -52,16 +52,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       = "M1-git";
 
     /** The JSPWiki major version. */
     public static final int        VERSION       = 2;
 
     /** The JSPWiki revision. */
-    public static final int        REVISION      = 10;
+    public static final int        REVISION      = 11;
 
     /** The minor revision.  */
-    public static final int        MINORREVISION = 5;
+    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
@@ -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         = "1";
 
     /**
      *  This is the generic version string you should use when printing out the version.  It is of