This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
The following commit(s) were added to refs/heads/master by this push:
new e3b52b5 Release preparation
e3b52b5 is described below
commit e3b52b58cb52f36911b44f15071e7b5233e3d12f
Author: Mark Thomas <[email protected]>
AuthorDate: Tue May 19 13:02:38 2026 +0100
Release preparation
- Update version to 1.6.0
- Update copyright year to 2026
- Update change log, release notes etc to document ARM64 support
---
HOWTO-RELEASE.txt | 2 ++
RELEASE-NOTES.txt | 8 ++++----
pom.xml | 6 +++---
src/changes/changes.xml | 7 +++++--
src/native/unix/man/jsvc.1.xml | 4 ++--
src/native/unix/native/help.c | 2 +-
src/native/unix/native/jsvc-unix.c | 2 +-
src/native/unix/native/version.h | 4 ++--
src/native/windows/README.txt | 4 ++--
src/native/windows/apps/prunmgr/prunmgr.h | 2 +-
src/native/windows/apps/prunmgr/prunmgr.rc | 12 ++++++------
src/native/windows/apps/prunsrv/prunsrv.c | 2 +-
src/native/windows/apps/prunsrv/prunsrv.h | 2 +-
src/native/windows/apps/prunsrv/prunsrv.rc | 6 +++---
src/samples/SimpleApplication.sh | 2 +-
15 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt
index d88a1d3..56d0b4e 100644
--- a/HOWTO-RELEASE.txt
+++ b/HOWTO-RELEASE.txt
@@ -94,6 +94,8 @@ Place the signed Windows binaries in:
target/prunsrv.exe
target/prunmgr.exe
target/amd64/prunsrv.exe
+target/arm64/prunsrv.exe
+target/arm64/prunmgr.exe
Note: `nmake -f Makefile install` will place these files in the correct
locations but they will be unsigned
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index ff7ace3..d6b703f 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -15,18 +15,18 @@
limitations under the License.
================================================================================
- Apache Commons Daemon 1.5.1
+ Apache Commons Daemon 1.6.0
Release Notes
This document contains the release notes for this version of the
-Apache Commons Daemon package, and highlights new features in the 1.5
-releases compared to the 1.4 releases.
+Apache Commons Daemon package, and highlights new features in the 1.6
+releases compared to the 1.5 releases.
New Features
------------
- - Added support for --enable-native-access Java startup option in jsvc
+ - Added support for Windows binaries on the ARM64 platform
Bug Fixes
diff --git a/pom.xml b/pom.xml
index 0e8da80..793a728 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.5.2-SNAPSHOT</version>
+ <version>1.6.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
-->
@@ -134,12 +134,12 @@
<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.5.2</commons.release.version>
+ <commons.release.version>1.6.0</commons.release.version>
<commons.rc.version>RC1</commons.rc.version>
<commons.bc.version>1.5.1</commons.bc.version>
<commons.jira.id>DAEMON</commons.jira.id>
<commons.jira.pid>12310468</commons.jira.pid>
-
<project.build.outputTimestamp>2025-12-11T12:00:00Z</project.build.outputTimestamp>
+
<project.build.outputTimestamp>2026-05-19T12:00:00Z</project.build.outputTimestamp>
<commons.jacoco.haltOnFailure>true</commons.jacoco.haltOnFailure>
<!-- JaCoCo: Don't make code coverage worse than: -->
<commons.jacoco.haltOnFailure>true</commons.jacoco.haltOnFailure>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index b65fca1..50c2948 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -40,14 +40,17 @@
<title>Apache Commons Daemon Release Notes</title>
</properties>
<body>
- <release version="1.5.2" date="YYYY-MM-DD" description="Bug fix release">
+ <release version="1.6.0" date="YYYY-MM-DD" description="This is a
maintenace release. Adds support for Windows on ARM64.">
<!-- FIX -->
<action type="fix" dev="markt" due-to="Alex Dupre, Michael Osipov">jsvc.
Fix a regression in 1.5.1 that exposed long standing bugs around the locking
and unlocking of pid files. Also fix the locking/unlocking bugs.</action>
<action type="fix" dev="ggregory" issue="DAEMON-477" due-to="Alexander
Pinčuk, Gary Gregory, Mark Thomas">Detaches from console when the service stops
#307.</action>
<!-- ADD -->
- <action dev="michaelo" type="add">
+ <action type="add" dev="michaelo">
jsvc. Use FreeBSD's setproctitle(3) to pass -procname similar to
daemon(8).
</action>
+ <action type="add" dev="markt" issue="DAEMON-462" due-to="Wolfgang Glas">
+ procrun. Add ARM64 support for Windows binaries.
+ </action>
<!-- UPDATE -->
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump
org.apache.commons:commons-parent from 93 to 99.</action>
<action type="update" dev="michaelo">jsvc. Consistently use strerror(3)
for log output.</action>
diff --git a/src/native/unix/man/jsvc.1.xml b/src/native/unix/man/jsvc.1.xml
index 12d7932..492aaf2 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'>2026-12-16</refmiscinfo>
- <refmiscinfo class='source'>Jsvc version 1.5.1</refmiscinfo>
+ <refmiscinfo class='date'>2026-05-26</refmiscinfo>
+ <refmiscinfo class='source'>Jsvc version 1.6.0</refmiscinfo>
<refmiscinfo class='manual'>Apache Commons Daemon project</refmiscinfo>
</refmeta>
<refnamediv id='name'>
diff --git a/src/native/unix/native/help.c b/src/native/unix/native/help.c
index d08143c..53f5548 100644
--- a/src/native/unix/native/help.c
+++ b/src/native/unix/native/help.c
@@ -126,7 +126,7 @@ void help(home_data *data)
printf(" --enable-native-access=<module name>\n");
printf(" Java 17 --enable-native-access option. Passed as it is to
JVM\n");
printf("\njsvc (Apache Commons Daemon) " JSVC_VERSION_STRING "\n");
- printf("Copyright (c) 1999-2025 Apache Software Foundation.\n");
+ printf("Copyright (c) 1999-2026 Apache Software Foundation.\n");
printf("\n");
}
diff --git a/src/native/unix/native/jsvc-unix.c
b/src/native/unix/native/jsvc-unix.c
index 2b84e4b..7f77a4b 100644
--- a/src/native/unix/native/jsvc-unix.c
+++ b/src/native/unix/native/jsvc-unix.c
@@ -886,7 +886,7 @@ static int child(arg_data *args, home_data *data, uid_t
uid, gid_t gid)
/* Check wether we need to dump the VM version */
if (args->vers == true) {
log_error("jsvc (Apache Commons Daemon) " JSVC_VERSION_STRING);
- log_error("Copyright (c) 1999-2025 Apache Software Foundation.");
+ log_error("Copyright (c) 1999-2026 Apache Software Foundation.");
if (java_version() != true) {
return -1;
}
diff --git a/src/native/unix/native/version.h b/src/native/unix/native/version.h
index 69d4549..1167748 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 5
+#define JSVC_MINOR_VERSION 6
/** patch level */
-#define JSVC_PATCH_VERSION 1
+#define JSVC_PATCH_VERSION 0
/**
* This symbol is defined for internal, "development" copies of JSVC.
diff --git a/src/native/windows/README.txt b/src/native/windows/README.txt
index 2ccf6c2..3ca871a 100644
--- a/src/native/windows/README.txt
+++ b/src/native/windows/README.txt
@@ -60,8 +60,8 @@ Release Builds
Release builds must not disable the static hybrid CRT build strategy.
-It is not necessary to build a 64-bit version of prunmgr since the 32-bit
-version works with both 32-bit and 64-bit services.
+It is not necessary to build an X64 (64-bit AMD/Intel) version of prunmgr since
+the X86 (32-bit AMD/Intel) version works with both X64 and X86 services.
Code signing
diff --git a/src/native/windows/apps/prunmgr/prunmgr.h
b/src/native/windows/apps/prunmgr/prunmgr.h
index d04f95c..1c53505 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.5.1.0"
+#define PRG_VERSION "1.6.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 134bc79..9b309f5 100644
--- a/src/native/windows/apps/prunmgr/prunmgr.rc
+++ b/src/native/windows/apps/prunmgr/prunmgr.rc
@@ -38,7 +38,7 @@ BEGIN
ES_READONLY | WS_BORDER | WS_VSCROLL,0,63,295,115
CONTROL
"BMP_COMMONS",IDC_STATIC,"Static",SS_BITMAP|0x00000040L,0,0,153,62
LTEXT " ",IDC_ABOUTAPP,2,182,240,12
- LTEXT "Copyright (c) 2000-2025 The Apache Software
Foundation.",IDC_STATIC,2,192,240,12
+ LTEXT "Copyright (c) 2000-2026 The Apache Software
Foundation.",IDC_STATIC,2,192,240,12
LTEXT "https://commons.apache.org",IDC_STATIC,2,202,240,12
PUSHBUTTON "&System Info",IAB_SYSINF,245,202,50,14
END
@@ -228,9 +228,9 @@ END
STRINGTABLE
BEGIN
IDS_APPLICATION RSTR_PSM
- IDS_APPVERSION "Version 1.5.1"
+ IDS_APPVERSION "Version 1.6.0"
IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION
- IDS_APPCOPYRIGHT "Copyright (c) 2000-2025 The Apache Software
Foundation"
+ IDS_APPCOPYRIGHT "Copyright (c) 2000-2026 The Apache Software
Foundation"
IDS_APPDESCRIPTION "Apache Commons Daemon Service Management Tool"
IDS_ALREAY_RUNING "An instance of '%S' application is already running"
IDS_ERRORCMD "Unknown command line option '%s'\nSee the manual for
command line usage."
@@ -259,8 +259,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 1,5,1,0
- PRODUCTVERSION 1,5,1,0
+ FILEVERSION 1,6,0,0
+ PRODUCTVERSION 1,6,0,0
FILEFLAGSMASK 0x3fL
#if defined(_DEBUG)
FILEFLAGS 0x03L
@@ -280,7 +280,7 @@ BEGIN
VALUE "FileDescription", RSTR_PSM "\0"
VALUE "FileVersion", PRG_VERSION
VALUE "InternalName", RSTR_PSM "\0"
- VALUE "LegalCopyright", "Copyright (c) 2000-2025 The Apache Software
Foundation.\0"
+ VALUE "LegalCopyright", "Copyright (c) 2000-2026 The Apache Software
Foundation.\0"
VALUE "OriginalFilename", "prunmgr.exe\0"
VALUE "ProductName", RSTR_PSM "\0"
VALUE "ProductVersion", PRG_VERSION
diff --git a/src/native/windows/apps/prunsrv/prunsrv.c
b/src/native/windows/apps/prunsrv/prunsrv.c
index 186444a..c5ed7e6 100644
--- a/src/native/windows/apps/prunsrv/prunsrv.c
+++ b/src/native/windows/apps/prunsrv/prunsrv.c
@@ -432,7 +432,7 @@ static void printVersion(void)
{
fwprintf(stderr, L"Apache Commons Daemon Service Runner version %S/Win%d
(%S)\n",
PRG_VERSION, PRG_BITS, __DATE__);
- fwprintf(stderr, L"Copyright (c) 2000-2025 The Apache Software
Foundation.\n\n"
+ fwprintf(stderr, L"Copyright (c) 2000-2026 The Apache Software
Foundation.\n\n"
L"For bug reporting instructions, please see:\n"
L"<URL:https://issues.apache.org/jira/browse/DAEMON>.");
}
diff --git a/src/native/windows/apps/prunsrv/prunsrv.h
b/src/native/windows/apps/prunsrv/prunsrv.h
index 279f1c7..cfdd8c9 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.5.1.0"
+#define PRG_VERSION "1.6.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 fb548b1..559cf5f 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,5,1,0
- PRODUCTVERSION 1,5,1,0
+ FILEVERSION 1,6,0,0
+ PRODUCTVERSION 1,6,0,0
FILEFLAGSMASK 0x3fL
#if defined(_DEBUG)
FILEFLAGS 0x03L
@@ -44,7 +44,7 @@ BEGIN
VALUE "FileDescription", RSTR_PRUNSRV "\0"
VALUE "FileVersion", PRG_VERSION
VALUE "InternalName", RSTR_PRUNSRV "\0"
- VALUE "LegalCopyright", "Copyright (c) 2000-2025 The Apache Software
Foundation.\0"
+ VALUE "LegalCopyright", "Copyright (c) 2000-2026 The Apache Software
Foundation.\0"
VALUE "OriginalFilename", "prunsrv.exe\0"
VALUE "ProductName", RSTR_PRUNSRV "\0"
VALUE "ProductVersion", PRG_VERSION
diff --git a/src/samples/SimpleApplication.sh b/src/samples/SimpleApplication.sh
index 84aa713..2dac453 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.5.1.jar
+CLASSPATH=`pwd`/$PROGRAM.jar:`pwd`/commons-daemon-1.6.0.jar
case "$1" in
start )
