Merge branch 'master' into fix/issue-6482

.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
 
@@ -93,8 +93,4 @@ runs:
         cp -a  ManagementConsole_AngularApp/node_modules/. ~/ManagementConsole_AngularApp-node_modules-cache/
                   
  
-    - 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
+

.gitignore

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

download_custom_ffmpeg_builds.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+
+if [ ! -f "ffmpeg-7.1-1.5.11-SNAPSHOT-linux-x86_64.jar" ]; then
+    wget -O ffmpeg-7.1-1.5.11-SNAPSHOT-linux-x86_64.jar https://storage.sbg.cloud.ovh.net/v1/AUTH_8cb28f9bc6ee43f0a3a1825efbb4311e/test-storage/ffmpeg-7.1-1.5.11-SNAPSHOT-linux-x86_64.jar
+fi
+
+if [ ! -f "ffmpeg-7.1-1.5.11-SNAPSHOT-linux-arm64.jar" ]; then
+    wget -O ffmpeg-7.1-1.5.11-SNAPSHOT-linux-arm64.jar https://storage.sbg.cloud.ovh.net/v1/AUTH_8cb28f9bc6ee43f0a3a1825efbb4311e/test-storage/ffmpeg-7.1-1.5.11-SNAPSHOT-linux-arm64.jar
+fi
+
+

pom.xml

@@ -653,6 +653,7 @@
                                     </artifactItems>
                                 </configuration>
                             </execution>
+
                         </executions>
                     </plugin>
                     <plugin>
@@ -754,6 +755,17 @@
 									</arguments>
 								</configuration>
 							</execution>
+							<execution>
+								<id>download-custom-ffmpeg-builds</id> <!-- We're downloading custom builds because original files are updated when building and our custom build not works. We overwrite these info in assembely files  -->
+								<phase>package</phase>
+								<goals>
+									<goal>exec</goal>
+								</goals>
+								<configuration>
+							    	<executable>download_custom_ffmpeg_builds.sh</executable>
+								</configuration>
+							</execution>
+
 						</executions>
 			        </plugin>
                     <plugin>
@@ -954,7 +966,18 @@
 									</arguments>
 								</configuration>
 							</execution>
+							<execution>
+								<id>download-custom-ffmpeg-builds</id> <!-- We're downloading custom builds because original files are updated when building and our custom build not works. We overwrite these info in assembely files  -->
+								<phase>package</phase>
+								<goals>
+									<goal>exec</goal>
+								</goals>
+								<configuration>
+							    	<executable>download_custom_ffmpeg_builds.sh</executable>
+								</configuration>
+							</execution>
 						</executions>
+
 			        </plugin>
                     <plugin>
                         <artifactId>maven-assembly-plugin</artifactId>

src/main/assembly/server.xml

@@ -102,8 +102,23 @@
 				<exclude>javacpp*windows*.jar</exclude>	
 				<exclude>cuda*.jar</exclude>
 
+
+				<!-- exclude these files becauwe we write below from the custom build -->
+
+				<exclude>ffmpeg*linux-x86_64.jar</exclude>
+				<exclude>ffmpeg*linux-arm64.jar</exclude>
+
+
 			</excludes>
 		</fileSet>
+		<fileSet> <!-- Overwrite Custom FFmepg Build Plugins - these files are downloaded autoomatically in pom.xml-->
+			<directory>${project.basedir}</directory>
+			<outputDirectory>plugins</outputDirectory>
+			<includes>
+				<include>ffmpeg-*.jar</include>
+			</includes>
+
+		</fileSet>
 		<fileSet>
 			<directory>${project.basedir}/src/main/server</directory>
 			<outputDirectory></outputDirectory>

src/main/assembly/server_enterprise.xml

@@ -106,8 +106,19 @@
 				<exclude>cuda*ppc64le.jar</exclude>
 				<exclude>cuda*macosx*.jar</exclude>
 				<exclude>cuda*windows*.jar</exclude>
+
+				<!-- exclude these files becauwe we write below from the custom build -->
+				<exclude>ffmpeg*linux-x86_64.jar</exclude>
+				<exclude>ffmpeg*linux-arm64.jar</exclude>
 			</excludes>
 		</fileSet>
+		<fileSet> <!-- Overwrite Custom FFmepg Build Plugins - these files are downloaded autoomatically in pom.xml -->
+			<directory>${project.basedir}</directory>
+			<outputDirectory>plugins</outputDirectory>
+			<includes>
+				<include>ffmpeg-*.jar</include>
+			</includes>
+		</fileSet>
 		<fileSet>
 			<directory>${project.basedir}/src/main/server</directory>
 			<outputDirectory></outputDirectory>