From 82a01d362140e5cdea29b6197ccaf620e5ea00f4 Mon Sep 17 00:00:00 2001
From: ubardale <48932661+ubardale@users.noreply.github.com>
Date: Thu, 18 Feb 2021 15:52:45 -0500
Subject: [PATCH 1/5] Set up CI with Azure Pipelines

[skip ci]
---
 azure-pipelines.yml | 46 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 azure-pipelines.yml

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
new file mode 100644
index 0000000..ef41823
--- /dev/null
+++ b/azure-pipelines.yml
@@ -0,0 +1,46 @@
+# Maven package Java project Web App to Linux on Azure
+# Build your Java project and deploy it to Azure as a Linux web app
+# Add steps that analyze code, save build artifacts, deploy, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/languages/java
+
+trigger:
+- main
+
+variables:
+
+  # Azure Resource Manager connection created during pipeline creation
+  azureSubscription: '92cb4a58-5aeb-4c0c-9bfb-f05c4be9ea29'
+  
+  # Web app name
+  webAppName: 'javashopstaging'
+
+  # Environment name
+  environmentName: 'javashopstaging'
+  
+  # Agent VM image name
+  vmImageName: 'ubuntu-latest'
+
+stages:
+- stage: Build
+  displayName: Build stage
+  jobs:
+  - job: MavenPackageAndPublishArtifacts
+    displayName: Maven Package and Publish Artifacts
+    pool:
+      vmImage: $(vmImageName)
+    
+    steps:
+    - task: Maven@3
+      displayName: 'Maven Package'
+      inputs:
+        mavenPomFile: 'pom.xml'
+
+    - task: CopyFiles@2
+      displayName: 'Copy Files to artifact staging directory'
+      inputs:
+        SourceFolder: '$(System.DefaultWorkingDirectory)'
+        Contents: '**/target/*.?(war|jar)'
+        TargetFolder: $(Build.ArtifactStagingDirectory)
+
+    - upload: $(Build.ArtifactStagingDirectory)
+      artifact: drop
\ No newline at end of file

From 57475532daed46af1216f6f7fdef4673e8a788a6 Mon Sep 17 00:00:00 2001
From: ubardale <48932661+ubardale@users.noreply.github.com>
Date: Thu, 18 Feb 2021 16:05:17 -0500
Subject: [PATCH 2/5] Update azure-pipelines.yml for Azure Pipelines

---
 azure-pipelines.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ef41823..ad2f04b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -8,8 +8,6 @@ trigger:
 
 variables:
 
-  # Azure Resource Manager connection created during pipeline creation
-  azureSubscription: '92cb4a58-5aeb-4c0c-9bfb-f05c4be9ea29'
   
   # Web app name
   webAppName: 'javashopstaging'

From 8090723395e2e00fa55b80393267a3a191396fb1 Mon Sep 17 00:00:00 2001
From: ubardale <48932661+ubardale@users.noreply.github.com>
Date: Thu, 18 Feb 2021 16:07:49 -0500
Subject: [PATCH 3/5] Update azure-pipelines.yml for Azure Pipelines

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ad2f04b..0e17646 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -7,7 +7,7 @@ trigger:
 - main
 
 variables:
-
+ 
   
   # Web app name
   webAppName: 'javashopstaging'

From 4dd3b16cce6f3ce3ac85e20f7ded03a9892e05a2 Mon Sep 17 00:00:00 2001
From: ubardale <48932661+ubardale@users.noreply.github.com>
Date: Thu, 18 Feb 2021 16:11:05 -0500
Subject: [PATCH 4/5] Update azure-pipelines.yml for Azure Pipelines

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0e17646..509d651 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -16,7 +16,7 @@ variables:
   environmentName: 'javashopstaging'
   
   # Agent VM image name
-  vmImageName: 'ubuntu-latest'
+  vmImageName: 'ubuntu-18.04'
 
 stages:
 - stage: Build

From 32a02e40e8a80d722686e837ca0d413379852f08 Mon Sep 17 00:00:00 2001
From: ubardale <48932661+ubardale@users.noreply.github.com>
Date: Thu, 18 Feb 2021 16:13:25 -0500
Subject: [PATCH 5/5] Update azure-pipelines.yml for Azure Pipelines

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 509d651..b3e4b1e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -16,7 +16,7 @@ variables:
   environmentName: 'javashopstaging'
   
   # Agent VM image name
-  vmImageName: 'ubuntu-18.04'
+  vmImageName: 'ubuntu-20.04'
 
 stages:
 - stage: Build