From a8f7661ef31075e5e2fab71c583e6fba2db9a203 Mon Sep 17 00:00:00 2001 From: Mahesh515 <58096944+Mahesh515@users.noreply.github.com> Date: Mon, 13 Jul 2020 16:26:47 +0530 Subject: [PATCH 1/8] Create Jenkinsfile --- Jenkinsfile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..1a7612b --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,17 @@ +node { + stage('Init') { + checkout scm + } + + stage('Build') { + sh 'mvn clean package' + } + + stage('Publish') { + azureFunctionAppPublish appName: env.FUNCTION_NAME, + azureCredentialsId: env.AZURE_CRED_ID, + filePath: '**/*.json,**/*.jar,bin/*,HttpTrigger-Java/*', + resourceGroup: env.RES_GROUP, + sourceDirectory: 'target/azure-functions/odd-or-even-function-sample' + } +} From 2797651d3bb1cc496c74544bd15781e3d1dd20bf Mon Sep 17 00:00:00 2001 From: Mahesh515 <58096944+Mahesh515@users.noreply.github.com> Date: Mon, 13 Jul 2020 16:49:33 +0530 Subject: [PATCH 2/8] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1a7612b..ea1e29a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ node { stage('Publish') { azureFunctionAppPublish appName: env.FUNCTION_NAME, azureCredentialsId: env.AZURE_CRED_ID, - filePath: '**/*.json,**/*.jar,bin/*,HttpTrigger-Java/*', + filePath: '/var/lib/jenkins/workspace/myfunctionapp1/target/*.jar, resourceGroup: env.RES_GROUP, sourceDirectory: 'target/azure-functions/odd-or-even-function-sample' } From c154550747ce5e33043735797e4dd1ec2d1678ae Mon Sep 17 00:00:00 2001 From: Mahesh515 <58096944+Mahesh515@users.noreply.github.com> Date: Mon, 13 Jul 2020 16:50:51 +0530 Subject: [PATCH 3/8] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ea1e29a..14cea4a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ node { stage('Publish') { azureFunctionAppPublish appName: env.FUNCTION_NAME, azureCredentialsId: env.AZURE_CRED_ID, - filePath: '/var/lib/jenkins/workspace/myfunctionapp1/target/*.jar, + filePath: '/var/lib/jenkins/workspace/myfunctionapp1/target/*.jar', resourceGroup: env.RES_GROUP, sourceDirectory: 'target/azure-functions/odd-or-even-function-sample' } From d18939599daa54b07c437cfe8c884d49ca5872c2 Mon Sep 17 00:00:00 2001 From: Edula Date: Tue, 14 Jul 2020 21:15:47 +0530 Subject: [PATCH 4/8] my first commit --- src/main/java/com/microsoft/azure/Function.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/microsoft/azure/Function.java b/src/main/java/com/microsoft/azure/Function.java index ed18a5c..2245c7e 100644 --- a/src/main/java/com/microsoft/azure/Function.java +++ b/src/main/java/com/microsoft/azure/Function.java @@ -25,3 +25,5 @@ public HttpResponseMessage run(@HttpTrigger(name = "req", methods = { HttpMethod } } } + +my 2nd commit From 699411e9ce88fb58007678f55b48a7a7034c8136 Mon Sep 17 00:00:00 2001 From: Edula Date: Tue, 14 Jul 2020 21:19:28 +0530 Subject: [PATCH 5/8] my 2nd commit --- src/main/java/com/microsoft/azure/Function.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/microsoft/azure/Function.java b/src/main/java/com/microsoft/azure/Function.java index ed18a5c..2245c7e 100644 --- a/src/main/java/com/microsoft/azure/Function.java +++ b/src/main/java/com/microsoft/azure/Function.java @@ -25,3 +25,5 @@ public HttpResponseMessage run(@HttpTrigger(name = "req", methods = { HttpMethod } } } + +my 2nd commit From 2a231d3711342949a20cffcd74e99b0c44d042a9 Mon Sep 17 00:00:00 2001 From: Edula Date: Tue, 14 Jul 2020 21:22:14 +0530 Subject: [PATCH 6/8] my first commit --- sample.java | 1 + 1 file changed, 1 insertion(+) create mode 100644 sample.java diff --git a/sample.java b/sample.java new file mode 100644 index 0000000..d2b5da0 --- /dev/null +++ b/sample.java @@ -0,0 +1 @@ +my first 10 lines From 80ee73953f3fdd3c4eb7264ded44e52e40e28d1d Mon Sep 17 00:00:00 2001 From: Edula Date: Wed, 15 Jul 2020 16:06:48 +0530 Subject: [PATCH 7/8] my 1st commit --- sample.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sample.java b/sample.java index d2b5da0..1d42333 100644 --- a/sample.java +++ b/sample.java @@ -1 +1,7 @@ my first 10 lines + +my 2nd 10 lines + +my 3rd 10 lines + +my 4th 10 lines From 1552c49135f81150b62b4dd31d2b04a89519ae7d Mon Sep 17 00:00:00 2001 From: "EAD\\medula" Date: Fri, 17 Jul 2020 14:36:44 +0530 Subject: [PATCH 8/8] updated salesorder.xml file --- sample.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sample.java b/sample.java index 1d42333..daba256 100644 --- a/sample.java +++ b/sample.java @@ -1,7 +1,3 @@ -my first 10 lines - -my 2nd 10 lines - -my 3rd 10 lines - -my 4th 10 lines +sum(detail.net_del_units_6wk) as net_del_units_6wk, + sum(stale.stale_units_prev_13wk) as stale_units_prev_13wk, + sum(stale.sales_units_prev_13wk) as sales_units_prev_13wk \ No newline at end of file