This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
commit e4b34a0b71290c696dd78fd294c75f1416e908d5 Author: Mark Thomas <[email protected]> AuthorDate: Mon Sep 14 09:09:05 2020 +0100 Update version from 1.2.3 to 1.2.4 ready for next dev cycle --- RELEASE-NOTES.txt | 2 +- pom.xml | 4 ++-- src/changes/changes.xml | 2 ++ src/native/unix/man/jsvc.1.xml | 2 +- src/native/unix/native/version.h | 2 +- src/native/windows/apps/prunmgr/prunmgr.h | 2 +- src/native/windows/apps/prunmgr/prunmgr.rc | 6 +++--- src/native/windows/apps/prunsrv/prunsrv.h | 2 +- src/native/windows/apps/prunsrv/prunsrv.rc | 4 ++-- src/samples/SimpleApplication.sh | 2 +- src/site/xdoc/binaries.xml | 2 +- src/site/xdoc/download_daemon.xml | 26 +++++++++++++------------- 12 files changed, 29 insertions(+), 27 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 0da3364..ba43926 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -15,7 +15,7 @@ limitations under the License. ================================================================================ - Apache Commons Daemon 1.2.3 + Apache Commons Daemon 1.2.4 Release Notes This document contains the release notes for this version of the diff --git a/pom.xml b/pom.xml index 4c3505c..a87da00 100644 --- 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.2.3-SNAPSHOT</version> + <version>1.2.4-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 --> @@ -115,7 +115,7 @@ <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.2.3</commons.release.version> + <commons.release.version>1.2.4</commons.release.version> <commons.jira.id>DAEMON</commons.jira.id> <commons.jira.pid>12310468</commons.jira.pid> </properties> diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 39b509a..d4345da 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -38,6 +38,8 @@ <title>Apache Commons Daemon Release Notes</title> </properties> <body> + <release version="1.2.4" date="TBD" description="Bug fix release"> + </release> <release version="1.2.3" date="2020-09-01" description="Bug fix release"> <action issue="DAEMON-411" type="fix" dev="markt"> Procrun. Correct multiple issues related to enabling a service to diff --git a/src/native/unix/man/jsvc.1.xml b/src/native/unix/man/jsvc.1.xml index fb9faa9..8293e70 100644 --- 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'>TBD</refmiscinfo> - <refmiscinfo class='source'>Jsvc version 1.2.3</refmiscinfo> + <refmiscinfo class='source'>Jsvc version 1.2.4</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 index a2e0f0f..a743aaa 100644 --- a/src/native/unix/native/version.h +++ b/src/native/unix/native/version.h @@ -31,7 +31,7 @@ #define JSVC_MINOR_VERSION 2 /** patch level */ -#define JSVC_PATCH_VERSION 3 +#define JSVC_PATCH_VERSION 4 /** * 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 index de0893e..49b5044 100644 --- 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.2.3.0" +#define PRG_VERSION "1.2.4.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 index 1986518..a7de5fc 100644 --- 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.2.3" + IDS_APPVERSION "Version 1.2.4" IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION IDS_APPCOPYRIGHT "Copyright (c) 2000-2020 The Apache Software Foundation" IDS_APPDESCRIPTION "Apache Commons Daemon Service Management Tool" @@ -259,8 +259,8 @@ BEGIN END 1 VERSIONINFO - FILEVERSION 1,2,3,0 - PRODUCTVERSION 1,2,3,0 + FILEVERSION 1,2,4,0 + PRODUCTVERSION 1,2,4,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 index 00c16b7..476d49a 100644 --- 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.2.3.0" +#define PRG_VERSION "1.2.4.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 index 5ecbf3d..0c30007 100644 --- 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,2,3,0 - PRODUCTVERSION 1,2,3,0 + FILEVERSION 1,2,4,0 + PRODUCTVERSION 1,2,4,0 FILEFLAGSMASK 0x3fL #if defined(_DEBUG) FILEFLAGS 0x03L diff --git a/src/samples/SimpleApplication.sh b/src/samples/SimpleApplication.sh index 84e8680..897c12e 100755 --- 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.2.3.jar +CLASSPATH=`pwd`/$PROGRAM.jar:`pwd`/commons-daemon-1.2.4.jar case "$1" in start ) diff --git a/src/site/xdoc/binaries.xml b/src/site/xdoc/binaries.xml index 3298a4d..758a94f 100644 --- 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.2.3-bin-windows.zip) contains 2 different executables: +The Windows archive (e.g. commons-daemon-1.2.4-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> diff --git a/src/site/xdoc/download_daemon.xml b/src/site/xdoc/download_daemon.xml index 499b1cb..421b0db 100644 --- a/src/site/xdoc/download_daemon.xml +++ b/src/site/xdoc/download_daemon.xml @@ -113,32 +113,32 @@ limitations under the License. </p> </subsection> </section> - <section name="Apache Commons Daemon 1.2.3 "> + <section name="Apache Commons Daemon 1.2.4 "> <subsection name="Binaries"> <table> <tr> - <td><a href="[preferred]/commons/daemon/binaries/commons-daemon-1.2.3-bin.tar.gz">commons-daemon-1.2.3-bin.tar.gz</a></td> - <td><a href="https://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.2.3-bin.tar.gz.sha512";>sha512</a></td> - <td><a href="https://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.2.3-bin.tar.gz.asc";>pgp</a></td> + <td><a href="[preferred]/commons/daemon/binaries/commons-daemon-1.2.4-bin.tar.gz">commons-daemon-1.2.4-bin.tar.gz</a></td> + <td><a href="https://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.2.4-bin.tar.gz.sha512";>sha512</a></td> + <td><a href="https://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.2.4-bin.tar.gz.asc";>pgp</a></td> </tr> <tr> - <td><a href="[preferred]/commons/daemon/binaries/commons-daemon-1.2.3-bin.zip">commons-daemon-1.2.3-bin.zip</a></td> - <td><a href="https://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.2.3-bin.zip.sha512";>sha512</a></td> - <td><a href="https://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.2.3-bin.zip.asc";>pgp</a></td> + <td><a href="[preferred]/commons/daemon/binaries/commons-daemon-1.2.4-bin.zip">commons-daemon-1.2.4-bin.zip</a></td> + <td><a href="https://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.2.4-bin.zip.sha512";>sha512</a></td> + <td><a href="https://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.2.4-bin.zip.asc";>pgp</a></td> </tr> </table> </subsection> <subsection name="Source"> <table> <tr> - <td><a href="[preferred]/commons/daemon/source/commons-daemon-1.2.3-src.tar.gz">commons-daemon-1.2.3-src.tar.gz</a></td> - <td><a href="https://www.apache.org/dist/commons/daemon/source/commons-daemon-1.2.3-src.tar.gz.sha512";>sha512</a></td> - <td><a href="https://www.apache.org/dist/commons/daemon/source/commons-daemon-1.2.3-src.tar.gz.asc";>pgp</a></td> + <td><a href="[preferred]/commons/daemon/source/commons-daemon-1.2.4-src.tar.gz">commons-daemon-1.2.4-src.tar.gz</a></td> + <td><a href="https://www.apache.org/dist/commons/daemon/source/commons-daemon-1.2.4-src.tar.gz.sha512";>sha512</a></td> + <td><a href="https://www.apache.org/dist/commons/daemon/source/commons-daemon-1.2.4-src.tar.gz.asc";>pgp</a></td> </tr> <tr> - <td><a href="[preferred]/commons/daemon/source/commons-daemon-1.2.3-src.zip">commons-daemon-1.2.3-src.zip</a></td> - <td><a href="https://www.apache.org/dist/commons/daemon/source/commons-daemon-1.2.3-src.zip.sha512";>sha512</a></td> - <td><a href="https://www.apache.org/dist/commons/daemon/source/commons-daemon-1.2.3-src.zip.asc";>pgp</a></td> + <td><a href="[preferred]/commons/daemon/source/commons-daemon-1.2.4-src.zip">commons-daemon-1.2.4-src.zip</a></td> + <td><a href="https://www.apache.org/dist/commons/daemon/source/commons-daemon-1.2.4-src.zip.sha512";>sha512</a></td> + <td><a href="https://www.apache.org/dist/commons/daemon/source/commons-daemon-1.2.4-src.zip.asc";>pgp</a></td> </tr> </table> </subsection>
