You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2024/10/15 17:48:54 UTC
(activemq-artemis) branch main updated: ARTEMIS-5096 exclude unnecessary jars from console war
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 4f9689ca9f ARTEMIS-5096 exclude unnecessary jars from console war
4f9689ca9f is described below
commit 4f9689ca9f357625b263ba13b09edc6b9a380315
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Thu Oct 10 12:16:27 2024 -0500
ARTEMIS-5096 exclude unnecessary jars from console war
---
artemis-distribution/src/main/assembly/dep.xml | 15 ++++++++++++---
docs/user-manual/versions.adoc | 6 ++++++
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/artemis-distribution/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml
index 2681c7d7b2..3fdb07e23e 100644
--- a/artemis-distribution/src/main/assembly/dep.xml
+++ b/artemis-distribution/src/main/assembly/dep.xml
@@ -72,9 +72,18 @@
<includes>
<include>org.apache.activemq:artemis-console:war</include>
</includes>
- <outputDirectory>web</outputDirectory>
- <unpack>false</unpack>
- <outputFileNameMapping>console.war</outputFileNameMapping>
+ <outputDirectory>web/console.war</outputDirectory>
+ <unpack>true</unpack>
+ <!-- Exclude these jar files from console since they are already provided in the broker distribution.
+ If any of these jars is dropped from the broker distribution they should be added back to the console. -->
+ <unpackOptions>
+ <excludes>
+ <exclude>**/guava*.jar</exclude>
+ <exclude>**/commons-io*.jar</exclude>
+ <exclude>**/commons-logging*.jar</exclude>
+ <exclude>**/failureaccess*.jar</exclude>
+ </excludes>
+ </unpackOptions>
<useProjectArtifact>false</useProjectArtifact>
<directoryMode>0755</directoryMode>
<fileMode>0644</fileMode>
diff --git a/docs/user-manual/versions.adoc b/docs/user-manual/versions.adoc
index a2bda2f1e9..f641d2cf08 100644
--- a/docs/user-manual/versions.adoc
+++ b/docs/user-manual/versions.adoc
@@ -20,6 +20,12 @@ https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315920&versio
* The `two-way` algorithm of the default codec is deprecated, use a custom codec instead.
+=== Upgrading from 2.37.0
+
+* Due to https://issues.apache.org/jira/browse/ARTEMIS-5096[ARTEMIS-5096] the web console's archive (i.e. `console.war`) will now be uncompressed.
+This change was necessary in order to remove certain jar files from the archive which were already being distributed in the broker's main `lib` directory.
+Eliminating these duplicate jars will decrease the size of the broker distribution and it also means the console will, in some cases, use updated dependencies and prevent security tools from flagging older jars.
+
== 2.37.0
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315920&version=12354977[Full release notes]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@activemq.apache.org
For additional commands, e-mail: commits-help@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact