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 2022/03/11 13:43:17 UTC

[jspwiki] 01/15: Dependency updates

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 e35509f86e2fc45c6396f5160a31f014afa4d078
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Mon Mar 7 14:49:12 2022 +0100

    Dependency updates
    
    Apache parent pom to 25 - closes #172, thanks to dependabot
    Flexmark to 0.64.0 - closes #171, thanks to dependabot
    Gson to 2.9.0
    Log4J to 2.17.2
    Nekohtml migrated to CodeLibs' fork, version 2.0.2
    Selenide to 6.3.4
    Tomcat to 9.0.59
    Maven project info reports to 3.2.2 - closes #174, thanks to dependabot
---
 pom.xml | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 69f47de..6b87c20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>24</version>
+    <version>25</version>
   </parent>
 
   <groupId>org.apache.jspwiki</groupId>
@@ -54,9 +54,9 @@
     <commons-lang.version>3.12.0</commons-lang.version>
     <commons-text.version>1.9</commons-text.version>
     <ehcache.version>2.10.9.2</ehcache.version>
-    <flexmark.version>0.62.2</flexmark.version>
+    <flexmark.version>0.64.0</flexmark.version>
     <freshcookies-security.version>0.60</freshcookies-security.version>
-    <gson.version>2.8.9</gson.version>
+    <gson.version>2.9.0</gson.version>
     <hsqldb.version>2.6.1</hsqldb.version>
     <jaxen.version>1.2.0</jaxen.version>
     <javax-jstl.version>1.2</javax-jstl.version>
@@ -67,17 +67,17 @@
     <jetty.version>9.4.44.v20210927</jetty.version>
     <jrcs-diff.version>0.4.2</jrcs-diff.version>
     <junit.version>5.8.2</junit.version>
-    <log4j2.version>2.17.1</log4j2.version>
+    <log4j2.version>2.17.2</log4j2.version>
     <lucene.version>8.11.1</lucene.version> <!-- 9.0.0 and above require JDK >= 11 to execute -->
     <mockito.version>4.3.1</mockito.version>
-    <nekohtml.version>1.9.22</nekohtml.version>
+    <nekohtml.version>2.0.2</nekohtml.version> <!-- 2.1.0 and above require JDK >= 11 to execute -->
     <oro.version>2.0.8</oro.version>
     <sandler.version>0.5</sandler.version>
-    <selenide.version>6.3.3</selenide.version>
+    <selenide.version>6.3.4</selenide.version>
     <slf4j.version>1.7.36</slf4j.version>
     <stripes.version>1.7.0-async-beta</stripes.version>
     <tika.version>2.3.0</tika.version>
-    <tomcat.version>9.0.58</tomcat.version>
+    <tomcat.version>9.0.59</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>
 
@@ -91,7 +91,7 @@
     <plugin.jar.version>3.2.2</plugin.jar.version>
     <plugin.javadoc.version>3.3.2</plugin.javadoc.version>
     <plugin.jxr.version>3.1.1</plugin.jxr.version>
-    <plugin.project-info-reports.version>3.2.1</plugin.project-info-reports.version>
+    <plugin.project-info-reports.version>3.2.2</plugin.project-info-reports.version>
     <plugin.release.version>3.0.0-M5</plugin.release.version>
     <plugin.resources.version>3.2.0</plugin.resources.version>
     <plugin.source.version>3.2.1</plugin.source.version>
@@ -328,6 +328,12 @@
       </dependency>
 
       <dependency>
+        <groupId>org.codelibs</groupId>
+        <artifactId>nekohtml</artifactId>
+        <version>${nekohtml.version}</version>
+      </dependency>
+
+      <dependency>
         <groupId>org.freshcookies</groupId>
         <artifactId>freshcookies-security</artifactId>
         <version>${freshcookies-security.version}</version>
@@ -441,13 +447,6 @@
         <artifactId>javax.servlet-api</artifactId>
         <version>${javax-servlet-api.version}</version>
       </dependency>
-
-      <!-- runtime dependencies -->
-      <dependency>
-        <groupId>net.sourceforge.nekohtml</groupId>
-        <artifactId>nekohtml</artifactId>
-        <version>${nekohtml.version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -696,7 +695,7 @@
             <dependency>
               <groupId>org.mockito</groupId>
               <artifactId>mockito-core</artifactId>
-              <version>4.1.0</version>
+              <version>${mockito.version}</version>
             </dependency>
           </dependencies>
         </plugin>