Skip to content

Commit f8a5614

Browse files
baywetbaywet
authored
Merge pull request #144 from microsoftgraph/bugfix/java-version
- adds java 15 installation for perf and latest language features
2 parents 5027457 + f973ffa commit f8a5614

File tree

8 files changed

+101
-123
lines changed

8 files changed

+101
-123
lines changed

‎.azure-pipelines/buildAndPackage.yml‎

Lines changed: 8 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ trigger:
1414
include:
1515
- src/*
1616
exclude:
17+
- .gradle/wrapper
1718
- .gitignore
1819
- CONTRIBUTING.md
1920
- LICENSE
2021
- THIRD PARTY NOTICES
21-
- build.gradle
2222
- gradle.properties
2323
- gradlew
2424
- gradlew.bat
@@ -29,85 +29,12 @@ trigger:
2929
pr: none
3030

3131
pool:
32-
vmImage: 'windows-latest'
32+
vmImage: windows-latest
3333

3434
steps:
35-
- checkout: self
36-
clean: true
37-
fetchDepth: 1
38-
39-
- task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
40-
displayName: 'Run CredScan'
41-
inputs:
42-
debugMode: false
43-
44-
- task: DownloadSecureFile@1
45-
inputs:
46-
secureFile: 'local.properties'
47-
48-
- task: DownloadSecureFile@1
49-
inputs:
50-
secureFile: 'secring.gpg'
51-
52-
- task: DownloadSecureFile@1
53-
inputs:
54-
secureFile: 'secring.gpg.lock'
55-
56-
- task: CopyFiles@2
57-
inputs:
58-
SourceFolder: '$(Agent.TempDirectory)'
59-
Contents: '**'
60-
TargetFolder: '$(System.DefaultWorkingDirectory)'
61-
62-
- task: Gradle@2
63-
inputs:
64-
gradleWrapperFile: 'gradlew'
65-
tasks: 'build'
66-
publishJUnitResults: true
67-
testResultsFiles: '**/TEST-*.xml'
68-
javaHomeOption: 'JDKVersion'
69-
sonarQubeRunAnalysis: false
70-
71-
- task: PublishCodeCoverageResults@1
72-
inputs:
73-
codeCoverageTool: 'JaCoCo'
74-
summaryFileLocation: $(System.DefaultWorkingDirectory)/build/reports/jacoco/test/jacocoTestReport.xml
75-
pathToSources: $(System.DefaultWorkingDirectory)/src/main/java
76-
failIfCoverageEmpty: true
77-
78-
- task: PublishBuildArtifacts@1
79-
displayName: 'Publish Artifact: drop'
80-
inputs:
81-
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
82-
83-
- task: CopyFiles@2
84-
inputs:
85-
SourceFolder: '$(System.DefaultWorkingDirectory)'
86-
Contents: |
87-
**/libs/*
88-
build/generated-pom.xml
89-
build/generated-pom.xml.asc
90-
build.gradle
91-
gradlew
92-
gradlew.bat
93-
settings.gradle
94-
gradle.properties
95-
**/gradle/**
96-
Scripts/**
97-
TargetFolder: '$(Build.ArtifactStagingDirectory)/'
98-
99-
- task: PublishBuildArtifacts@1
100-
inputs:
101-
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
102-
ArtifactName: 'drop'
103-
publishLocation: 'Container'
104-
105-
- task: YodLabs.O365PostMessage.O365PostMessageBuild.O365PostMessageBuild@0
106-
displayName: 'Graph Client Tooling pipeline fail notification'
107-
inputs:
108-
addressType: serviceEndpoint
109-
serviceEndpointName: 'microsoftgraph pipeline status'
110-
title: '$(Build.DefinitionName) failure notification'
111-
text: 'This pipeline has failed. View the build details for further information. This is a blocking failure.'
112-
condition: and(failed(), ne(variables['Build.Reason'], 'Manual'))
113-
enabled: true
35+
- template: templates/checkout-and-credscan.yml
36+
- template: templates/install-java.yml
37+
- template: templates/secure-files.yml
38+
- template: templates/build-and-coverage.yml
39+
- template: templates/publish-artefacts.yml
40+
- template: templates/alert-failure.yml

‎.azure-pipelines/prValidate.yml‎

Lines changed: 8 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
pr:
77
branches:
88
include:
9-
- master
10-
- main
119
- dev
10+
- main
11+
- master
12+
- feature/v2
1213
paths:
1314
exclude:
14-
- .azure-pipelines
1515
- .gradle/wrapper
1616
- .gitignore
1717
- CONTRIBUTING.md
@@ -26,45 +26,11 @@ pr:
2626

2727
trigger: none # disable triggers based on commits.
2828

29-
variables:
30-
PACKAGE_NAME: 'microsoft-graph-core'
31-
PROPERTIES_PATH: '.\gradle.properties'
32-
33-
pool:
29+
pool:
3430
vmImage: windows-latest
3531

3632
steps:
37-
- checkout: self
38-
clean: true
39-
fetchDepth: 1
40-
41-
- task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
42-
displayName: 'Run CredScan'
43-
inputs:
44-
debugMode: false
45-
46-
- task: Gradle@2
47-
inputs:
48-
gradleWrapperFile: 'gradlew'
49-
tasks: 'build'
50-
publishJUnitResults: true
51-
testResultsFiles: '**/TEST-*.xml'
52-
javaHomeOption: 'JDKVersion'
53-
sonarQubeRunAnalysis: false
54-
55-
- task: PublishCodeCoverageResults@1
56-
inputs:
57-
codeCoverageTool: 'JaCoCo'
58-
summaryFileLocation: $(System.DefaultWorkingDirectory)/build/reports/jacoco/test/jacocoTestReport.xml
59-
pathToSources: $(System.DefaultWorkingDirectory)/src/main/java
60-
failIfCoverageEmpty: true
61-
62-
- task: YodLabs.O365PostMessage.O365PostMessageBuild.O365PostMessageBuild@0
63-
displayName: 'Graph Client Tooling pipeline fail notification'
64-
inputs:
65-
addressType: serviceEndpoint
66-
serviceEndpointName: 'microsoftgraph pipeline status'
67-
title: '$(Build.DefinitionName) failure notification'
68-
text: 'This pipeline has failed. View the build details for further information. This is a blocking failure. '
69-
condition: and(failed(), ne(variables['Build.Reason'], 'Manual'))
70-
enabled: true
33+
- template: templates/checkout-and-credscan.yml
34+
- template: templates/install-java.yml
35+
- template: templates/build-and-coverage.yml
36+
- template: templates/alert-failure.yml

