From c2bce0fa249f36275b1887847d9f1322855380b2 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Tue, 19 Mar 2024 20:31:50 +0000
Subject: [PATCH] fix: ambari-server/pom.xml to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-ORGCODEHAUSJACKSON-3326362
- https://snyk.io/vuln/SNYK-JAVA-ORGCODEHAUSJACKSON-534878
- https://snyk.io/vuln/SNYK-JAVA-ORGXERIALSNAPPY-5710959
- https://snyk.io/vuln/SNYK-JAVA-ORGXERIALSNAPPY-5710960
- https://snyk.io/vuln/SNYK-JAVA-ORGXERIALSNAPPY-5710961
- https://snyk.io/vuln/SNYK-JAVA-ORGXERIALSNAPPY-5918282
---
 ambari-server/pom.xml | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 6dbdb86fe7d..5dcbeef4dca 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -48,7 +48,7 @@
     <stackHooksLocation>src/main/resources/stack-hooks</stackHooksLocation>
     <stacksSrcLocation>src/main/resources/stacks/${stack.distribution}</stacksSrcLocation>
     <tarballResourcesFolder>src/main/resources</tarballResourcesFolder>
-    <hadoop.version>2.7.2</hadoop.version>
+    <hadoop.version>3.4.0</hadoop.version>
     <ambari.metrics.version>2.7.0.0.0</ambari.metrics.version>
     <empty.dir>src/main/package</empty.dir> <!-- any directory in project with not very big amount of files (not to waste-load them) -->
     <el.log>ALL</el.log> <!-- log level for EclipseLink eclipselink-staticweave-maven-plugin -->
@@ -134,20 +134,17 @@
             <configuration>
               <tasks>
                 <jar destfile="target/DBConnectionVerification.jar">
-                  <fileset dir="${basedir}/target/classes/"
-                    includes="**/DBConnectionVerification.class" />
+                  <fileset dir="${basedir}/target/classes/" includes="**/DBConnectionVerification.class"/>
                   <manifest>
-                    <attribute name="Main-Class"
-                      value="org.apache.ambari.server.DBConnectionVerification" />
+                    <attribute name="Main-Class" value="org.apache.ambari.server.DBConnectionVerification"/>
                   </manifest>
                 </jar>
                 <jar destfile="target/CredentialUtil.jar">
                   <fileset dir="${basedir}/target/classes/">
-                    <include name="**/CredentialUtil*.class" />
+                    <include name="**/CredentialUtil*.class"/>
                   </fileset>
                   <manifest>
-                    <attribute name="Main-Class"
-                               value="org.apache.ambari.server.credentialapi.CredentialUtil" />
+                    <attribute name="Main-Class" value="org.apache.ambari.server.credentialapi.CredentialUtil"/>
                   </manifest>
                 </jar>
               </tasks>
@@ -167,9 +164,9 @@
               <target>
                 <copy todir="${ambari-admin-dir}/target" flatten="true">
                   <fileset dir="${contrib-views-dir}">
-                    <include name="*/target/*jar" />
-                    <exclude name="**/ambari-views-utils*jar" />
-                    <exclude name="**/ambari-views-commons*jar" />
+                    <include name="*/target/*jar"/>
+                    <exclude name="**/ambari-views-utils*jar"/>
+                    <exclude name="**/ambari-views-commons*jar"/>
                   </fileset>
                 </copy>
               </target>
@@ -428,7 +425,7 @@
               <swaggerApiReader>org.apache.ambari.swagger.AmbariSwaggerReader</swaggerApiReader>
               <springmvc>false</springmvc>
               <locations>org.apache.ambari.server.api.services</locations>
-              <schemes></schemes>
+              <schemes/>
               <basePath>/api/v1</basePath>
               <info>
                 <title>Swagger spec for Ambari REST API</title>
@@ -697,8 +694,7 @@
               <outputDir>${project.basedir}/target/findbugs</outputDir>
               <stylesheet>fancy-hist.xsl</stylesheet>
               <fileMappers>
-                <fileMapper
-                        implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
+                <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
                   <targetExtension>.html</targetExtension>
                 </fileMapper>
               </fileMappers>
@@ -861,12 +857,11 @@
                 </goals>
                 <configuration>
                   <target name="ambari-server-compile">
-                    <exec dir="${basedir}" executable="bash"
-                      failonerror="true">
-                      <arg value="${basedir}/set-hdp-repo-url.sh" />
-                      <arg value="${hdpUrlForCentos6}" />
-                      <arg value="${hdpLatestUrl}" />
-                      <arg value="${basedir}" />
+                    <exec dir="${basedir}" executable="bash" failonerror="true">
+                      <arg value="${basedir}/set-hdp-repo-url.sh"/>
+                      <arg value="${hdpUrlForCentos6}"/>
+                      <arg value="${hdpLatestUrl}"/>
+                      <arg value="${basedir}"/>
                     </exec>
                   </target>
                 </configuration>
@@ -1028,7 +1023,7 @@
         <executable.python>${project.basedir}/../ambari-common/src/main/unix/ambari-python-wrap</executable.python>
         <executable.shell>sh</executable.shell>
         <fileextension.shell>sh</fileextension.shell>
-        <fileextension.dot.shell-default></fileextension.dot.shell-default>
+        <fileextension.dot.shell-default/>
         <path.python.1>${project.basedir}/../ambari-common/src/main/python:${project.basedir}/../ambari-agent/src/main/python:${project.basedir}/../ambari-common/src/main/python/ambari_jinja2:${project.basedir}/../ambari-common/src/main/python/ambari_commons:${project.basedir}/../ambari-common/src/test/python:${project.basedir}/src/main/python:${project.basedir}/src/main/python/ambari-server-state:${project.basedir}/src/main/resources/custom_actions:${project.basedir}/src/main/resources/scripts:${project.basedir}/src/test/python</path.python.1>
         <assemblydescriptor>src/main/assemblies/server.xml</assemblydescriptor>
       </properties>