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 8f25151e5df0501eae9627630fab836fce47a680 Author: juanpablo <[email protected]> AuthorDate: Thu Mar 5 23:47:44 2020 +0100 update cargo plugin to 1.7.10 and bump tomcat version from 8.5.51 to 9.0.31 --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index b3def41..17cbea8 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ <slf4j.version>1.7.30</slf4j.version> <stripes.version>1.7.0-async-beta</stripes.version> <tika.version>1.23</tika.version> - <tomcat.version>8.5.51</tomcat.version> + <tomcat.version>9.0.31</tomcat.version> <wro4j.version>1.8.0</wro4j.version> <xmlrpc.version>2.0.1</xmlrpc.version> @@ -100,7 +100,7 @@ <plugin.jspc.version>3.1.0</plugin.jspc.version> <plugin.checksum.version>1.8</plugin.checksum.version> <plugin.jslint.version>1.0.1</plugin.jslint.version> - <plugin.cargo.version>1.7.9</plugin.cargo.version> + <plugin.cargo.version>1.7.10</plugin.cargo.version> <plugin.clirr.version>2.8</plugin.clirr.version> <plugin.cobertura.version>2.7</plugin.cobertura.version> <plugin.sonar.version>3.7.0.1746</plugin.sonar.version> @@ -682,11 +682,11 @@ <configuration> <container> <!-- https://codehaus-cargo.github.io/cargo/Maven2+Plugin+Reference+Guide.html#Maven2PluginReferenceGuide-container --> - <containerId>tomcat8x</containerId> + <containerId>tomcat9x</containerId> <zipUrlInstaller> <url>https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/${tomcat.version}/tomcat-${tomcat.version}.zip</url> </zipUrlInstaller> - <output>${project.build.directory}/tomcat8x/logs/container.log</output> + <output>${project.build.directory}/tomcat9x/logs/container.log</output> <systemProperties> <user.language>en</user.language> <user.region>US</user.region> @@ -694,7 +694,7 @@ </container> <configuration> <type>standalone</type> - <home>${project.build.directory}/tomcat8x</home> + <home>${project.build.directory}/tomcat9x</home> <properties> <cargo.servlet.port>8080</cargo.servlet.port> <cargo.jvmargs>-XX:MaxPermSize=512m -Xms256m -Xmx3072m -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -XX:+DisableExplicitGC -Xverify:none -Djava.awt.headless=true</cargo.jvmargs>
