@@ -22,11 +22,18 @@ jobs:
2222 Directory : " "
2323 CheckLinkGuidance : $true
2424
25+ # We `install` the code quality reports tooling into our local m2 cache separately from building the Maven project
26+ # reports. This means it is available as part of that, but also so that this is not documented in the project report.
27+ - template : templates/steps/install-reporting-tools.yml
28+ parameters :
29+ Options : --batch-mode
30+ MavenOptions : $(MemoryOptions) $(LoggingOptions)
31+
2532 - task : Maven@3
2633 displayName : ' Build All Libraries'
2734 inputs :
2835 mavenPomFile : pom.xml
29- options : ' $(DefaultOptions) -T 1C -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Djacoco.skip=true -Drevapi.skip=true'
36+ options : ' $(DefaultOptions) -T 1C -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Djacoco.skip=true -Drevapi.skip=true -Paggregatereports '
3037 mavenOptions : ' $(MemoryOptions) $(LoggingOptions)'
3138 javaHomeOption : ' JDKVersion'
3239 jdkVersionOption : $(JavaBuildVersion)
@@ -39,12 +46,12 @@ jobs:
3946 # builds should be sufficient.
4047 condition : and(succeededOrFailed(), ne(variables['Build.Reason'], 'PullRequest'))
4148 displayName : ' Component Detection'
42-
49+
4350 - task : Maven@3
4451 displayName : ' Generate Reports'
4552 inputs :
4653 mavenPomFile : pom.xml
47- options : ' $(DefaultOptions) -Dinclude-non-shipping-modules -Ddependency-checker - Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true -pl com.azure:jacoco-test-coverage -am '
54+ options : ' $(DefaultOptions) -Dinclude-non-shipping-modules -Dgpg.skip -Paggregatereports '
4855 mavenOptions : ' $(MemoryOptions) $(LoggingOptions)'
4956 javaHomeOption : ' JDKVersion'
5057 jdkVersionOption : $(JavaBuildVersion)
@@ -63,25 +70,24 @@ jobs:
6370 - task : PublishCodeCoverageResults@1
6471 inputs :
6572 codeCoverageTool : JaCoCo
66- summaryFileLocation : eng/jacoco-test-coverage/ target/site/test-coverage/jacoco.xml
67- reportDirectory : eng/jacoco-test-coverage/ target/site/test-coverage/
68- failIfCoverageEmpty : true
73+ summaryFileLocation : target/site/test-coverage/jacoco.xml
74+ reportDirectory : target/site/test-coverage/
75+ failIfCoverageEmpty : false
6976
7077 # Publish code coverage to an artifact so it can be uploaded to the Maven site.
7178 # Do this for track 2 modules only. Code coverage from previous step is only published for Linux + Java LTS.
7279 - task : PublishPipelineArtifact@0
7380 displayName : ' Publish coverage artifact'
7481 inputs :
7582 artifactName : coverage
76- targetPath : eng/jacoco-test-coverage/ target/site/
83+ targetPath : target/site/
7784
7885 - pwsh : |
7986 $(Build.SourcesDirectory)/eng/DependencyGraph/gen-dep-graph-data.ps1
8087 displayName: Generate Interdependency Report Data
8188
8289 - pwsh : |
83- Copy-Item eng/jacoco-test-coverage/target/staging $(Build.ArtifactStagingDirectory) -Recurse
84- Copy-Item eng/jacoco-test-coverage/target/dependency-allowlist.json $(Build.ArtifactStagingDirectory)/staging
90+ Copy-Item target/staging $(Build.ArtifactStagingDirectory) -Recurse
8591 Copy-Item eng/code-quality-reports/src/main/resources/index.html $(Build.ArtifactStagingDirectory)
8692 Copy-Item eng/code-quality-reports/src/main/resources/dependency-allowlist.html $(Build.ArtifactStagingDirectory)/staging
8793
@@ -96,10 +102,3 @@ jobs:
96102 condition : succeededOrFailed()
97103 displayName : ' Publish Report Artifacts'
98104 artifact : reports
99-
100- - task : PowerShell@2
101- displayName : " Verify Repository Resource Refs"
102- inputs :
103- pwsh : true
104- workingDirectory : $(Build.SourcesDirectory)
105- filePath : eng/common/scripts/Verify-Resource-Ref.ps1
0 commit comments