Update dependencies

* Awaitility to 4.2.1 * Log4J to 2.23.1 * Maven plugins: install to 3.1.2, cargo to 1.10.13 closes #337 closes #338 closes #339
apache · May 1, 2024 · 3cefebd · 3cefebd
1 parent f79d41c
commit 3cefebd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/LICENSE b/LICENSE
@@ -254,10 +254,10 @@ jmespath-java-1.12.565                      LICENSE
 joda-time-2.8.1                             LICENSE
 jstl-1.2.jar                                LICENSE
 logging-mailhandler-1.6.2.jar               ./jspwiki-war/src/main/config/doc/LICENSE.cddl
-log4j-1.2-api-2.23.0.jar                    LICENSE
-log4j-api-2.23.0.jar                        LICENSE
-log4j-core-2.23.0.jar                       LICENSE
-log4j-slf4j-impl-2.23.0                     LICENSE
+log4j-1.2-api-2.23.1.jar                    LICENSE
+log4j-api-2.23.1.jar                        LICENSE
+log4j-core-2.23.1.jar                       LICENSE
+log4j-slf4j-impl-2.23.1                     LICENSE
 lucene-analyzers-common-9.10.0.jar          LICENSE
 lucene-backward-codecs-9.10.0.jar           LICENSE
 lucene-core-9.10.0.jar                      LICENSE
@@ -281,7 +281,7 @@ xpp3-1.1.3.4-RC3                            ./jspwiki-war/src/main/config/doc/LI
 
 TEST LIBRARY                                LICENSE FILE
 =============================================================================================================
-awaitility-4.2.0.jar                        LICENSE
+awaitility-4.2.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.7.2.jar                            ./jspwiki-war/src/main/config/doc/LICENSE.hsqldb

diff --git a/pom.xml b/pom.xml
@@ -45,7 +45,7 @@
     <maven.version>3.5</maven.version>
 
     <akismet-java.version>1.02</akismet-java.version>
-    <awaitility.version>4.2.0</awaitility.version>
+    <awaitility.version>4.2.1</awaitility.version>
     <aws-java-sdk-kendra.version>1.12.565</aws-java-sdk-kendra.version>
     <commons-collections.version>4.4</commons-collections.version>
     <commons-fileupload.version>1.5</commons-fileupload.version>
@@ -68,7 +68,7 @@
     <jetty.version>9.4.54.v20240208</jetty.version>
     <jrcs-diff.version>0.4.2</jrcs-diff.version>
     <junit.version>5.10.2</junit.version>
-    <log4j2.version>2.23.0</log4j2.version>
+    <log4j2.version>2.23.1</log4j2.version>
     <lucene.version>9.10.0</lucene.version>
     <mockito.version>5.11.0</mockito.version>
     <nekohtml.version>2.1.2</nekohtml.version>
@@ -88,7 +88,7 @@
     <plugin.compiler.version>3.13.0</plugin.compiler.version>
     <plugin.dependency.version>3.6.1</plugin.dependency.version>
     <plugin.enforcer.version>3.4.1</plugin.enforcer.version>
-    <plugin.install.version>3.1.1</plugin.install.version>
+    <plugin.install.version>3.1.2</plugin.install.version>
     <plugin.jar.version>3.4.1</plugin.jar.version>
     <plugin.javadoc.version>3.6.3</plugin.javadoc.version>
     <plugin.jxr.version>3.3.2</plugin.jxr.version>
@@ -104,7 +104,7 @@
     <plugin.jspc.version>3.2.2</plugin.jspc.version>
     <plugin.checksum.version>1.11</plugin.checksum.version>
     <plugin.jslint.version>1.0.1</plugin.jslint.version>
-    <plugin.cargo.version>1.10.11</plugin.cargo.version>
+    <plugin.cargo.version>1.10.13</plugin.cargo.version>
     <plugin.clirr.version>2.8</plugin.clirr.version>
     <plugin.cobertura.version>2.7</plugin.cobertura.version>
     <plugin.cyclonedx.version>2.8.0</plugin.cyclonedx.version>
@@ -952,7 +952,7 @@
 
   <profiles>
     <profile>
-      <id>build-wikipages-zip</id>
+      <id>build-wikipages-zips</id>
       <activation>
         <file>
           <exists>../assembly/zip.xml</exists>
@@ -968,12 +968,21 @@
                 <phase>package</phase>
                 <goals><goal>single</goal></goals>
                 <configuration>
-                  <appendAssemblyId>false</appendAssemblyId>
                   <descriptors>
                     <descriptor>../assembly/zip.xml</descriptor>
                   </descriptors>
                 </configuration>
               </execution>
+              <execution>
+                <id>create-markdown-wikipages-zip</id>
+                <phase>package</phase>
+                <goals><goal>single</goal></goals>
+                <configuration>
+                  <descriptors>
+                    <descriptor>../assembly/zip-markdown.xml</descriptor>
+                  </descriptors>
+                </configuration>
+              </execution>
             </executions>
           </plugin>
         </plugins>