This is an automated email from the ASF dual-hosted git repository.

jialiang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit d5645e887f682adc6d15cdc56bce33e6208d3598
Author: Sandeep  Kumar <[email protected]>
AuthorDate: Thu Jan 23 07:01:05 2025 +0530

    AMBARI-26185: Upgrade commons-collections to resolve CVEs (#3936)
---
 ambari-agent/src/packages/tarball/all.xml | 3 ++-
 ambari-server/pom.xml                     | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ambari-agent/src/packages/tarball/all.xml 
b/ambari-agent/src/packages/tarball/all.xml
index 354f3eee6e..934a348e05 100644
--- a/ambari-agent/src/packages/tarball/all.xml
+++ b/ambari-agent/src/packages/tarball/all.xml
@@ -241,8 +241,9 @@
       <includes>
         <include>commons-cli:commons-cli</include>
         <include>commons-collections:commons-collections</include>
-        <include>org.apache.commons:commons-configuration2</include>
         <include>org.apache.commons:commons-compress</include>
+        <include>org.apache.commons:commons-collections4</include>
+        <include>commons-configuration:commons-configuration</include>
         <include>commons-io:commons-io</include>
         <include>commons-lang:commons-lang</include>
         <include>org.apache.commons:commons-lang3</include>
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index dbadd41d24..26f5be5b69 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1409,6 +1409,12 @@
       <version>${mockito.inline.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-inline</artifactId>
+      <version>3.5.10</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-security</artifactId>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to