[jspwiki] 01/02: update bundled Apache Tomcat on portable JSPWiki to 7.0.90; also update build version to 2.10.5

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit e00b6915432dac56238bc88d7704c46028b0afd8
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Jul 8 21:50:39 2018 +0200

    update bundled Apache Tomcat on portable JSPWiki to 7.0.90; also update build version to 2.10.5
---
 jspwiki-portable/build.xml | 8 ++++----
 jspwiki-portable/pom.xml   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jspwiki-portable/build.xml b/jspwiki-portable/build.xml
index fdaca91..06ef2e1 100644
--- a/jspwiki-portable/build.xml
+++ b/jspwiki-portable/build.xml
@@ -26,7 +26,7 @@
   <property environment="env"/>
 
   <!-- the build version if not overwritten by the caller -->
-  <property name="jspwiki.woas.version" value="2.10.4" />
+  <property name="jspwiki.woas.version" value="2.10.5" />
   
   <!-- define the temporary build directory -->
   <property name="jspwiki.woas.target.dir" value="${basedir}/target" />
@@ -38,7 +38,7 @@
   <property name="jspwiki.woas.assembly.dir" value="${jspwiki.woas.target.dir}/woas" />
 
   <!-- the Tomcat version to use --> 
-  <property name="jspwiki.tomcat.version" value="7.0.84"/>
+  <property name="jspwiki.tomcat.version" value="7.0.90"/>
 
   <!-- the Tomcat distribution to use --> 
   <property name="jspwiki.tomcat.distribution" value="apache-tomcat-${jspwiki.tomcat.version}"/>
@@ -148,11 +148,11 @@
         <singleInstance mutexName="org.apache.jspwiki.jspwiki-portable" />
         <jre minVersion="1.6.0" />
         <versionInfo
-          fileVersion="2.10.4.0"
+          fileVersion="2.10.5.0"
           txtFileVersion="JSPWiki ${jspwiki.woas.version}"
           fileDescription="WikiOnAStick"
           copyright="Apache Software Licence 2.0"
-          productVersion="2.10.4.0"
+          productVersion="2.10.5.0"
           txtProductVersion="JSPWiki ${jspwiki.woas.version}"
           productName="WikiOnAStick"
           companyName="Apache Software Foundation"
diff --git a/jspwiki-portable/pom.xml b/jspwiki-portable/pom.xml
index b90426a..11a57fa 100644
--- a/jspwiki-portable/pom.xml
+++ b/jspwiki-portable/pom.xml
@@ -31,7 +31,7 @@
 
   <properties>
     <jspwiki.woas.language>en</jspwiki.woas.language>
-    <tomcat.version>7.0.84</tomcat.version>
+    <tomcat.version>7.0.90</tomcat.version>
   </properties>
 
   <build>