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 287f3bec Increment version to 1.6.1 for next bug fix release
287f3bec is described below
commit 287f3becf71a4b9afd73b1c32064257ba29d0594
Author: Mark Thomas <[email protected]>
AuthorDate: Sun May 31 11:00:42 2026 +0100
Increment version to 1.6.1 for next bug fix release
---
RELEASE-NOTES.txt | 2 +-
pom.xml | 10 +++++-----
src/changes/changes.xml | 4 ++++
src/native/unix/man/jsvc.1.xml | 4 ++--
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 +-
10 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 0bcd2cdf..a58920aa 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -15,7 +15,7 @@
limitations under the License.
================================================================================
- Apache Commons Daemon 1.6.0
+ Apache Commons Daemon 1.6.1
Release Notes
This document contains the release notes for this version of the
diff --git a/pom.xml b/pom.xml
index 2f585976..28423229 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.6.0-SNAPSHOT</version>
+ <version>1.6.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
-->
@@ -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.6.0</commons.release.version>
- <commons.rc.version>RC6</commons.rc.version>
- <commons.bc.version>1.5.1</commons.bc.version>
+ <commons.release.version>1.6.1</commons.release.version>
+ <commons.rc.version>RC1</commons.rc.version>
+ <commons.bc.version>1.6.0</commons.bc.version>
<commons.jira.id>DAEMON</commons.jira.id>
<commons.jira.pid>12310468</commons.jira.pid>
-
<project.build.outputTimestamp>2026-05-25T09:00:00Z</project.build.outputTimestamp>
+
<project.build.outputTimestamp>2026-05-31T10: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 b58fd44d..c4d8632c 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -40,6 +40,10 @@
<title>Apache Commons Daemon Release Notes</title>
</properties>
<body>
+ <release version="1.6.1" date="2026-06-03" description="Bug fix release">
+ <!-- FIX -->
+ <action type="fix" dev="markt" due-to="Michael Osipov">jsvc. Correct a
packaging error in the 1.6.0 native source tarball for *nix systems.</action>
+ </release>
<release version="1.6.0" date="2026-05-29" 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>
diff --git a/src/native/unix/man/jsvc.1.xml b/src/native/unix/man/jsvc.1.xml
index 492aaf21..6a492287 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-05-26</refmiscinfo>
- <refmiscinfo class='source'>Jsvc version 1.6.0</refmiscinfo>
+ <refmiscinfo class='date'>2026-06-03</refmiscinfo>
+ <refmiscinfo class='source'>Jsvc version 1.6.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
index 11677488..b3e86dc8 100644
--- a/src/native/unix/native/version.h
+++ b/src/native/unix/native/version.h
@@ -31,7 +31,7 @@
#define JSVC_MINOR_VERSION 6
/** 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
index 1c535053..e514b31c 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.6.0.0"
+#define PRG_VERSION "1.6.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
index 41ada483..cc3b60ab 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.6.0"
+ IDS_APPVERSION "Version 1.6.1"
IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION
IDS_APPCOPYRIGHT "Copyright (c) 2000-2026 The Apache Software
Foundation"
IDS_APPDESCRIPTION "Apache Commons Daemon Service Management Tool"
@@ -259,8 +259,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 1,6,0,0
- PRODUCTVERSION 1,6,0,0
+ FILEVERSION 1,6,1,0
+ PRODUCTVERSION 1,6,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
index cfdd8c99..d1381fcd 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.6.0.0"
+#define PRG_VERSION "1.6.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
index 559cf5f6..db25181b 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,6,0,0
- PRODUCTVERSION 1,6,0,0
+ FILEVERSION 1,6,1,0
+ PRODUCTVERSION 1,6,1,0
FILEFLAGSMASK 0x3fL
#if defined(_DEBUG)
FILEFLAGS 0x03L
diff --git a/src/samples/SimpleApplication.sh b/src/samples/SimpleApplication.sh
index 2dac4534..0d5a7859 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.6.0.jar
+CLASSPATH=`pwd`/$PROGRAM.jar:`pwd`/commons-daemon-1.6.1.jar
case "$1" in
start )
