Author: markt
Date: Thu Nov 23 10:05:55 2017
New Revision: 1816118
URL: http://svn.apache.org/viewvc?rev=1816118&view=rev
Log:
Update version from 1.1.0 to 1.1.1 in preparation for next development cycle
Modified:
commons/proper/daemon/trunk/build.xml
commons/proper/daemon/trunk/pom.xml
commons/proper/daemon/trunk/src/changes/changes.xml
commons/proper/daemon/trunk/src/native/unix/man/jsvc.1.xml
commons/proper/daemon/trunk/src/native/unix/native/version.h
commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.h
commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.rc
commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.h
commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.rc
commons/proper/daemon/trunk/src/samples/SimpleApplication.sh
commons/proper/daemon/trunk/src/site/xdoc/binaries.xml
Modified: commons/proper/daemon/trunk/build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/build.xml?rev=1816118&r1=1816117&r2=1816118&view=diff
==============================================================================
--- commons/proper/daemon/trunk/build.xml (original)
+++ commons/proper/daemon/trunk/build.xml Thu Nov 23 10:05:55 2017
@@ -59,7 +59,7 @@
<property name="component.title" value="Java Daemons"/>
<!-- The current version number of this component -->
- <property name="component.version" value="1.1.0"/>
+ <property name="component.version" value="1.1.1"/>
<!-- The base directory for compilation targets -->
<property name="build.home" value="target"/>
Modified: commons/proper/daemon/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/pom.xml?rev=1816118&r1=1816117&r2=1816118&view=diff
==============================================================================
--- commons/proper/daemon/trunk/pom.xml (original)
+++ commons/proper/daemon/trunk/pom.xml Thu Nov 23 10:05:55 2017
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-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
-->
@@ -110,7 +110,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.1.0</commons.release.version>
+ <commons.release.version>1.1.1</commons.release.version>
<commons.jira.id>DAEMON</commons.jira.id>
<commons.jira.pid>12310468</commons.jira.pid>
</properties>
Modified: commons/proper/daemon/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/changes/changes.xml?rev=1816118&r1=1816117&r2=1816118&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/changes/changes.xml (original)
+++ commons/proper/daemon/trunk/src/changes/changes.xml Thu Nov 23 10:05:55 2017
@@ -38,6 +38,8 @@
<title>Release Notes</title>
</properties>
<body>
+ <release version="1.1.1" date="TBD" description="Bug fix release">
+ </release>
<release version="1.1.0" date="2017-11-15" description="Feature and bug
fix release">
<action issue="DAEMON-368" type="add" dev="ggregory">
Add DEBUG and ERROR logging to help diagnose problems when starting a
Windows Service.
Modified: commons/proper/daemon/trunk/src/native/unix/man/jsvc.1.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/man/jsvc.1.xml?rev=1816118&r1=1816117&r2=1816118&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/man/jsvc.1.xml (original)
+++ commons/proper/daemon/trunk/src/native/unix/man/jsvc.1.xml Thu Nov 23
10:05:55 2017
@@ -22,7 +22,7 @@
<refentrytitle>JSVC</refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo class='date'>15 Nov 2017</refmiscinfo>
- <refmiscinfo class='source'>Jsvc version 1.1.0</refmiscinfo>
+ <refmiscinfo class='source'>Jsvc version 1.1.1</refmiscinfo>
<refmiscinfo class='manual'>Apache Commons Daemon project</refmiscinfo>
</refmeta>
<refnamediv id='name'>
Modified: commons/proper/daemon/trunk/src/native/unix/native/version.h
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/version.h?rev=1816118&r1=1816117&r2=1816118&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/native/version.h (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/version.h Thu Nov 23
10:05:55 2017
@@ -31,7 +31,7 @@
#define JSVC_MINOR_VERSION 1
/** patch level */
-#define JSVC_PATCH_VERSION 0
+#define JSVC_PATCH_VERSION 1
/**
* This symbol is defined for internal, "development" copies of JSVC.
Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.h
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.h?rev=1816118&r1=1816117&r2=1816118&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.h
(original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.h Thu
Nov 23 10:05:55 2017
@@ -24,7 +24,7 @@
#define _PRUNMGR_H
#undef PRG_VERSION
-#define PRG_VERSION "1.1.0.0"
+#define PRG_VERSION "1.1.1.0"
#define PRG_REGROOT L"Apache Software Foundation\\Procrun 2.0"
#define IDM_TM_EXIT 2000
Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.rc
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.rc?rev=1816118&r1=1816117&r2=1816118&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.rc
(original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.rc Thu
Nov 23 10:05:55 2017
@@ -227,7 +227,7 @@ END
STRINGTABLE
BEGIN
IDS_APPLICATION RSTR_PSM
- IDS_APPVERSION "Version 1.1.0"
+ IDS_APPVERSION "Version 1.1.1"
IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION
IDS_APPCOPYRIGHT "Copyright (c) 2000-2017 The Apache Software
Foundation"
IDS_APPDESCRIPTION "Apache Commons Daemon Service Management Tool"
@@ -258,8 +258,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 1,1,0,0
- PRODUCTVERSION 1,1,0,0
+ FILEVERSION 1,1,1,0
+ PRODUCTVERSION 1,1,1,0
FILEFLAGSMASK 0x3fL
#if defined(_DEBUG)
FILEFLAGS 0x03L
Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.h
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.h?rev=1816118&r1=1816117&r2=1816118&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.h
(original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.h Thu
Nov 23 10:05:55 2017
@@ -25,7 +25,7 @@
#define _PRUNSRV_H
#undef PRG_VERSION
-#define PRG_VERSION "1.1.0.0"
+#define PRG_VERSION "1.1.1.0"
#define PRG_REGROOT L"Apache Software Foundation\\Procrun 2.0"
#endif /* _PRUNSRV_H */
Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.rc
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.rc?rev=1816118&r1=1816117&r2=1816118&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.rc
(original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.rc Thu
Nov 23 10:05:55 2017
@@ -23,8 +23,8 @@ IDI_MAINICON ICON
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "prunsrv.manifest"
1 VERSIONINFO
- FILEVERSION 1,1,0,0
- PRODUCTVERSION 1,1,0,0
+ FILEVERSION 1,1,1,0
+ PRODUCTVERSION 1,1,1,0
FILEFLAGSMASK 0x3fL
#if defined(_DEBUG)
FILEFLAGS 0x03L
Modified: commons/proper/daemon/trunk/src/samples/SimpleApplication.sh
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/samples/SimpleApplication.sh?rev=1816118&r1=1816117&r2=1816118&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/samples/SimpleApplication.sh (original)
+++ commons/proper/daemon/trunk/src/samples/SimpleApplication.sh Thu Nov 23
10:05:55 2017
@@ -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.0.jar
+CLASSPATH=`pwd`/$PROGRAM.jar:`pwd`/commons-daemon-1.1.1.jar
case "$1" in
start )
Modified: commons/proper/daemon/trunk/src/site/xdoc/binaries.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/site/xdoc/binaries.xml?rev=1816118&r1=1816117&r2=1816118&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/site/xdoc/binaries.xml (original)
+++ commons/proper/daemon/trunk/src/site/xdoc/binaries.xml Thu Nov 23 10:05:55
2017
@@ -36,7 +36,7 @@ corresponding to your operating system.
<section name="How do I get the executable?">
<subsection name="procrun">
<p>
-The Windows archive (e.g. commons-daemon-1.1.0-bin-windows.zip) contains 2
different executables:
+The Windows archive (e.g. commons-daemon-1.1.1-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>
