Update version number to 11.9.0-alpha1

edewata · edewata · commit 82587a014358 · 2025-07-08T08:26:59.000-05:00
The build scripts have been modified to generate RPM version numbers more compliant with Fedora Packaging Guidelines. https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,11 @@ if (NOT DEFINED PRODUCT_NAME)
     set(PRODUCT_NAME "Dogtag PKI")
 endif(NOT DEFINED PRODUCT_NAME)
 
-set(IMPL_VERSION "${VERSION}-${RELEASE}")
+if (NOT DEFINED PHASE)
+    set(IMPL_VERSION "${VERSION}")
+else()
+    set(IMPL_VERSION "${VERSION}-${PHASE}")
+endif(NOT DEFINED PHASE)
 
 if (NOT DEFINED NSS_DEFAULT_DB_TYPE)
     set(NSS_DEFAULT_DB_TYPE "sql")
diff --git a/base/acme/pom.xml b/base/acme/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.8.0-SNAPSHOT</version>
+        <version>11.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-acme</artifactId>
diff --git a/base/ca/pom.xml b/base/ca/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.8.0-SNAPSHOT</version>
+        <version>11.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-ca</artifactId>
diff --git a/base/common/pom.xml b/base/common/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.8.0-SNAPSHOT</version>
+        <version>11.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-common</artifactId>
diff --git a/base/console/pom.xml b/base/console/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.8.0-SNAPSHOT</version>
+        <version>11.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-console</artifactId>
diff --git a/base/est/pom.xml b/base/est/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.8.0-SNAPSHOT</version>
+        <version>11.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-est</artifactId>
diff --git a/base/kra/pom.xml b/base/kra/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.8.0-SNAPSHOT</version>
+        <version>11.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-kra</artifactId>
diff --git a/base/ocsp/pom.xml b/base/ocsp/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.8.0-SNAPSHOT</version>
+        <version>11.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-ocsp</artifactId>
diff --git a/base/pom.xml b/base/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-parent</artifactId>
-        <version>11.8.0-SNAPSHOT</version>
+        <version>11.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-base-parent</artifactId>
diff --git a/base/server-webapp/pom.xml b/base/server-webapp/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.8.0-SNAPSHOT</version>
+        <version>11.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-server-webapp</artifactId>
diff --git a/base/server/mcp/pyproject.toml b/base/server/mcp/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "pki-server"
-version = "11.8.0"
+version = "11.9.0"
 readme = "../../README.md"
 description = "PKI Server"
 requires-python = ">=3.13"
diff --git a/base/server/pom.xml b/base/server/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.8.0-SNAPSHOT</version>
+        <version>11.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-server</artifactId>
diff --git a/base/tks/pom.xml b/base/tks/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.8.0-SNAPSHOT</version>
+        <version>11.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-tks</artifactId>
diff --git a/base/tomcat-9.0/pom.xml b/base/tomcat-9.0/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.8.0-SNAPSHOT</version>
+        <version>11.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-tomcat-9.0</artifactId>
diff --git a/base/tomcat/pom.xml b/base/tomcat/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.8.0-SNAPSHOT</version>
+        <version>11.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-tomcat</artifactId>
diff --git a/base/tools/pom.xml b/base/tools/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.8.0-SNAPSHOT</version>
+        <version>11.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-tools</artifactId>
diff --git a/base/tps/pom.xml b/base/tps/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.dogtagpki.pki</groupId>
         <artifactId>pki-base-parent</artifactId>
