This is an automated email from the ASF dual-hosted git repository. ggregory 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 a7b60ef Bump next version to a feature version (1.5.0) a7b60ef is described below commit a7b60efd794d081d52fe15d5e763d35322dbb639 Author: Gary D. Gregory <garydgreg...@gmail.com> AuthorDate: Sun May 4 08:49:29 2025 -0400 Bump next version to a feature version (1.5.0) --- pom.xml | 4 ++-- src/changes/changes.xml | 6 ++---- src/native/unix/man/jsvc.1.xml | 2 +- src/native/windows/apps/prunmgr/prunmgr.h | 2 +- src/native/windows/apps/prunmgr/prunmgr.rc | 2 +- src/native/windows/apps/prunsrv/prunsrv.h | 2 +- src/samples/SimpleApplication.sh | 2 +- src/site/xdoc/binaries.xml | 2 +- 8 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index b9d0d50..b1a84ce 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.4.2-SNAPSHOT</version> + <version>1.5.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 --> @@ -131,7 +131,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.4.2</commons.release.version> + <commons.release.version>1.5.0</commons.release.version> <commons.rc.version>RC1</commons.rc.version> <commons.bc.version>1.4.1</commons.bc.version> <commons.jira.id>DAEMON</commons.jira.id> diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 8899f3b..7148406 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -40,14 +40,12 @@ <title>Apache Commons Daemon Release Notes</title> </properties> <body> - <release version="1.4.2" date="YYYY-MM-DD" description="This is a maintenance release. Java 8 or later is required."> + <release version="1.5.0" date="YYYY-MM-DD" description="This is a maintenance release. Java 8 or later is required."> <!-- FIX --> <action type="fix" dev="ggregory" due-to="Gary Gregory">Remove -nouses directive from maven-bundle-plugin. OSGi package imports now state 'uses' definitions for package imports, this doesn't affect JPMS (from org.apache.commons:commons-parent:80).</action> <action type="fix" dev="michaelo">Document --enable-preview</action> <!-- ADD --> - <action issue="DAEMON-471" dev="michaelo" type="add"> - Add support for --enable-native-access Java startup option in jsvc - </action> + <action issue="DAEMON-471" dev="michaelo" type="add">Add support for --enable-native-access Java startup option in jsvc.</action> <!-- UPDATE --> <action dev="ggregory" type="update" due-to="Gary Gregory, Dependabot">Bump org.apache.commons:commons-parent from 78 to 83 #253, #255.</action> </release> diff --git a/src/native/unix/man/jsvc.1.xml b/src/native/unix/man/jsvc.1.xml index 04ddbb0..e3edfe4 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'>2025-01-13</refmiscinfo> - <refmiscinfo class='source'>Jsvc version 1.4.1</refmiscinfo> + <refmiscinfo class='source'>Jsvc version 1.5.0</refmiscinfo> <refmiscinfo class='manual'>Apache Commons Daemon project</refmiscinfo> </refmeta> <refnamediv id='name'> diff --git a/src/native/windows/apps/prunmgr/prunmgr.h b/src/native/windows/apps/prunmgr/prunmgr.h index 020a164..387e8a8 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.4.1.0" +#define PRG_VERSION "1.5.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 365009e..31a8d53 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.4.1" + IDS_APPVERSION "Version 1.5.0" IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION IDS_APPCOPYRIGHT "Copyright (c) 2000-2025 The Apache Software Foundation" IDS_APPDESCRIPTION "Apache Commons Daemon Service Management Tool" diff --git a/src/native/windows/apps/prunsrv/prunsrv.h b/src/native/windows/apps/prunsrv/prunsrv.h index c3ca235..3572646 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.4.1.0" +#define PRG_VERSION "1.5.0.0" #define PRG_REGROOT L"Apache Software Foundation\\Procrun 2.0" #endif /* _PRUNSRV_H */ diff --git a/src/samples/SimpleApplication.sh b/src/samples/SimpleApplication.sh index cf696cc..f6d1f9f 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.4.1.jar +CLASSPATH=`pwd`/$PROGRAM.jar:`pwd`/commons-daemon-1.5.0.jar case "$1" in start ) diff --git a/src/site/xdoc/binaries.xml b/src/site/xdoc/binaries.xml index a4498b2..b00a555 100644 --- a/src/site/xdoc/binaries.xml +++ b/src/site/xdoc/binaries.xml @@ -37,7 +37,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.1-bin-windows.zip) contains 2 different executables: +The Windows archive (e.g. commons-daemon-x.y.z-bin-windows.zip) contains 2 different executables: </p> <ul> <li>prunsrv.exe - service application for running applications as services.</li>