Merge pull request #850 from microsoftgraph/ramsessanchez-patch-1

Bug Fixes

Author: baywet

.azure-pipelines/buildAndPackage.yml

@@ -32,7 +32,7 @@ stages:
   - job: Build
     steps: 
     - template: templates/build/checkout-and-credscan.yml
-    - template: templates/build/install-java.yml
+    - template: templates/install-java.yml
     - template: templates/secure-files.yml
       parameters:
         stageID: 'build'
@@ -50,9 +50,9 @@ stages:
      runOnce:
       deploy:
         steps:
-        - template: templates/download-artifacts.yml
+        - template: templates/install-java.yml
         - template: templates/secure-files.yml
-        - template: templates/maven-preview/copy-and-build.yml
+        - template: templates/copy-and-build.yml
           parameters:
             task: 'publishSnapshotPublicationToSonatypeSnapshotRepository'
 
@@ -68,10 +68,11 @@ stages:
      runOnce:
       deploy:
         steps:
+        - template: templates/install-java.yml
         - template: templates/secure-files.yml
           parameters:
             stageID: 'release'
-        - template: templates/maven-release/copy-and-build.yml
+        - template: templates/copy-and-build.yml
           parameters:
             task: 'publishMavenCentralReleasePublicationToSonatypeRepository'
 
@@ -84,6 +85,7 @@ stages:
      runOnce:
       deploy:
         steps: 
+        - template: templates/install-java.yml
         - template: templates/version-and-release.yml
           parameters:
             gitConnection: 'microsoftgraphrelease'

.azure-pipelines/templates/build/build-and-coverage.yml

@@ -1,10 +1,9 @@
 steps:
-  - task: Gradle@2
-    inputs:
-      gradleWrapperFile: 'gradlew'
-      tasks: 'build'
-      publishJUnitResults: true
-      testResultsFiles: '**/TEST-*.xml'
-      javaHomeOption: 'JDKVersion'
-      sonarQubeRunAnalysis: false
-
+- task: Gradle@2
+  inputs:
+    gradleWrapperFile: '$(Build.SourcesDirectory)/gradlew' 
+    tasks: 'build'
+    publishJUnitResults: true
+    testResultsFiles: '**/TEST-*.xml'
+    javaHomeOption: 'JDKVersion'
+    sonarQubeRunAnalysis: false

.azure-pipelines/templates/copy-and-build.yml

@@ -8,12 +8,12 @@ steps:
   inputs:
     SourceFolder: '$(Agent.TempDirectory)'
     Contents: '**'
-    TargetFolder: '$(DROP_PATH)/'
+    TargetFolder: '$(Agent.BuildDirectory)/Drop/'
 
 - task: Gradle@2
   inputs:
-    gradleWrapperFile: '$(DROP_PATH)/gradlew'
-    workingDirectory: '$(DROP_PATH)/'
+    gradleWrapperFile: '$(Agent.BuildDirectory)/Drop/gradlew'
+    workingDirectory: '$(Agent.BuildDirectory)/Drop/'
     options: '-x jar -x javadoc -x javadocJar -x compileJava -x processResources -x classes -x sourceJar'
     tasks: ${{ parameters.task }}
     publishJUnitResults: true

…pelines/templates/build/install-java.yml …ure-pipelines/templates/install-java.yml.azure-pipelines/templates/build/install-java.yml renamed to .azure-pipelines/templates/install-java.yml .azure-pipelines/templates/build/install-java.yml renamed to .azure-pipelines/templates/install-java.yml

@@ -7,7 +7,7 @@ steps:
 - task: PowerShell@2
   inputs:
     filePath: '$(DROP_PATH)/Scripts/getLatestVersion.ps1'
-    arguments: '-propertiesPath "$(PROPERTIES_PATH)"'
+    arguments: '-propertiesPath "$(DROP_PATH)/gradle.properties"'
     pwsh: true
 
 - task: GitHubRelease@1