-        <version>11.8.0-SNAPSHOT</version>
+        <version>11.9.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>pki-tps</artifactId>
diff --git a/build.sh b/build.sh
@@ -87,8 +87,8 @@ usage() {
     echo "    --install-dir=<path>   Installation directory"
     echo "    --source-tag=<tag>     Generate RPM sources from a source tag."
     echo "    --spec=<file>          Use the specified RPM spec (default: $SPEC_TEMPLATE)."
-    echo "    --with-timestamp       Append timestamp to release number."
-    echo "    --with-commit-id       Append commit ID to release number."
+    echo "    --with-timestamp       Append timestamp to RPM version number."
+    echo "    --with-commit-id       Append commit ID to RPM version number."
     echo "    --dist=<name>          Distribution name (e.g. fc28)."
     echo "    --without-java         Do not build Java binaries."
     echo "    --with-console         Build console package."
@@ -165,7 +165,7 @@ generate_rpm_sources() {
 
 generate_patch() {
 
-    PATCH="pki-$VERSION-$RELEASE.patch"
+    PATCH="pki-$FULL_VERSION.patch"
 
     if [ "$VERBOSE" = true ] ; then
         echo "Generating $PATCH for all changes since $SOURCE_TAG tag"
@@ -180,6 +180,8 @@ generate_patch() {
 
 generate_rpm_spec() {
 
+    SPEC_FILE="$WORK_DIR/SPECS/$NAME.spec"
+
     if [ "$VERBOSE" = true ] ; then
         echo "Creating $SPEC_FILE"
     fi
@@ -537,32 +539,17 @@ if [ "$DEBUG" = true ] ; then
     echo "VERSION: $VERSION"
 fi
 
-regex=$'%global *release_number *([^\n]+)'
-if [[ $spec =~ $regex ]] ; then
-    RELEASE_NUMBER="${BASH_REMATCH[1]}"
-    RELEASE=$RELEASE_NUMBER
-else
-    echo "ERROR: Missing release_number macro in $SPEC_TEMPLATE"
-    exit 1
-fi
-
-if [ "$DEBUG" = true ] ; then
-    echo "RELEASE_NUMBER: $RELEASE_NUMBER"
-fi
-
 regex=$'%global *phase *([^\n]+)'
 if [[ $spec =~ $regex ]] ; then
     PHASE="${BASH_REMATCH[1]}"
-    RELEASE=$RELEASE.$PHASE
 fi
 
 if [ "$DEBUG" = true ] ; then
     echo "PHASE: $PHASE"
 fi
 
 if [ "$WITH_TIMESTAMP" = true ] ; then
-    TIMESTAMP=$(date -u +"%Y%m%d%H%M%S%Z")
-    RELEASE=$RELEASE.$TIMESTAMP
+    TIMESTAMP=$(date -u +"%Y%m%d%H%M%S")
 fi
 
 if [ "$DEBUG" = true ] ; then
@@ -571,21 +558,16 @@ fi
 
 if [ "$WITH_COMMIT_ID" = true ]; then
     COMMIT_ID=$(git -C "$SRC_DIR" rev-parse --short=8 HEAD)
-    RELEASE=$RELEASE.$COMMIT_ID
 fi
 
 if [ "$DEBUG" = true ] ; then
     echo "COMMIT_ID: $COMMIT_ID"
 fi
 
-if [ "$DEBUG" = true ] ; then
-    echo "RELEASE: $RELEASE"
-fi
-
-FULL_VERSION=$VERSION
-
-if [ "$PHASE" != "" ]; then
-    FULL_VERSION=$FULL_VERSION-$PHASE
+if [ "$PHASE" = "" ]; then
+    FULL_VERSION="$VERSION"
+else
+    FULL_VERSION="$VERSION-$PHASE"
 fi
 
 if [ "$DEBUG" = true ] ; then
@@ -661,7 +643,10 @@ if [ "$BUILD_TARGET" = "dist" ] ; then
     OPTIONS+=(-DPRODUCT_NAME="$PRODUCT_NAME")
     OPTIONS+=(-DTHEME=$THEME)
     OPTIONS+=(-DVERSION=$VERSION)
-    OPTIONS+=(-DRELEASE=$RELEASE)
+
+    if [ "$PHASE" != "" ] ; then
+        OPTIONS+=(-DPHASE=$PHASE)
+    fi
 
     OPTIONS+=(-DVAR_INSTALL_DIR:PATH=/var)
     OPTIONS+=(-DP11_KIT_TRUST=$P11_KIT_TRUST)
@@ -838,7 +823,7 @@ fi
 # Prepare RPM build
 ################################################################################
 
-echo "Building $NAME-$VERSION-$RELEASE"
+echo "Building $NAME-$FULL_VERSION"
 
 rm -rf BUILD
 rm -rf BUILDROOT
@@ -858,8 +843,6 @@ mkdir SRPMS
 # Generate RPM sources
 ################################################################################
 
-SPEC_FILE="$WORK_DIR/SPECS/$NAME.spec"
-
 generate_rpm_sources
 
 echo "RPM sources:"
diff --git a/pki.spec b/pki.spec
@@ -2,6 +2,11 @@
 Name:             pki
 ################################################################################
 
+Summary:          %{product_name} Package
+URL:              https://www.dogtagpki.org
+# The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
+License:          GPL-2.0-only AND LGPL-2.0-only
+
 # Don't use macros in these params since they need to be parsed by build.sh
 %global           vendor_id dogtag
 %global           product_name Dogtag PKI
@@ -10,37 +15,40 @@ Name:             pki
 
 # Upstream version number:
 %global           major_version 11
-%global           minor_version 8
+%global           minor_version 9
 %global           update_version 0
 
-# Downstream release number:
-# - development/stabilization (unsupported): 0.<n> where n >= 1
-# - GA/update (supported): <n> where n >= 1
-%global           release_number 0.1
-
 # Development phase:
 # - development (unsupported): alpha<n> where n >= 1
-# - stabilization (unsupported): beta<n> where n >= 1
+# - stabilization (supported): beta<n> where n >= 1
 # - GA/update (supported): <none>
-%global           phase beta1
+%global           phase alpha1
 
 %undefine         timestamp
 %undefine         commit_id
 
-Summary:          %{product_name} Package
-URL:              https://www.dogtagpki.org
-# The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
-License:          GPL-2.0-only AND LGPL-2.0-only
-Version:          %{major_version}.%{minor_version}.%{update_version}
-Release:          %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
+# Full version number:
+# - development/stabilization: <major>.<minor>.<update>-<phase>
+# - GA/update:                 <major>.<minor>.<update>
+%global         full_version %{major_version}.%{minor_version}.%{update_version}%{?phase:-}%{?phase}
+
+# RPM version number:
+# - development:   <major>.<minor>.<update>~<phase>^<timestamp>.<commit_id>
+# - stabilization: <major>.<minor>.<update>~<phase>
+# - GA/update:     <major>.<minor>.<update>
+#
+# https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning
+
+Version:          %{major_version}.%{minor_version}.%{update_version}%{?phase:~}%{?phase}%{?timestamp:^}%{?timestamp}%{?commit_id:.}%{?commit_id}
+Release:          %autorelease
 
 # To create a tarball from a version tag:
 # $ git archive \
 #     --format=tar.gz \
 #     --prefix pki-<version>/ \
 #     -o pki-<version>.tar.gz \
 #     <version tag>
-Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?phase:-}%{?phase}/pki-%{version}%{?phase:-}%{?phase}.tar.gz
+Source: https://github.com/dogtagpki/pki/archive/v%{full_version}/pki-%{full_version}.tar.gz
 
 # To create a patch for all changes since a version tag:
 # $ git format-patch \
@@ -1037,7 +1045,7 @@ This package provides test suite for %{product_name}.
 %prep
 ################################################################################
 
-%autosetup -n pki-%{version}%{?phase:-}%{?phase} -p 1
+%autosetup -n pki-%{full_version} -p 1
 
 %if %{without runtime_deps}
 
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.dogtagpki.pki</groupId>
     <artifactId>pki-parent</artifactId>
-    <version>11.8.0-SNAPSHOT</version>
+    <version>11.9.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
diff --git a/update_version.sh b/update_version.sh
@@ -42,7 +42,6 @@ change_spec_version() {
     CURRENT_MINOR=$(grep "minor_version " pki.spec | grep -Eo '[0-9]+$')
     CURRENT_UPDATE=$(grep "update_version " pki.spec | grep -Eo '[0-9]+$')
     CURRENT_PHASE=$(grep "phase " pki.spec | grep -E 'alpha|beta' | awk '{print $(NF)}')
-    CURRENT_RELEASE_NUMBER=$(grep "release_number " pki.spec | grep -Eo '[0-9]+(\.[0-9]+)?$')
 
     echo "Update major version to $NEXT_MAJOR"
     sed -i "/major_version /c\%global           major_version $NEXT_MAJOR" pki.spec
@@ -55,20 +54,12 @@ change_spec_version() {
         if [ -z "$NEXT_PHASE" ] ; then
             echo "Remove phase"
             sed -i "/phase /c\#global           phase" pki.spec
-            echo "Update release_number"
-            sed -i "/release_number /c\%global           release_number 1" pki.spec
         elif [ -z "$CURRENT_PHASE" ] ; then
             echo "Add phase, set to $NEXT_PHASE"
             sed -i "/#global           phase/c\%global           phase $NEXT_PHASE" pki.spec
-            echo "Update release_number"
-            sed -i "/release_number /c\%global           release_number 0.1" pki.spec
         else
             echo "Update phase to $NEXT_PHASE"
             sed -i "/phase /c\%global           phase $NEXT_PHASE" pki.spec
-            echo "Update release_number"
-            IFS='.' read -ra CRL <<< "$CURRENT_RELEASE_NUMBER"
-            (( CRL[1]++ ))
-            sed -i "/release_number /c\%global           release_number ${CRL[0]}.${CRL[1]}" pki.spec
         fi
     fi
 }
