From e8e5329064fec0a026aafea726fd9e5bb4b71b7d Mon Sep 17 00:00:00 2001
From: srx238 <34555239+srx238@users.noreply.github.com>
Date: Wed, 14 May 2025 20:22:52 +0100
Subject: [PATCH 1/3] Add or update the Azure App Service build and deployment
 workflow config

---
 .github/workflows/main_apptestjavatp238.yml | 66 +++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 .github/workflows/main_apptestjavatp238.yml

diff --git a/.github/workflows/main_apptestjavatp238.yml b/.github/workflows/main_apptestjavatp238.yml
new file mode 100644
index 000000000..75ff3500c
--- /dev/null
+++ b/.github/workflows/main_apptestjavatp238.yml
@@ -0,0 +1,66 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy WAR app to Azure Web App - Apptestjavatp238
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: windows-latest
+    permissions:
+      contents: read #This is required for actions/checkout
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Java version
+        uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: 'microsoft'
+
+      - name: Build with Maven
+        run: mvn clean install
+
+      - name: Upload artifact for deployment job
+        uses: actions/upload-artifact@v4
+        with:
+          name: java-app
+          path: '${{ github.workspace }}/target/*.war'
+
+  deploy:
+    runs-on: windows-latest
+    needs: build
+    environment:
+      name: 'Production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+    permissions:
+      id-token: write #This is required for requesting the JWT
+      contents: read #This is required for actions/checkout
+
+    steps:
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v4
+        with:
+          name: java-app
+      
+      - name: Login to Azure
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_16C52AB1F9C9485CBC0657C8F67B2FA5 }}
+          tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_C56A214DF5454D5A93FED49A06D92DFB }}
+          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_A24F533827794877AD6B334A15A8A7AF }}
+
+      - name: Deploy to Azure Web App
+        id: deploy-to-webapp
+        uses: azure/webapps-deploy@v3
+        with:
+          app-name: 'Apptestjavatp238'
+          slot-name: 'Production'
+          package: '*.war'
+          
\ No newline at end of file

From 020e5466bb597baa56b4293a5e9e6ac2f0a127ea Mon Sep 17 00:00:00 2001
From: srx238 <34555239+srx238@users.noreply.github.com>
Date: Wed, 14 May 2025 21:08:02 +0100
Subject: [PATCH 2/3] Update main_apptestjavatp238.yml

---
 .github/workflows/main_apptestjavatp238.yml | 28 ++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/main_apptestjavatp238.yml b/.github/workflows/main_apptestjavatp238.yml
index 75ff3500c..6e9533eef 100644
--- a/.github/workflows/main_apptestjavatp238.yml
+++ b/.github/workflows/main_apptestjavatp238.yml
@@ -36,25 +36,25 @@ jobs:
   deploy:
     runs-on: windows-latest
     needs: build
-    environment:
-      name: 'Production'
+    environment:
+      name: 'Production'
       url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
-    permissions:
-      id-token: write #This is required for requesting the JWT
-      contents: read #This is required for actions/checkout
+    permissions:
+      id-token: write #This is required for requesting the JWT
+      contents: read #This is required for actions/checkout
 
     steps:
       - name: Download artifact from build job
         uses: actions/download-artifact@v4
         with:
           name: java-app
-      
-      - name: Login to Azure
-        uses: azure/login@v2
-        with:
-          client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_16C52AB1F9C9485CBC0657C8F67B2FA5 }}
-          tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_C56A214DF5454D5A93FED49A06D92DFB }}
-          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_A24F533827794877AD6B334A15A8A7AF }}
+      
+      - name: Login to Azure
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_16C52AB1F9C9485CBC0657C8F67B2FA5 }}
+          tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_C56A214DF5454D5A93FED49A06D92DFB }}
+          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_A24F533827794877AD6B334A15A8A7AF }}
 
       - name: Deploy to Azure Web App
         id: deploy-to-webapp
@@ -62,5 +62,5 @@ jobs:
         with:
           app-name: 'Apptestjavatp238'
           slot-name: 'Production'
-          package: '*.war'
-          
\ No newline at end of file
+          package: '*.jar'
+          

From 8ae1bc17e065b003be1fbf5978cecd26d1ca5cab Mon Sep 17 00:00:00 2001
From: srx238 <34555239+srx238@users.noreply.github.com>
Date: Wed, 14 May 2025 21:11:31 +0100
Subject: [PATCH 3/3] Update main_apptestjavatp238.yml

---
 .github/workflows/main_apptestjavatp238.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main_apptestjavatp238.yml b/.github/workflows/main_apptestjavatp238.yml
index 6e9533eef..80df6b906 100644
--- a/.github/workflows/main_apptestjavatp238.yml
+++ b/.github/workflows/main_apptestjavatp238.yml
@@ -31,7 +31,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: java-app
-          path: '${{ github.workspace }}/target/*.war'
+          path: '${{ github.workspace }}/target/*.jar'
 
   deploy:
     runs-on: windows-latest