[Jython-checkins] jython: Begin to identify as Jython 2.7.2b2.

[jeff.allen]

https://hg.python.org/jython/rev/b9b60766cabe
changeset:   8308:b9b60766cabe
user:        Jeff Allen <ja.py at farowl.co.uk>
date:        Thu Oct 31 16:29:09 2019 +0000
summary:
  Begin to identify as Jython 2.7.2b2.

As well as changing the version numbers in build scripts as we have
often before, this clarifies (in comments) a numbering policy change by
which developer and snapshot builds identify as the version we are
working *towards*, with a -DEV or -SNAPSHOT suffix, not the last one
released and a "+" suffix. This appears to be the common practice (in
the Maven eco-system).

files:
  NEWS         |   4 ++++
  build.gradle |   9 ++++-----
  build.xml    |  16 ++++++++--------
  3 files changed, 16 insertions(+), 13 deletions(-)


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,10 @@
 For more details of issue [ n ], please see https://hg.python.org/jython, or for tags [ GH-n ] see
 https://github.com/jythontools/jython
 
+Jython 2.7.2b2
+  Bugs fixed
+    - [ 2814 ] maven/build.xml does not PGP-sign the publication
+
 Jython 2.7.2b1
   Bugs fixed
     - [ 2806 ] Installer contains dependencies unshaded (Java 8)
diff --git a/build.gradle b/build.gradle
--- a/build.gradle
+++ b/build.gradle
@@ -37,20 +37,19 @@
  * here. But of course you have to do it the hard way too (see build.xml) as
  * long as Ant is also used.
  *
- * The convention here is that you specify the version of the next release. If
+ * The convention here is that you specify the version of the *next* release. If
  * there are files not checked in, extra files (not of types hg ignores), or the
  * changeset is not tagged correspondingly, the build will add "-SNAPSHOT" to
  * the effective version.
  */
 // Versions are specified in this grammar:
-// <major> . <minor> ( . <micro> )? ( <release> <serial> )? ( + | - <word> )?
+// <major> . <minor> ( . <micro> )? ( <release> <serial> )? ( - <word> )?
 
-version = '2.7.2b1'
+version = '2.7.2b2'
 
 // Valid examples (please preserve in comments):
-//version = '2.7.2a1+'
 //version = '2.7.2a2'
-//version = '2.7.2b1-SNAPSHOT'
+//version = '2.7.2b2-DEV'
 //version = '2.7.2b1'
 //version = '2.7.2rc1'
 //version = '2.7.2'
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -16,7 +16,7 @@
     ant
 as it is the default target. This build will create directories
 /build and /dist below ${basedir}.
-Jython will identify its version with a trailing "+".
+Jython will identify its version with a trailing "-DEV".
 
 Case 2: build an installer for the development version
 ------------------------------------------------------
@@ -98,18 +98,18 @@
         reconsider choice of JARs, and feel free to use Java 8 syntax. -->
         <property name="jdk.source.version" value="1.7" />
 
-        <!-- Designate the official release encoded in parts. In normal times, this is the previous
-             official release, e.g. 2.7.2a1 while working towards 2.7.2b1, and sys.version will be
-             "2.7.2a1+". If you are trying to building an official release, designate that release.
-             Until you get it right sys.version should (or will) have a snapshot suffix you can
-             specify by -Dsnapshot.name on the ant comnmand line (or we may force one in). -->
+        <!-- Designate the official release encoded in parts. In normal times, this is the *next*
+             official release, e.g. 2.7.2b2 while working towards 2.7.2b2, and sys.version will be
+             "2.7.2b2-DEV". To build that release, work in a clean checkout of the corresponding
+             tag. Until then sys.version will have a snapshot suffix (-DEV or -SNAPSHOT). You can
+             specify that suffix by -Dsnapshot.name on the ant command line. -->
         <property name="jython.major_version" value="2"/>
         <property name="jython.minor_version" value="7"/>
         <property name="jython.micro_version" value="2"/>
         <property name="jython.release_level" value="${PY_RELEASE_LEVEL_BETA}"/>
 
         <!-- Zero at full release: one-up number for alpha, beta and candidate versions. -->
-        <property name="jython.release_serial" value="1"/>
+        <property name="jython.release_serial" value="2"/>
     </target>
 
     <target name="common-constants">
@@ -317,7 +317,7 @@
         -->
 
         <!-- The suffix is "-" and the snapshot name, otherwise this is a developer build. -->
-        <condition property="snapshot.suffix" value="-${snapshot.name}" else="+">
+        <condition property="snapshot.suffix" value="-${snapshot.name}" else="-DEV">
             <isset property="snapshot.name"/>
         </condition>
     </target>

-- 
Repository URL: https://hg.python.org/jython