You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2021/12/13 22:16:52 UTC
[jspwiki] 01/07: Update Tomcat to 9.0.56
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 ad94e9141a7287d02554631b94a0e455ef7c3f7f
Author: Juan Pablo Santos RodrÃguez <ju...@gmail.com>
AuthorDate: Mon Dec 13 23:05:26 2021 +0100
Update Tomcat to 9.0.56
also, remove deprecated maven idea plugin, unused log4j dependency definition and JVM parameter on cargo-maven3-plugin that is not understood by modern JVMs
---
LICENSE | 18 ++++++++--------
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 34755 -> 34755 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 46607 -> 47109 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3677361 -> 3680299 bytes
pom.xml | 23 +++------------------
5 files changed, 12 insertions(+), 29 deletions(-)
diff --git a/LICENSE b/LICENSE
index bda75d6..5da5c1a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -250,10 +250,10 @@ jdom2-2.0.6.jar ./jspwiki-war/src/main/config/doc/LI
jmespath-java-1.12.59 LICENSE
joda-time-2.8.1 LICENSE
jstl-1.2.jar LICENSE
-log4j-1.2-api-2.14.1.jar LICENSE
-log4j-api-2.14.1.jar LICENSE
-log4j-core-2.14.1.jar LICENSE
-log4j-slf4j-impl-2.14.1 LICENSE
+log4j-1.2-api-2.15.0.jar LICENSE
+log4j-api-2.15.0.jar LICENSE
+log4j-core-2.15.0.jar LICENSE
+log4j-slf4j-impl-2.15.0 LICENSE
lucene-analyzers-common-8.11.0.jar LICENSE
lucene-backward-codecs-8.11.0.jar LICENSE
lucene-core-8.11.0.jar LICENSE
@@ -277,15 +277,15 @@ xpp3-1.1.3.4-RC3 ./jspwiki-war/src/main/config/doc/LI
TEST LIBRARY LICENSE FILE
=============================================================================================================
-awaitility-4.1.0.jar LICENSE
+awaitility-4.1.1.jar LICENSE
commons-el-1.0.jar LICENSE
custom_rhino-0.4.3.jar ./jspwiki-war/src/main/config/doc/LICENSE.mpl
hsqldb-2.6.1.jar ./jspwiki-war/src/main/config/doc/LICENSE.hsqldb
sqltool-2.6.1.jar ./jspwiki-war/src/main/config/doc/LICENSE.hsqldb
jetty-all-9.4.44.v20210927.jar LICENSE
-junit-5.8.1 ./jspwiki-war/src/main/config/doc/LICENSE.cpl
-mockito-core-4.0.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
-selenide-6.0.3.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
+junit-5.8.2 ./jspwiki-war/src/main/config/doc/LICENSE.cpl
+mockito-core-4.1.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
+selenide-6.1.1.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
stripes-1.7.0-async.jar LICENSE
yuicompressor-2.4.7.jar ./jspwiki-war/src/main/config/doc/LICENSE.yui
@@ -301,7 +301,7 @@ SlimBox ./jspwiki-war/src/main/config/doc/LI
RESOURCES LICENSE FILE
=============================================================================================================
-Apache Tomcat 9.0.55 LICENSE
+Apache Tomcat 9.0.56 LICENSE
Font Awesome (CSS & LESS files) ./jspwiki-war/src/main/config/doc/LICENSE.mit
Font Awesome (Fonts) ./jspwiki-war/src/main/config/doc/LICENSE.ofl
SilkIconSet ./jspwiki-war/src/main/config/doc/LICENSE.SilkIconSet
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar
index 1d10a69..8f8f086 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar differ
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar
index ea10717..3bd4872 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar differ
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe
index 503887e..dfcd20e 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe differ
diff --git a/pom.xml b/pom.xml
index c97aba4..3ed849a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
<junit.version>5.8.2</junit.version>
<log4j.version>1.2.17</log4j.version>
<log4j2.version>2.15.0</log4j2.version>
- <lucene.version>8.11.0</lucene.version>
+ <lucene.version>8.11.0</lucene.version> <!-- 9.0.0 and above require JDK >= 11 to execute -->
<mockito.version>4.1.0</mockito.version>
<nekohtml.version>1.9.22</nekohtml.version>
<oro.version>2.0.8</oro.version>
@@ -78,7 +78,7 @@
<slf4j.version>1.7.32</slf4j.version>
<stripes.version>1.7.0-async-beta</stripes.version>
<tika.version>2.1.0</tika.version>
- <tomcat.version>9.0.55</tomcat.version>
+ <tomcat.version>9.0.56</tomcat.version>
<wro4j.version>1.8.0</wro4j.version> <!-- 1.9.0 and above require JDK >= 9 to execute -->
<xmlrpc.version>2.0.1</xmlrpc.version>
@@ -87,9 +87,7 @@
<plugin.clean.version>3.1.0</plugin.clean.version>
<plugin.compiler.version>3.8.1</plugin.compiler.version>
<plugin.dependency.version>3.2.0</plugin.dependency.version>
- <plugin.eclipse.version>2.10</plugin.eclipse.version>
<plugin.enforcer.version>3.0.0</plugin.enforcer.version>
- <plugin.idea.version>2.2.1</plugin.idea.version>
<plugin.install.version>2.5.2</plugin.install.version>
<plugin.jar.version>3.2.0</plugin.jar.version>
<plugin.javadoc.version>3.3.1</plugin.javadoc.version>
@@ -258,12 +256,6 @@
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
-
- <dependency>
<groupId>net.sourceforge</groupId>
<artifactId>akismet-java</artifactId>
<version>${akismet-java.version}</version>
@@ -514,15 +506,6 @@
</plugin>
<plugin>
- <artifactId>maven-idea-plugin</artifactId>
- <version>${plugin.idea.version}</version>
- <configuration>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
- </configuration>
- </plugin>
-
- <plugin>
<artifactId>maven-install-plugin</artifactId>
<version>${plugin.install.version}</version>
<configuration>
@@ -755,7 +738,7 @@
<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>
+ <cargo.jvmargs>-Xms256m -Xmx3072m -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -XX:+DisableExplicitGC -Xverify:none -Djava.awt.headless=true</cargo.jvmargs>
</properties>
</configuration>
<!-- <deployables>