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 2019/09/14 19:38:51 UTC
[commons-daemon] branch master updated: Increment version to 1.2.2
for next development cycle
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
The following commit(s) were added to refs/heads/master by this push:
new ba994f1 Increment version to 1.2.2 for next development cycle
ba994f1 is described below
commit ba994f1cc88a0cb7069f6c5c250e072bbb1355a7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sat Sep 14 16:23:08 2019 +0100
Increment version to 1.2.2 for next development cycle
---
RELEASE-NOTES.txt | 2 +-
pom.xml | 4 ++--
src/changes/changes.xml | 2 ++
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 +-
src/site/xdoc/binaries.xml | 2 +-
11 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 2cc2ce6..1ae0485 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -15,7 +15,7 @@
limitations under the License.
================================================================================
- Apache Commons Daemon 1.2.1
+ Apache Commons Daemon 1.2.2
Release Notes
This document contains the release notes for this version of the
diff --git a/pom.xml b/pom.xml
index f5d8b1e..003391a 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.1-SNAPSHOT</version>
+ <version>1.2.2-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 -->
@@ -113,7 +113,7 @@
<maven.compiler.target>1.6</maven.compiler.target>
<commons.componentid>daemon</commons.componentid>
<commons.module.name>org.apache.commons.daemon</commons.module.name>
- <commons.release.version>1.2.1</commons.release.version>
+ <commons.release.version>1.2.2</commons.release.version>
<commons.jira.id>DAEMON</commons.jira.id>
<commons.jira.pid>12310468</commons.jira.pid>
</properties>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 248cac4..c6fc64a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -38,6 +38,8 @@
<title>Apache Commons Daemon Release Notes</title>
</properties>
<body>
+ <release version="1.2.2" date="TBD" description="Bug fix release">
+ </release>
<release version="1.2.1" date="2019-09-09" description="Bug fix release">
<action issue="DAEMON-403" type="fix" dev="markt" due-to="Charles">
jsvc. Correct debug log message that reports change in umask.
diff --git a/src/native/unix/man/jsvc.1.xml b/src/native/unix/man/jsvc.1.xml
index 4030bd1..2e360bc 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'>9 Sep 2019</refmiscinfo>
- <refmiscinfo class='source'>Jsvc version 1.2.1</refmiscinfo>
+ <refmiscinfo class='date'>TBD</refmiscinfo>
+ <refmiscinfo class='source'>Jsvc version 1.2.2</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 9046186..64b3576 100644
--- a/src/native/unix/native/version.h
+++ b/src/native/unix/native/version.h
@@ -31,7 +31,7 @@
#define JSVC_MINOR_VERSION 2
/** patch level */
-#define JSVC_PATCH_VERSION 1
+#define JSVC_PATCH_VERSION 2
/**
* 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 783194a..3803054 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.1.0"
+#define PRG_VERSION "1.2.2.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 fd73801..30dd44d 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.1"
+ IDS_APPVERSION "Version 1.2.2"
IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION
IDS_APPCOPYRIGHT "Copyright (c) 2000-2019 The Apache Software Foundation"
IDS_APPDESCRIPTION "Apache Commons Daemon Service Management Tool"
@@ -259,8 +259,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 1,2,1,0
- PRODUCTVERSION 1,2,1,0
+ FILEVERSION 1,2,2,0
+ PRODUCTVERSION 1,2,2,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 65f4a2d..740ba45 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.1.0"
+#define PRG_VERSION "1.2.2.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 0c011f9..85c5c92 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,1,0
- PRODUCTVERSION 1,2,1,0
+ FILEVERSION 1,2,2,0
+ PRODUCTVERSION 1,2,2,0
FILEFLAGSMASK 0x3fL
#if defined(_DEBUG)
FILEFLAGS 0x03L
diff --git a/src/samples/SimpleApplication.sh b/src/samples/SimpleApplication.sh
index 7ffde86..00f208a 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.1.jar
+CLASSPATH=`pwd`/$PROGRAM.jar:`pwd`/commons-daemon-1.2.2.jar
case "$1" in
start )
diff --git a/src/site/xdoc/binaries.xml b/src/site/xdoc/binaries.xml
index 5695c34..40726c8 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.1-bin-windows.zip) contains 2 different executables:
+The Windows archive (e.g. commons-daemon-1.2.2-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>