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 2021/01/12 17:36:10 UTC
[commons-daemon] branch master updated (f3697b0 -> 110e8f0)
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 f3697b0 Remove unused import.
new 995d361 Add guess for 1.2.4 release date
new 110e8f0 Update copyright year to 2012
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:
NOTICE.txt | 2 +-
src/changes/changes.xml | 2 +-
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 +-
8 files changed, 10 insertions(+), 10 deletions(-)
[commons-daemon] 01/02: Add guess for 1.2.4 release date
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 995d3619dbf23813d0caa8cfafc290da4bf4031f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 12 17:32:00 2021 +0000
Add guess for 1.2.4 release date
---
src/changes/changes.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index ca702fa..7aff2d4 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.4" date="TBD" description="Bug fix release">
+ <release version="1.2.4" date="2021-01-18" description="Bug fix release">
<action issue="DAEMON-424" type="fix" dev="markt" due-to="Bernhard Scholz">
Procrun. Ensure that log messages written to stdout and stderr are not
lost during start-up.
[commons-daemon] 02/02: Update copyright year to 2012
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 110e8f0dd504662bcf98dec0995db1aaae78491c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 12 17:32:18 2021 +0000
Update copyright year to 2012
---
NOTICE.txt | 2 +-
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 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/NOTICE.txt b/NOTICE.txt
index 8f7d630..a74c2f5 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
Apache Commons Daemon
-Copyright 1999-2020 The Apache Software Foundation
+Copyright 1999-2021 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
diff --git a/src/native/unix/native/help.c b/src/native/unix/native/help.c
index 1656e5e..ea92d29 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-2020 Apache Software Foundation.\n");
+ printf("Copyright (c) 1999-2021 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 d87554a..73764d4 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-2020 Apache Software Foundation.");
+ log_error("Copyright (c) 1999-2021 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 a7de5fc..f8488d6 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-2020 The Apache Software Foundation.",IDC_STATIC,2,160,270,12
+ LTEXT "Copyright (c) 2000-2021 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.2.4"
IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION
- IDS_APPCOPYRIGHT "Copyright (c) 2000-2020 The Apache Software Foundation"
+ IDS_APPCOPYRIGHT "Copyright (c) 2000-2021 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-2020 The Apache Software Foundation.\0"
+ VALUE "LegalCopyright", "Copyright (c) 2000-2021 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 0534b08..c49295f 100644
--- a/src/native/windows/apps/prunsrv/prunsrv.c
+++ b/src/native/windows/apps/prunsrv/prunsrv.c
@@ -398,7 +398,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-2020 The Apache Software Foundation.\n\n"
+ fwprintf(stderr, L"Copyright (c) 2000-2021 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 0c30007..4f032a2 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-2020 The Apache Software Foundation.\0"
+ VALUE "LegalCopyright", "Copyright (c) 2000-2021 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 a3a250a..737212e 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-2020 The Apache Software Foundation.
+\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\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.