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 dcab0a6f67478b0bb677e2ca13450a6105ea901e Author: Mark Thomas <[email protected]> AuthorDate: Tue Jun 18 16:57:46 2019 +0100 Update version to 1.2.0 --- HOWTO-RELEASE.txt | 4 ++-- RELEASE-NOTES.txt | 20 +++++++++++++------- pom.xml | 2 +- src/changes/changes.xml | 4 +--- src/native/unix/man/jsvc.1.xml | 4 ++-- src/native/unix/native/version.h | 4 ++-- 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 +- 12 files changed, 30 insertions(+), 26 deletions(-) diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt index 0b26d05..d5366f2 100644 --- a/HOWTO-RELEASE.txt +++ b/HOWTO-RELEASE.txt @@ -44,12 +44,12 @@ and replace it with the new version. These include: Before tagging: - /RELEASE-NOTES.txt (Should be unchanged for point releases) + - /pom.xml (version) - /src/changes/changes.xml (Set date) - /src/native/unix/man/jsvc1.xml (Set date & version) + - /src/native/unix/native/version.h (version) - /src/native/windows/apps/prunmgr/prunmgr.h (version) - /src/native/windows/apps/prunmgr/prunmgr.rc (version x3) - - /pom.xml (version) - - /src/native/unix/native/version.h (version) - /src/native/windows/apps/prunsrv/prunsrv.h (version) - /src/native/windows/apps/prunsrv/prunsrv.rc (version x2) - /src/samples/SimpleApplication.sh (version) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 4388613..d5f3b4d 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -15,22 +15,27 @@ limitations under the License. ================================================================================ - Apache Commons Daemon 1.1 + Apache Commons Daemon 1.2 Release Notes This document contains the release notes for this version of the -Apache Commons Daemon package, and highlights new features compared -to the 1.0 releases. +Apache Commons Daemon package, and highlights new features in the 1.2 +releases compared to the 1.1 releases. New Features ------------ - - The minimum required Java version has been increased from Java - 1.3 to Java 6 - - Explicit support has been added for Java 9 + - Improved JRE/JDK detection to support increased range of both JVM + versions and vendors + - The minimum target platform for Windows has been increased to - Windows XP + Windows 7 / Server 2008 SP2 + + - The default Windows service user has changed from LocalSystem to + 'NT Authority\LocalService' + +Note: The minimum Java version remains unchanged at 1.6. Bug Fixes @@ -39,6 +44,7 @@ Bug Fixes - Please see the change log http://commons.apache.org/proper/commons-daemon/changes-report.html + Feedback -------- Open source works best when you give feedback: diff --git a/pom.xml b/pom.xml index 28f7b1f..b84f067 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.1.2-SNAPSHOT</version> + <version>1.2.0-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 --> diff --git a/src/changes/changes.xml b/src/changes/changes.xml index f9ba014..6832155 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -38,9 +38,7 @@ <title>Apache Commons Daemon Release Notes</title> </properties> <body> - <release version="1.1.2" date="TBD" description="Feature and bug fix release"> - </release> - <release version="1.1.1" date="2019-06-17" description="Feature and bug fix release"> + <release version="1.2.0" date="TBD" description="Feature and bug fix release"> <action type="fix" dev="markt" due-to="mturk" > Procrun. Add to OPT_LFLAGS rather than overwrite OPT_LFLAGS when setting /OPT:REF in the make file for Windows. diff --git a/src/native/unix/man/jsvc.1.xml b/src/native/unix/man/jsvc.1.xml index d6bfa55..809b191 100644 --- a/src/native/unix/man/jsvc.1.xml +++ b/src/native/unix/man/jsvc.1.xml @@ -21,8 +21,8 @@ <refmeta> <refentrytitle>JSVC</refentrytitle> <manvolnum>1</manvolnum> - <refmiscinfo class='date'>17 Jun 2019</refmiscinfo> - <refmiscinfo class='source'>Jsvc version 1.1.2</refmiscinfo> + <refmiscinfo class='date'>TBD</refmiscinfo> + <refmiscinfo class='source'>Jsvc version 1.2.0</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 adf2e8d..8927289 100644 --- a/src/native/unix/native/version.h +++ b/src/native/unix/native/version.h @@ -28,10 +28,10 @@ * Minor API changes that do not cause binary compatibility problems. * Should be reset to 0 when upgrading JSVC_MAJOR_VERSION */ -#define JSVC_MINOR_VERSION 1 +#define JSVC_MINOR_VERSION 2 /** patch level */ -#define JSVC_PATCH_VERSION 2 +#define JSVC_PATCH_VERSION 0 /** * 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 fbc7f9b..fb99492 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.1.2.0" +#define PRG_VERSION "1.2.0.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 895926b..023aaf2 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.1.2" + IDS_APPVERSION "Version 1.2.0" IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION IDS_APPCOPYRIGHT "Copyright (c) 2000-2019 The Apache Software Foundation" IDS_APPDESCRIPTION "Apache Commons Daemon Service Management Tool" @@ -259,8 +259,8 @@ BEGIN END 1 VERSIONINFO - FILEVERSION 1,1,2,0 - PRODUCTVERSION 1,1,2,0 + FILEVERSION 1,2,0,0 + PRODUCTVERSION 1,2,0,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 e855f5d..59e2c52 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.1.2.0" +#define PRG_VERSION "1.2.0.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 660275c..d150846 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,1,2,0 - PRODUCTVERSION 1,1,2,0 + FILEVERSION 1,2,0,0 + PRODUCTVERSION 1,2,0,0 FILEFLAGSMASK 0x3fL #if defined(_DEBUG) FILEFLAGS 0x03L diff --git a/src/samples/SimpleApplication.sh b/src/samples/SimpleApplication.sh index 5811d69..1cf20af 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.1.2.jar +CLASSPATH=`pwd`/$PROGRAM.jar:`pwd`/commons-daemon-1.2.0.jar case "$1" in start ) diff --git a/src/site/xdoc/binaries.xml b/src/site/xdoc/binaries.xml index 2ce706d..036e647 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.1.2-bin-windows.zip) contains 2 different executables: +The Windows archive (e.g. commons-daemon-1.2.0-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>
