Increment version ready for next development cycle.

apache · May 24, 2024 · 7a1c8ad · 7a1c8ad
1 parent cd3e736
commit 7a1c8ad
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 15 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -15,7 +15,7 @@
   limitations under the License.
 ================================================================================
 
-                   Apache Commons Daemon 1.4.0
+                   Apache Commons Daemon 1.4.1
                          Release Notes
 
 This document contains the release notes for this version of the

diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>commons-daemon</groupId>
   <artifactId>commons-daemon</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.4.1-SNAPSHOT</version>
   <name>Apache Commons Daemon</name>
   <!-- Daemon started in Commons in 2002 with an import of code from Tomcat,
        which is why the NOTICE file has an earlier date than the inceptionYear -->
@@ -131,9 +131,9 @@
     <maven.compiler.target>${commons.daemon.javaversion}</maven.compiler.target>
     <commons.componentid>daemon</commons.componentid>
     <commons.module.name>org.apache.commons.daemon</commons.module.name>
-    <commons.release.version>1.4.0</commons.release.version>
+    <commons.release.version>1.4.1</commons.release.version>
     <commons.rc.version>RC1</commons.rc.version>
-    <commons.bc.version>1.3.4</commons.bc.version>
+    <commons.bc.version>1.4.0</commons.bc.version>
     <commons.jira.id>DAEMON</commons.jira.id>
     <commons.jira.pid>12310468</commons.jira.pid>
     <project.build.outputTimestamp>2024-01-01T00:00:00Z</project.build.outputTimestamp>

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -40,6 +40,8 @@
     <title>Apache Commons Daemon Release Notes</title>
   </properties>
   <body>
+    <release version="1.4.1" date="tbd" description="Bug fix release">
+    </release>
     <release version="1.4.0" date="2024-05-24" description="Bug fix release">
       <!-- Fix -->
       <action dev="ggregory" type="fix" due-to="step-security-bot, Gary Gregory">

diff --git a/src/native/unix/man/jsvc.1.xml b/src/native/unix/man/jsvc.1.xml
@@ -22,7 +22,7 @@
     <refentrytitle>JSVC</refentrytitle>
     <manvolnum>1</manvolnum>
     <refmiscinfo class='date'>2024-05-24</refmiscinfo>
-    <refmiscinfo class='source'>Jsvc version 1.4.0</refmiscinfo>
+    <refmiscinfo class='source'>Jsvc version 1.4.1</refmiscinfo>
     <refmiscinfo class='manual'>Apache Commons Daemon project</refmiscinfo>
   </refmeta>
   <refnamediv id='name'>

diff --git a/src/native/unix/native/version.h b/src/native/unix/native/version.h
@@ -31,7 +31,7 @@
 #define JSVC_MINOR_VERSION      4
 
 /** patch level */
-#define JSVC_PATCH_VERSION      0
+#define JSVC_PATCH_VERSION      1
 
 /**
  *  This symbol is defined for internal, "development" copies of JSVC.

diff --git a/src/native/windows/apps/prunmgr/prunmgr.h b/src/native/windows/apps/prunmgr/prunmgr.h
@@ -24,7 +24,7 @@
 #define _PRUNMGR_H
 
 #undef  PRG_VERSION
-#define PRG_VERSION    "1.4.0.0"
+#define PRG_VERSION    "1.4.1.0"
 #define PRG_REGROOT   L"Apache Software Foundation\\Procrun 2.0"
 
 #define IDM_TM_EXIT                     2000

diff --git a/src/native/windows/apps/prunmgr/prunmgr.rc b/src/native/windows/apps/prunmgr/prunmgr.rc
@@ -228,7 +228,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_APPLICATION     RSTR_PSM
-    IDS_APPVERSION      "Version 1.4.0"
+    IDS_APPVERSION      "Version 1.4.1"
     IDS_APPFULLNAME     RSTR_PSM " Version " PRG_VERSION
     IDS_APPCOPYRIGHT    "Copyright (c) 2000-2024 The Apache Software Foundation"
     IDS_APPDESCRIPTION  "Apache Commons Daemon Service Management Tool"
@@ -259,8 +259,8 @@ BEGIN
 END
 
 1 VERSIONINFO
- FILEVERSION 1,4,0,0
- PRODUCTVERSION 1,4,0,0
+ FILEVERSION 1,4,1,0
+ PRODUCTVERSION 1,4,1,0
  FILEFLAGSMASK 0x3fL
 #if defined(_DEBUG)
  FILEFLAGS 0x03L

diff --git a/src/native/windows/apps/prunsrv/prunsrv.h b/src/native/windows/apps/prunsrv/prunsrv.h
@@ -25,7 +25,7 @@
 #define _PRUNSRV_H
 
 #undef  PRG_VERSION
-#define PRG_VERSION    "1.4.0.0"
+#define PRG_VERSION    "1.4.1.0"
 #define PRG_REGROOT   L"Apache Software Foundation\\Procrun 2.0"
 
 #endif /* _PRUNSRV_H */

diff --git a/src/native/windows/apps/prunsrv/prunsrv.rc b/src/native/windows/apps/prunsrv/prunsrv.rc
@@ -23,8 +23,8 @@ IDI_MAINICON         ICON                   "../../resources/procrunw.ico"
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "prunsrv.manifest"
 
 1 VERSIONINFO
- FILEVERSION 1,4,0,0
- PRODUCTVERSION 1,4,0,0
+ FILEVERSION 1,4,1,0
+ PRODUCTVERSION 1,4,1,0
  FILEFLAGSMASK 0x3fL
 #if defined(_DEBUG)
  FILEFLAGS 0x03L

diff --git a/src/samples/SimpleApplication.sh b/src/samples/SimpleApplication.sh
@@ -20,7 +20,7 @@
 # Adapt the following lines to your configuration
 JAVA_HOME=/opt/java6
 PROGRAM=SimpleApplication
-CLASSPATH=`pwd`/$PROGRAM.jar:`pwd`/commons-daemon-1.4.0.jar
+CLASSPATH=`pwd`/$PROGRAM.jar:`pwd`/commons-daemon-1.4.1.jar
 
 case "$1" in
   start )

diff --git a/src/site/xdoc/binaries.xml b/src/site/xdoc/binaries.xml
@@ -36,7 +36,7 @@ corresponding to your operating system. Only the Windows builds are provided as
 <section name="How do I get the executable?">
 <subsection name="procrun">
 <p>
-The Windows archive (e.g. commons-daemon-1.4.0-bin-windows.zip) contains 2 different executables:
+The Windows archive (e.g. commons-daemon-1.4.1-bin-windows.zip) contains 2 different executables:
 <ul>
 <li>prunsrv.exe - service application for running applications as services.</li>
 <li>prunmgr.exe - the GUI manager application used to monitor and configure installed services.</li>