Merge branch 'update-ffmpeg' of

https://github.com/ant-media/Ant-Media-Server.git into update-ffmpeg

.github/actions/build-projects/action.yml

@@ -10,7 +10,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-      
+
     - name: Clone and build Ant Media Server Parent project
       shell: bash
       run: |
@@ -19,7 +19,7 @@ runs:
           mvn clean install -DskipTests -Dmaven.javadoc.skip=true -Dgpg.skip=true --quiet
           cd ..
      
-    - name: Build Ant Media Server project
+    - name: Build Ant Media Server project #let the dependencies be resolved
       shell: bash
       run: mvn clean install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -Dgpg.skip=true --quiet
 
@@ -96,5 +96,5 @@ runs:
     - name: Replace ffmpeg builds
       shell: bash
       run: |
-          wget -O ~/.m2/repository/org/bytedeco/ffmpeg/5.1.2-1.5.8/ffmpeg-5.1.2-1.5.8-linux-x86_64.jar https://storage.sbg.cloud.ovh.net/v1/AUTH_8cb28f9bc6ee43f0a3a1825efbb4311e/test-storage/ffmpeg-5.1.2-1.5.8-linux-x86_64.jar
-          wget -O ~/.m2/repository/org/bytedeco/ffmpeg/5.1.2-1.5.8/ffmpeg-5.1.2-1.5.8-linux-arm64.jar https://storage.sbg.cloud.ovh.net/v1/AUTH_8cb28f9bc6ee43f0a3a1825efbb4311e/test-storage/ffmpeg-5.1.2-1.5.8-linux-arm64.jar
+           wget -O ~/.m2/repository/org/bytedeco/ffmpeg/7.1-1.5.11/ffmpeg-7.1-1.5.11-linux-x86_64.jar https://storage.sbg.cloud.ovh.net/v1/AUTH_8cb28f9bc6ee43f0a3a1825efbb4311e/test-storage/ffmpeg-7.1-1.5.11-linux-x86_64.jar
+           wget -O ~/.m2/repository/org/bytedeco/ffmpeg/7.1-1.5.11/ffmpeg-7.1-1.5.11-linux-arm64.jar https://storage.sbg.cloud.ovh.net/v1/AUTH_8cb28f9bc6ee43f0a3a1825efbb4311e/test-storage/ffmpeg-7.1-1.5.11-linux-arm64.jar

.gitignore

@@ -20,4 +20,5 @@ temp/
 
 *.iml
 .idea
-.fleet
+.fleet
+/ffmpeg*.jar

pom.xml

@@ -532,6 +532,15 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpmime</artifactId>
             <version>${httpmime.version}</version>
+        </dependency>
+          <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+                <!-- We explicityly overwrite below to resolve the CVE-2020-13956 vulnerability (We don't need to add this dependency explicitly, it's already added by other dependencies) ) 
+             We need to upgrade the httpclient to 5 later when all other dependent libs are up to date
+             mekya   -->
+
+            <version>4.5.13</version>
         </dependency>
         <dependency>
 		    <groupId>org.apache.kafka</groupId>
@@ -653,6 +662,7 @@
                                     </artifactItems>
                                 </configuration>
                             </execution>
+
                         </executions>
                     </plugin>
                     <plugin>
@@ -754,6 +764,8 @@
 									</arguments>
 								</configuration>
 							</execution>
+
+
 						</executions>
 			        </plugin>
                     <plugin>
@@ -955,6 +967,7 @@
 								</configuration>
 							</execution>
 						</executions>
+
 			        </plugin>
                     <plugin>
                         <artifactId>maven-assembly-plugin</artifactId>

src/main/assembly/server.xml

@@ -102,8 +102,11 @@
 				<exclude>javacpp*windows*.jar</exclude>	
 				<exclude>cuda*.jar</exclude>
 
+
+
 			</excludes>
 		</fileSet>
+
 		<fileSet>
 			<directory>${project.basedir}/src/main/server</directory>
 			<outputDirectory></outputDirectory>

src/main/assembly/server_enterprise.xml

@@ -106,6 +106,8 @@
 				<exclude>cuda*ppc64le.jar</exclude>
 				<exclude>cuda*macosx*.jar</exclude>
 				<exclude>cuda*windows*.jar</exclude>
+
+
 			</excludes>
 		</fileSet>
 		<fileSet>