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 c7b0fb95cfe4d6305fda7b8f7c1ba6f7ef780219
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jun 14 21:58:49 2019 +0100
Increment version for next development cycle
---
pom.xml | 2 +-
src/changes/changes.xml | 2 ++
src/native/unix/man/jsvc.1.xml | 2 +-
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 +-
10 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index b605289..28f7b1f 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.1.1-SNAPSHOT</version>
+ <version>1.1.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
-->
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 6d67af7..f9ba014 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.1.2" date="TBD" description="Feature and bug fix
release">
+ </release>
<release version="1.1.1" date="2019-06-17" description="Feature and bug
fix release">
<action type="fix" dev="markt" due-to="mturk" >
Procrun. Add to OPT_LFLAGS rather than overwrite OPT_LFLAGS when
setting
diff --git a/src/native/unix/man/jsvc.1.xml b/src/native/unix/man/jsvc.1.xml
index 106cedf..d6bfa55 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'>17 Jun 2019</refmiscinfo>
- <refmiscinfo class='source'>Jsvc version 1.1.1</refmiscinfo>
+ <refmiscinfo class='source'>Jsvc version 1.1.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 58ed2e8..adf2e8d 100644
--- a/src/native/unix/native/version.h
+++ b/src/native/unix/native/version.h
@@ -31,7 +31,7 @@
#define JSVC_MINOR_VERSION 1
/** 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 78ee0a8..fbc7f9b 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.1.1.0"
+#define PRG_VERSION "1.1.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 bd833a5..895926b 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.1.1"
+ IDS_APPVERSION "Version 1.1.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,1,1,0
- PRODUCTVERSION 1,1,1,0
+ FILEVERSION 1,1,2,0
+ PRODUCTVERSION 1,1,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 ded56b8..e855f5d 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.1.1.0"
+#define PRG_VERSION "1.1.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 e7f7897..660275c 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,1,1,0
- PRODUCTVERSION 1,1,1,0
+ FILEVERSION 1,1,2,0
+ PRODUCTVERSION 1,1,2,0
FILEFLAGSMASK 0x3fL
#if defined(_DEBUG)
FILEFLAGS 0x03L
diff --git a/src/samples/SimpleApplication.sh b/src/samples/SimpleApplication.sh
index b419805..5811d69 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.1.1.jar
+CLASSPATH=`pwd`/$PROGRAM.jar:`pwd`/commons-daemon-1.1.2.jar
case "$1" in
start )
diff --git a/src/site/xdoc/binaries.xml b/src/site/xdoc/binaries.xml
index f618e61..c5a5df5 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.1.1-bin-windows.zip) contains 2
different executables:
+The Windows archive (e.g. commons-daemon-1.1.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>