‎.azure-pipelines/templates/alert-failure.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
steps:
2+
- task: YodLabs.O365PostMessage.O365PostMessageBuild.O365PostMessageBuild@0
3+
displayName: 'Graph Client Tooling pipeline fail notification'
4+
inputs:
5+
addressType: serviceEndpoint
6+
serviceEndpointName: 'microsoftgraph pipeline status'
7+
title: '$(Build.DefinitionName) failure notification'
8+
text: 'This pipeline has failed. View the build details for further information. This is a blocking failure. '
9+
condition: and(failed(), ne(variables['Build.Reason'], 'Manual'))
10+
enabled: true

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
steps:
2+
- task: Gradle@2
3+
inputs:
4+
gradleWrapperFile: 'gradlew'
5+
tasks: 'build'
6+
publishJUnitResults: true
7+
testResultsFiles: '**/TEST-*.xml'
8+
javaHomeOption: 'JDKVersion'
9+
sonarQubeRunAnalysis: false
10+
11+
- task: PublishCodeCoverageResults@1
12+
inputs:
13+
codeCoverageTool: 'JaCoCo'
14+
summaryFileLocation: $(System.DefaultWorkingDirectory)/build/reports/jacoco/test/jacocoTestReport.xml
15+
pathToSources: $(System.DefaultWorkingDirectory)/src/main/java
16+
failIfCoverageEmpty: true

‎.azure-pipelines/templates/checkout-and-credscan.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
steps:
2+
- checkout: self
3+
clean: true
4+
fetchDepth: 1
5+
6+
- task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
7+
displayName: 'Run CredScan'
8+
inputs:
9+
debugMode: false

‎.azure-pipelines/templates/install-java.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
steps:
2+
- pwsh: 'Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.zip -OutFile OpenJDK.zip'
3+
displayName: 'Download JDK'
4+
5+
- task: JavaToolInstaller@0
6+
inputs:
7+
versionSpec: '15'
8+
jdkArchitectureOption: 'x64'
9+
jdkSourceOption: 'LocalDirectory'
10+
jdkFile: 'OpenJDK.zip'
11+
jdkDestinationDirectory: 'binaries'

‎.azure-pipelines/templates/publish-artefacts.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
steps:
2+
- task: CopyFiles@2
3+
inputs:
4+
SourceFolder: '$(System.DefaultWorkingDirectory)'
5+
Contents: |
6+
**/libs/*
7+
build/generated-pom.xml
8+
build/generated-pom.xml.asc
9+
build.gradle
10+
gradlew
11+
gradlew.bat
12+
settings.gradle
13+
gradle.properties
14+
**/gradle/**
15+
Scripts/**
16+
TargetFolder: '$(Build.ArtifactStagingDirectory)/'
17+
18+
- task: PublishBuildArtifacts@1
19+
displayName: 'Publish Artifact: drop'
20+
inputs:
21+
PathtoPublish: '$(Build.ArtifactStagingDirectory)'

‎.azure-pipelines/templates/secure-files.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
steps:
2+
- task: DownloadSecureFile@1
3+
inputs:
4+
secureFile: 'local.properties'
5+
6+
- task: DownloadSecureFile@1
7+
inputs:
8+
secureFile: 'secring.gpg'
9+
10+
- task: DownloadSecureFile@1
11+
inputs:
12+
secureFile: 'secring.gpg.lock'
13+
14+
- task: CopyFiles@2
15+
inputs:
16+
SourceFolder: '$(Agent.TempDirectory)'
17+
Contents: '**'
18+
TargetFolder: '$(System.DefaultWorkingDirectory)'

0 commit comments

Comments
 (0)