You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2022/02/24 18:10:20 UTC
[commons-daemon] branch master updated (5e1b282 -> af00cbc)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git.
from 5e1b282 Update NOTICE file for 2022.
new a9948bc Update version to 1.3.0 as minimum Java version has been updated to 1.7
new af00cbc Copyright year update to 2022
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
RELEASE-NOTES.txt | 17 ++++-------------
pom.xml | 4 ++--
src/changes/changes.xml | 2 +-
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/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/native/windows/resources/license.rtf | 2 +-
src/samples/SimpleApplication.sh | 2 +-
src/site/xdoc/binaries.xml | 2 +-
15 files changed, 28 insertions(+), 37 deletions(-)
[commons-daemon] 01/02: Update version to 1.3.0 as minimum Java version has been updated to 1.7
Posted by ma...@apache.org.
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 a9948bc68cb3759452c70f9498989cb91bc3e854
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Feb 24 17:36:49 2022 +0000
Update version to 1.3.0 as minimum Java version has been updated to 1.7
---
RELEASE-NOTES.txt | 17 ++++-------------
pom.xml | 4 ++--
src/changes/changes.xml | 2 +-
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 +-
11 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index b35c524..bb82416 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -15,27 +15,18 @@
limitations under the License.
================================================================================
- Apache Commons Daemon 1.2.5
+ Apache Commons Daemon 1.3.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.2
-releases compared to the 1.1 releases.
+Apache Commons Daemon package, and highlights new features in the 1.3
+releases compared to the 1.2 releases.
New Features
------------
- - 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 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.
+ - The minimum Java version has been increased to Java 7
Bug Fixes
diff --git a/pom.xml b/pom.xml
index 96e9658..b9ae08a 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.2.5-SNAPSHOT</version>
+ <version>1.3.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 -->
@@ -115,7 +115,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.2.5</commons.release.version>
+ <commons.release.version>1.3.0</commons.release.version>
<commons.rc.version>RC1</commons.rc.version>
<commons.bc.version>1.2.4</commons.bc.version>
<commons.jira.id>DAEMON</commons.jira.id>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index fb3e489..64d0e0e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -38,7 +38,7 @@
<title>Apache Commons Daemon Release Notes</title>
</properties>
<body>
- <release version="1.2.5" date="2022-02-01" description="Bug fix release">
+ <release version="1.3.0" date="2022-03-TBD" description="Bug fix release">
<!-- FIX -->
<action issue="DAEMON-430" type="fix" dev="jfclere">
Procrun. --StopTimeout can be used to define the time that procrun waits for service to exit,
diff --git a/src/native/unix/man/jsvc.1.xml b/src/native/unix/man/jsvc.1.xml
index d88ae8e..bf632cd 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'>2022-02-01</refmiscinfo>
- <refmiscinfo class='source'>Jsvc version 1.2.5</refmiscinfo>
+ <refmiscinfo class='date'>2022-03-TBD</refmiscinfo>
+ <refmiscinfo class='source'>Jsvc version 1.3.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 af2afba..5dacb72 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 2
+#define JSVC_MINOR_VERSION 3
/** 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 af838f3..e621bbb 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.2.5.0"
+#define PRG_VERSION "1.3.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 bf3982f..dd5efbe 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.2.5"
+ IDS_APPVERSION "Version 1.3.0"
IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION
IDS_APPCOPYRIGHT "Copyright (c) 2000-2021 The Apache Software Foundation"
IDS_APPDESCRIPTION "Apache Commons Daemon Service Management Tool"
@@ -259,8 +259,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 1,2,5,0
- PRODUCTVERSION 1,2,5,0
+ FILEVERSION 1,3,0,0
+ PRODUCTVERSION 1,3,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 4257ff1..d9d7c06 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.2.5.0"
+#define PRG_VERSION "1.3.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 ca8cdf9..8a4d1cd 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,2,5,0
- PRODUCTVERSION 1,2,5,0
+ FILEVERSION 1,3,0,0
+ PRODUCTVERSION 1,3,0,0
FILEFLAGSMASK 0x3fL
#if defined(_DEBUG)
FILEFLAGS 0x03L
diff --git a/src/samples/SimpleApplication.sh b/src/samples/SimpleApplication.sh
index 9c12dc3..066803b 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.2.5.jar
+CLASSPATH=`pwd`/$PROGRAM.jar:`pwd`/commons-daemon-1.3.0.jar
case "$1" in
start )
diff --git a/src/site/xdoc/binaries.xml b/src/site/xdoc/binaries.xml
index 1b1c1bd..0982aba 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.2.5-bin-windows.zip) contains 2 different executables:
+The Windows archive (e.g. commons-daemon-1.3.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>
Re: [commons-daemon] 02/02: Copyright year update to 2022
Posted by Mark Thomas <ma...@apache.org>.
On 24/02/2022 18:30, Gary Gregory wrote:
> Should the end year be a constant string?
In a perfect world - yes.
But https://xkcd.com/1205/
Given my (lack of) C skills, search and replace in the IDE is my plan
for the foreseeable future.
Mark
>
> Gary
>
> On Thu, Feb 24, 2022, 13:10 <ma...@apache.org> wrote:
>
>> 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 af00cbc3095e1798b3122a48ffe0d0c9d43d035d
>> Author: Mark Thomas <ma...@apache.org>
>> AuthorDate: Thu Feb 24 18:09:33 2022 +0000
>>
>> Copyright year update to 2022
>> ---
>> src/native/unix/native/help.c | 2 +-
>> src/native/unix/native/jsvc-unix.c | 2 +-
>> src/native/windows/apps/prunmgr/prunmgr.rc | 6 +++---
>> src/native/windows/apps/prunsrv/prunsrv.c | 2 +-
>> src/native/windows/apps/prunsrv/prunsrv.rc | 2 +-
>> src/native/windows/resources/license.rtf | 2 +-
>> 6 files changed, 8 insertions(+), 8 deletions(-)
>>
>> diff --git a/src/native/unix/native/help.c b/src/native/unix/native/help.c
>> index ea92d29..d79aeea 100644
>> --- a/src/native/unix/native/help.c
>> +++ b/src/native/unix/native/help.c
>> @@ -124,7 +124,7 @@ void help(home_data *data)
>> printf(" --enable-preview\n");
>> printf(" Java 11 --enable-preview option. Passed as it is to
>> JVM\n");
>> printf("\njsvc (Apache Commons Daemon) " JSVC_VERSION_STRING "\n");
>> - printf("Copyright (c) 1999-2021 Apache Software Foundation.\n");
>> + printf("Copyright (c) 1999-2022 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 73764d4..a98757a 100644
>> --- a/src/native/unix/native/jsvc-unix.c
>> +++ b/src/native/unix/native/jsvc-unix.c
>> @@ -850,7 +850,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-2021 Apache Software Foundation.");
>> + log_error("Copyright (c) 1999-2022 Apache Software Foundation.");
>> if (java_version() != true) {
>> return -1;
>> }
>> diff --git a/src/native/windows/apps/prunmgr/prunmgr.rc
>> b/src/native/windows/apps/prunmgr/prunmgr.rc
>> index dd5efbe..d102f60 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,31,335,115
>> CONTROL
>> "BMP_COMMONS",IDC_STATIC,"Static",SS_BITMAP|0x00000040L,0,0,337,30
>> LTEXT " ",IDC_ABOUTAPP,2,150,270,12
>> - LTEXT "Copyright (c) 2000-2021 The Apache Software
>> Foundation.",IDC_STATIC,2,160,270,12
>> + LTEXT "Copyright (c) 2000-2022 The Apache Software
>> Foundation.",IDC_STATIC,2,160,270,12
>> LTEXT "https://commons.apache.org",IDC_STATIC,2,170,270,12
>> PUSHBUTTON "&System Info",IAB_SYSINF,285,170,50,14
>> END
>> @@ -230,7 +230,7 @@ BEGIN
>> IDS_APPLICATION RSTR_PSM
>> IDS_APPVERSION "Version 1.3.0"
>> IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION
>> - IDS_APPCOPYRIGHT "Copyright (c) 2000-2021 The Apache Software
>> Foundation"
>> + IDS_APPCOPYRIGHT "Copyright (c) 2000-2022 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."
>> @@ -280,7 +280,7 @@ BEGIN
>> VALUE "FileDescription", RSTR_PSM "\0"
>> VALUE "FileVersion", PRG_VERSION
>> VALUE "InternalName", RSTR_PSM "\0"
>> - VALUE "LegalCopyright", "Copyright (c) 2000-2021 The Apache
>> Software Foundation.\0"
>> + VALUE "LegalCopyright", "Copyright (c) 2000-2022 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 62acb7e..472ce14 100644
>> --- a/src/native/windows/apps/prunsrv/prunsrv.c
>> +++ b/src/native/windows/apps/prunsrv/prunsrv.c
>> @@ -399,7 +399,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-2021 The Apache Software
>> Foundation.\n\n"
>> + fwprintf(stderr, L"Copyright (c) 2000-2022 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.rc
>> b/src/native/windows/apps/prunsrv/prunsrv.rc
>> index 8a4d1cd..b80069e 100644
>> --- a/src/native/windows/apps/prunsrv/prunsrv.rc
>> +++ b/src/native/windows/apps/prunsrv/prunsrv.rc
>> @@ -44,7 +44,7 @@ BEGIN
>> VALUE "FileDescription", RSTR_PRUNSRV "\0"
>> VALUE "FileVersion", PRG_VERSION
>> VALUE "InternalName", RSTR_PRUNSRV "\0"
>> - VALUE "LegalCopyright", "Copyright (c) 2000-2021 The Apache
>> Software Foundation.\0"
>> + VALUE "LegalCopyright", "Copyright (c) 2000-2022 The Apache
>> Software Foundation.\0"
>> VALUE "OriginalFilename", "prunsrv.exe\0"
>> VALUE "ProductName", RSTR_PRUNSRV "\0"
>> VALUE "ProductVersion", PRG_VERSION
>> diff --git a/src/native/windows/resources/license.rtf
>> b/src/native/windows/resources/license.rtf
>> index 737212e..3c8d8ae 100644
>> --- a/src/native/windows/resources/license.rtf
>> +++ b/src/native/windows/resources/license.rtf
>> @@ -15,7 +15,7 @@
>> {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang
>> {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang
>> {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang
>> {\pntxtb (}{\pntxta )}}\pard\plain
>> \qc \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid14358633
>> \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033
>> {\b\f1\insrsid16132583\charrsid12321742 The Apache Software License,
>> Version 2.0
>> \par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0
>> {\f1\fs18\insrsid16132583\charrsid16132583
>> -\par }\pard \ql
>> \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid9454304
>> {\f1\fs18\insrsid9454304 }{\f1\fs18\insrsid16132583\charrsid16132583
>> Copyright 2002-2021 The Apache Software Foundation.
>> +\par }\pard \ql
>> \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid9454304
>> {\f1\fs18\insrsid9454304 }{\f1\fs18\insrsid16132583\charrsid16132583
>> Copyright 2002-2022 The Apache Software Foundation.
>> \par }\pard \ql
>> \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid1379267
>> {\f1\fs18\insrsid16132583\charrsid16132583
>> \par }{\f1\fs18\insrsid14358633
>> }{\f1\fs18\insrsid16132583\charrsid16132583 Licensed under the Apache
>> License, Version 2.0 (the "License");
>> \par }{\f1\fs18\insrsid14358633
>> }{\f1\fs18\insrsid16132583\charrsid16132583 you may not use this file
>> except in compliance with the License.
>>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: [commons-daemon] 02/02: Copyright year update to 2022
Posted by Gary Gregory <ga...@gmail.com>.
Should the end year be a constant string?
Gary
On Thu, Feb 24, 2022, 13:10 <ma...@apache.org> wrote:
> 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 af00cbc3095e1798b3122a48ffe0d0c9d43d035d
> Author: Mark Thomas <ma...@apache.org>
> AuthorDate: Thu Feb 24 18:09:33 2022 +0000
>
> Copyright year update to 2022
> ---
> src/native/unix/native/help.c | 2 +-
> src/native/unix/native/jsvc-unix.c | 2 +-
> src/native/windows/apps/prunmgr/prunmgr.rc | 6 +++---
> src/native/windows/apps/prunsrv/prunsrv.c | 2 +-
> src/native/windows/apps/prunsrv/prunsrv.rc | 2 +-
> src/native/windows/resources/license.rtf | 2 +-
> 6 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/src/native/unix/native/help.c b/src/native/unix/native/help.c
> index ea92d29..d79aeea 100644
> --- a/src/native/unix/native/help.c
> +++ b/src/native/unix/native/help.c
> @@ -124,7 +124,7 @@ void help(home_data *data)
> printf(" --enable-preview\n");
> printf(" Java 11 --enable-preview option. Passed as it is to
> JVM\n");
> printf("\njsvc (Apache Commons Daemon) " JSVC_VERSION_STRING "\n");
> - printf("Copyright (c) 1999-2021 Apache Software Foundation.\n");
> + printf("Copyright (c) 1999-2022 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 73764d4..a98757a 100644
> --- a/src/native/unix/native/jsvc-unix.c
> +++ b/src/native/unix/native/jsvc-unix.c
> @@ -850,7 +850,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-2021 Apache Software Foundation.");
> + log_error("Copyright (c) 1999-2022 Apache Software Foundation.");
> if (java_version() != true) {
> return -1;
> }
> diff --git a/src/native/windows/apps/prunmgr/prunmgr.rc
> b/src/native/windows/apps/prunmgr/prunmgr.rc
> index dd5efbe..d102f60 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,31,335,115
> CONTROL
> "BMP_COMMONS",IDC_STATIC,"Static",SS_BITMAP|0x00000040L,0,0,337,30
> LTEXT " ",IDC_ABOUTAPP,2,150,270,12
> - LTEXT "Copyright (c) 2000-2021 The Apache Software
> Foundation.",IDC_STATIC,2,160,270,12
> + LTEXT "Copyright (c) 2000-2022 The Apache Software
> Foundation.",IDC_STATIC,2,160,270,12
> LTEXT "https://commons.apache.org",IDC_STATIC,2,170,270,12
> PUSHBUTTON "&System Info",IAB_SYSINF,285,170,50,14
> END
> @@ -230,7 +230,7 @@ BEGIN
> IDS_APPLICATION RSTR_PSM
> IDS_APPVERSION "Version 1.3.0"
> IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION
> - IDS_APPCOPYRIGHT "Copyright (c) 2000-2021 The Apache Software
> Foundation"
> + IDS_APPCOPYRIGHT "Copyright (c) 2000-2022 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."
> @@ -280,7 +280,7 @@ BEGIN
> VALUE "FileDescription", RSTR_PSM "\0"
> VALUE "FileVersion", PRG_VERSION
> VALUE "InternalName", RSTR_PSM "\0"
> - VALUE "LegalCopyright", "Copyright (c) 2000-2021 The Apache
> Software Foundation.\0"
> + VALUE "LegalCopyright", "Copyright (c) 2000-2022 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 62acb7e..472ce14 100644
> --- a/src/native/windows/apps/prunsrv/prunsrv.c
> +++ b/src/native/windows/apps/prunsrv/prunsrv.c
> @@ -399,7 +399,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-2021 The Apache Software
> Foundation.\n\n"
> + fwprintf(stderr, L"Copyright (c) 2000-2022 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.rc
> b/src/native/windows/apps/prunsrv/prunsrv.rc
> index 8a4d1cd..b80069e 100644
> --- a/src/native/windows/apps/prunsrv/prunsrv.rc
> +++ b/src/native/windows/apps/prunsrv/prunsrv.rc
> @@ -44,7 +44,7 @@ BEGIN
> VALUE "FileDescription", RSTR_PRUNSRV "\0"
> VALUE "FileVersion", PRG_VERSION
> VALUE "InternalName", RSTR_PRUNSRV "\0"
> - VALUE "LegalCopyright", "Copyright (c) 2000-2021 The Apache
> Software Foundation.\0"
> + VALUE "LegalCopyright", "Copyright (c) 2000-2022 The Apache
> Software Foundation.\0"
> VALUE "OriginalFilename", "prunsrv.exe\0"
> VALUE "ProductName", RSTR_PRUNSRV "\0"
> VALUE "ProductVersion", PRG_VERSION
> diff --git a/src/native/windows/resources/license.rtf
> b/src/native/windows/resources/license.rtf
> index 737212e..3c8d8ae 100644
> --- a/src/native/windows/resources/license.rtf
> +++ b/src/native/windows/resources/license.rtf
> @@ -15,7 +15,7 @@
> {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang
> {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang
> {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang
> {\pntxtb (}{\pntxta )}}\pard\plain
> \qc \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid14358633
> \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033
> {\b\f1\insrsid16132583\charrsid12321742 The Apache Software License,
> Version 2.0
> \par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0
> {\f1\fs18\insrsid16132583\charrsid16132583
> -\par }\pard \ql
> \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid9454304
> {\f1\fs18\insrsid9454304 }{\f1\fs18\insrsid16132583\charrsid16132583
> Copyright 2002-2021 The Apache Software Foundation.
> +\par }\pard \ql
> \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid9454304
> {\f1\fs18\insrsid9454304 }{\f1\fs18\insrsid16132583\charrsid16132583
> Copyright 2002-2022 The Apache Software Foundation.
> \par }\pard \ql
> \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid1379267
> {\f1\fs18\insrsid16132583\charrsid16132583
> \par }{\f1\fs18\insrsid14358633
> }{\f1\fs18\insrsid16132583\charrsid16132583 Licensed under the Apache
> License, Version 2.0 (the "License");
> \par }{\f1\fs18\insrsid14358633
> }{\f1\fs18\insrsid16132583\charrsid16132583 you may not use this file
> except in compliance with the License.
>
[commons-daemon] 02/02: Copyright year update to 2022
Posted by ma...@apache.org.
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 af00cbc3095e1798b3122a48ffe0d0c9d43d035d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Feb 24 18:09:33 2022 +0000
Copyright year update to 2022
---
src/native/unix/native/help.c | 2 +-
src/native/unix/native/jsvc-unix.c | 2 +-
src/native/windows/apps/prunmgr/prunmgr.rc | 6 +++---
src/native/windows/apps/prunsrv/prunsrv.c | 2 +-
src/native/windows/apps/prunsrv/prunsrv.rc | 2 +-
src/native/windows/resources/license.rtf | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/native/unix/native/help.c b/src/native/unix/native/help.c
index ea92d29..d79aeea 100644
--- a/src/native/unix/native/help.c
+++ b/src/native/unix/native/help.c
@@ -124,7 +124,7 @@ void help(home_data *data)
printf(" --enable-preview\n");
printf(" Java 11 --enable-preview option. Passed as it is to JVM\n");
printf("\njsvc (Apache Commons Daemon) " JSVC_VERSION_STRING "\n");
- printf("Copyright (c) 1999-2021 Apache Software Foundation.\n");
+ printf("Copyright (c) 1999-2022 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 73764d4..a98757a 100644
--- a/src/native/unix/native/jsvc-unix.c
+++ b/src/native/unix/native/jsvc-unix.c
@@ -850,7 +850,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-2021 Apache Software Foundation.");
+ log_error("Copyright (c) 1999-2022 Apache Software Foundation.");
if (java_version() != true) {
return -1;
}
diff --git a/src/native/windows/apps/prunmgr/prunmgr.rc b/src/native/windows/apps/prunmgr/prunmgr.rc
index dd5efbe..d102f60 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,31,335,115
CONTROL "BMP_COMMONS",IDC_STATIC,"Static",SS_BITMAP|0x00000040L,0,0,337,30
LTEXT " ",IDC_ABOUTAPP,2,150,270,12
- LTEXT "Copyright (c) 2000-2021 The Apache Software Foundation.",IDC_STATIC,2,160,270,12
+ LTEXT "Copyright (c) 2000-2022 The Apache Software Foundation.",IDC_STATIC,2,160,270,12
LTEXT "https://commons.apache.org",IDC_STATIC,2,170,270,12
PUSHBUTTON "&System Info",IAB_SYSINF,285,170,50,14
END
@@ -230,7 +230,7 @@ BEGIN
IDS_APPLICATION RSTR_PSM
IDS_APPVERSION "Version 1.3.0"
IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION
- IDS_APPCOPYRIGHT "Copyright (c) 2000-2021 The Apache Software Foundation"
+ IDS_APPCOPYRIGHT "Copyright (c) 2000-2022 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."
@@ -280,7 +280,7 @@ BEGIN
VALUE "FileDescription", RSTR_PSM "\0"
VALUE "FileVersion", PRG_VERSION
VALUE "InternalName", RSTR_PSM "\0"
- VALUE "LegalCopyright", "Copyright (c) 2000-2021 The Apache Software Foundation.\0"
+ VALUE "LegalCopyright", "Copyright (c) 2000-2022 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 62acb7e..472ce14 100644
--- a/src/native/windows/apps/prunsrv/prunsrv.c
+++ b/src/native/windows/apps/prunsrv/prunsrv.c
@@ -399,7 +399,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-2021 The Apache Software Foundation.\n\n"
+ fwprintf(stderr, L"Copyright (c) 2000-2022 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.rc b/src/native/windows/apps/prunsrv/prunsrv.rc
index 8a4d1cd..b80069e 100644
--- a/src/native/windows/apps/prunsrv/prunsrv.rc
+++ b/src/native/windows/apps/prunsrv/prunsrv.rc
@@ -44,7 +44,7 @@ BEGIN
VALUE "FileDescription", RSTR_PRUNSRV "\0"
VALUE "FileVersion", PRG_VERSION
VALUE "InternalName", RSTR_PRUNSRV "\0"
- VALUE "LegalCopyright", "Copyright (c) 2000-2021 The Apache Software Foundation.\0"
+ VALUE "LegalCopyright", "Copyright (c) 2000-2022 The Apache Software Foundation.\0"
VALUE "OriginalFilename", "prunsrv.exe\0"
VALUE "ProductName", RSTR_PRUNSRV "\0"
VALUE "ProductVersion", PRG_VERSION
diff --git a/src/native/windows/resources/license.rtf b/src/native/windows/resources/license.rtf
index 737212e..3c8d8ae 100644
--- a/src/native/windows/resources/license.rtf
+++ b/src/native/windows/resources/license.rtf
@@ -15,7 +15,7 @@
{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain
\qc \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid14358633 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\b\f1\insrsid16132583\charrsid12321742 The Apache Software License, Version 2.0
\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0 {\f1\fs18\insrsid16132583\charrsid16132583
-\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid9454304 {\f1\fs18\insrsid9454304 }{\f1\fs18\insrsid16132583\charrsid16132583 Copyright 2002-2021 The Apache Software Foundation.
+\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid9454304 {\f1\fs18\insrsid9454304 }{\f1\fs18\insrsid16132583\charrsid16132583 Copyright 2002-2022 The Apache Software Foundation.
\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid1379267 {\f1\fs18\insrsid16132583\charrsid16132583
\par }{\f1\fs18\insrsid14358633 }{\f1\fs18\insrsid16132583\charrsid16132583 Licensed under the Apache License, Version 2.0 (the "License");
\par }{\f1\fs18\insrsid14358633 }{\f1\fs18\insrsid16132583\charrsid16132583 you may not use this file except in compliance with the License.