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 1a31b99ef2f588faa7c67345616b6f18f8685f02
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri May 10 15:31:18 2024 +0100
Increment minimum Java version to Java 8 (triggers minor version update)
---
RELEASE-NOTES.txt | 8 ++++----
pom.xml | 12 ++++++------
src/changes/changes.xml | 6 +++++-
src/native/unix/man/jsvc.1.xml | 2 +-
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 +-
11 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 5e7e7ef..445eeaa 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -15,18 +15,18 @@
limitations under the License.
================================================================================
- Apache Commons Daemon 1.3.5
+ Apache Commons Daemon 1.4.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.3
-releases compared to the 1.2 releases.
+Apache Commons Daemon package, and highlights new features in the 1.4
+releases compared to the 1.3 releases.
New Features
------------
- - The minimum Java version has been increased to Java 7
+ - The minimum Java version has been increased to Java 8
Bug Fixes
diff --git a/pom.xml b/pom.xml
index 15c7ff6..e8ff607 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.3.5-SNAPSHOT</version>
+ <version>1.4.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
-->
@@ -122,16 +122,16 @@
<properties>
<!-- Apache Commons Daemon is used by Apache Tomcat. The oldest currently
- supported Tomcat version is Tomcat 8 which has a minimum Java version
- of Java 7. It is therefore advisable to check with the Apache Tomcat
+ supported Tomcat version is Tomcat 9 which has a minimum Java version
+ of Java 8. It is therefore advisable to check with the Apache Tomcat
community before increasing these values. -->
- <animal-sniffer.signature>java17</animal-sniffer.signature>
- <commons.daemon.javaversion>1.7</commons.daemon.javaversion>
+ <animal-sniffer.signature>java18</animal-sniffer.signature>
+ <commons.daemon.javaversion>1.8</commons.daemon.javaversion>
<maven.compiler.source>${commons.daemon.javaversion}</maven.compiler.source>
<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.3.5</commons.release.version>
+ <commons.release.version>1.4.0</commons.release.version>
<commons.rc.version>RC1</commons.rc.version>
<commons.bc.version>1.3.4</commons.bc.version>
<commons.jira.id>DAEMON</commons.jira.id>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 00a12ee..d4eb16e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -40,7 +40,7 @@
<title>Apache Commons Daemon Release Notes</title>
</properties>
<body>
- <release version="1.3.5" date="TBD" description="Bug fix release">
+ <release version="1.4.0" date="TBD" description="Bug fix release">
<!-- Fix -->
<action dev="ggregory" type="fix" due-to="step-security-bot, Gary
Gregory">
[StepSecurity] ci: Harden GitHub Actions #95.
@@ -50,6 +50,10 @@
<action type="update" dev="ggregory" due-to="Dependabot">
Bump commons-parent from 57 to 69 #155.
</action>
+ <action type="update" dev="markt">
+ The minimum support Java version has been upgraded from Java 7 to Java
+ 8.
+ </action>
</release>
<release version="1.3.4" date="2023-05-12" description="Bug fix release">
<!-- Fix -->
diff --git a/src/native/unix/man/jsvc.1.xml b/src/native/unix/man/jsvc.1.xml
index a11ac19..4c1ee3f 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.3.5</refmiscinfo>
+ <refmiscinfo class='source'>Jsvc version 1.4.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 c229837..34426f5 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 3
+#define JSVC_MINOR_VERSION 4
/** patch level */
-#define JSVC_PATCH_VERSION 5
+#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 6a8a6a4..2060aa0 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.3.5.0"
+#define PRG_VERSION "1.4.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 3a418e9..b9e5be7 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.3.5"
+ IDS_APPVERSION "Version 1.4.0"
IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION
IDS_APPCOPYRIGHT "Copyright (c) 2000-2023 The Apache Software
Foundation"
IDS_APPDESCRIPTION "Apache Commons Daemon Service Management Tool"
@@ -259,8 +259,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 1,3,5,0
- PRODUCTVERSION 1,3,5,0
+ FILEVERSION 1,4,0,0
+ PRODUCTVERSION 1,4,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 127d4e7..460d152 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.3.5.0"
+#define PRG_VERSION "1.4.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 e583edd..c037e2e 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,3,5,0
- PRODUCTVERSION 1,3,5,0
+ FILEVERSION 1,4,0,0
+ PRODUCTVERSION 1,4,0,0
FILEFLAGSMASK 0x3fL
#if defined(_DEBUG)
FILEFLAGS 0x03L
diff --git a/src/samples/SimpleApplication.sh b/src/samples/SimpleApplication.sh
index 385ed03..c3e90b8 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.3.5.jar
+CLASSPATH=`pwd`/$PROGRAM.jar:`pwd`/commons-daemon-1.4.0.jar
case "$1" in
start )
diff --git a/src/site/xdoc/binaries.xml b/src/site/xdoc/binaries.xml
index c67dabc..d669022 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.3.5-bin-windows.zip) contains 2
different executables:
+The Windows archive (e.g. commons-daemon-1.4.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>
