resolve merge conflicts

.github/CODEOWNERS

@@ -30,6 +30,6 @@
 /applications/IgaApplication/                          @KratosMultiphysics/nurbs-breps
 /applications/HDF5Application/                         @KratosMultiphysics/hdf5-application
 /applications/MultilevelMonteCarloApplication/         @KratosMultiphysics/uncertainty-quantification
-/applications/ParticleMechanicsApplication/            @KratosMultiphysics/mpm
+/applications/MPMApplication/                          @KratosMultiphysics/mpm
 /applications/RomApplication/                          @KratosMultiphysics/rom
-/applications/GeoMechanicsApplication/.................@KratosMultiphysics/geomechanics
+/applications/GeoMechanicsApplication/.................@KratosMultiphysics/geomechanics

.github/workflows/build_docker_image_wheelbuilder_linux.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Build the Docker image
         run: docker build scripts/docker_files/docker_file_wheelbuilder_linux/ --tag kratosmultiphysics/kratos-wheelbuilder-linux
       - name: Docker Login
-        uses: azure/docker-login@v1
+        uses: azure/docker-login@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/build_docker_image_wheelbuilder_windows.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Build the Docker image
         run: docker build scripts/docker_files/docker_file_wheelbuilder_windows/ --tag kratosmultiphysics/kratos-wheelbuilder-windows
       - name: Docker Login
-        uses: azure/docker-login@v1
+        uses: azure/docker-login@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/build_docker_images_for_ci.yml

@@ -37,7 +37,7 @@ jobs:
     - name: Build the Docker image
       run: docker build . --file scripts/docker_files/docker_file_ci_ubuntu_22_04/DockerFile --tag kratosmultiphysics/kratos-image-ci-ubuntu-22-04
     - name: Docker Login
-      uses: azure/docker-login@v1
+      uses: azure/docker-login@v2
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
@@ -46,19 +46,19 @@ jobs:
       # only push the new image when the changes are merged to master
       run: docker push kratosmultiphysics/kratos-image-ci-ubuntu-22-04
 
-  build-docker-centos:
+  build-docker-rocky:
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v4
     - name: Build the Docker image
-      run: docker build . --file scripts/docker_files/docker_file_ci_centos_7/DockerFile --tag kratosmultiphysics/kratos-image-ci-centos7
+      run: docker build . --file scripts/docker_files/docker_file_ci_rockylinux8/DockerFile --tag kratosmultiphysics/kratos-image-ci-rocky8
     - name: Docker Login
-      uses: azure/docker-login@v1
+      uses: azure/docker-login@v2
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
     - name: Publish the Docker image
       if: ${{ github.event_name == 'push'}}
       # only push the new image when the changes are merged to master
-      run: docker push kratosmultiphysics/kratos-image-ci-centos7
+      run: docker push kratosmultiphysics/kratos-image-ci-rocky8

.github/workflows/build_docker_images_with_kratos.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Build the Docker image
       run: docker build . --file scripts/docker_files/docker_file_ci_ubuntu_20_04/DockerFile --tag kratosmultiphysics/kratos-image-ubuntu-20-04
     - name: Docker Login
-      uses: azure/docker-login@v1
+      uses: azure/docker-login@v2
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}