Fix javadoc and jacoco aggregate reports publishing (Azure#23764)

* Fix javadoc and jacoco aggregate reports publishing

Author: srnagar

eng/bomgenerator/pom.xml

@@ -76,7 +76,7 @@
           <arguments>
             <argument>-inputdir=${project.basedir}/inputdir</argument>
             <argument>-outputdir=${project.basedir}/outputdir</argument>
-            <argument>-mode=analyze</argument>
+            <argument>-mode=generate</argument>
           </arguments>
           <cleanupDaemonThreads>false</cleanupDaemonThreads>
         </configuration>

eng/code-quality-reports/src/main/resources/index.html

@@ -517,7 +517,7 @@ <h2>Azure Java SDK</h2>
                     </li>
                     <li class="list-group-item sub-component">
                         <ion-icon name="ribbon"></ion-icon>
-                        <a href="test-coverage/index.html" target="_blank" class="links">Test coverage (Aggregate)</a>
+                        <a href="staging/test-coverage/index.html" target="_blank" class="links">Test coverage (Aggregate)</a>
                     </li>
                     <li class="list-group-item sub-component">
                         <ion-icon name="copy"></ion-icon>

eng/pipelines/aggregate-reports.yml

@@ -39,38 +39,57 @@ stages:
           displayName: 'Build All Libraries'
           inputs:
             mavenPomFile: pom.xml
-            options: '$(DefaultOptions) -T 2C -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcodesnippet.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Djacoco.skip=true -Drevapi.skip=true -Paggregatereports'
+            options: '$(DefaultOptions) -T 2C -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcodesnippet.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Djacoco.skip=true -Drevapi.skip=true'
             mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
             javaHomeOption: 'JDKVersion'
             jdkVersionOption: $(JavaBuildVersion)
             jdkArchitectureOption: 'x64'
             publishJUnitResults: false
             goals: 'clean install'
 
+        - pwsh: |
+            New-Item eng/bomgenerator/inputdir -ItemType directory
+            Copy-Item sdk/boms/azure-sdk-bom/pom.xml eng/bomgenerator/inputdir/
+            Copy-Item eng/versioning/version_client.txt eng/bomgenerator/inputdir/
+          displayName: Copy input files for BOM generation
+
+        - task: Maven@3
+          condition: succeededOrFailed()
+          displayName: 'Generate BOM Reports'
+          inputs:
+            mavenPomFile: eng/bomgenerator/pom.xml
+            options: '$(DefaultOptions)'
+            mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
+            javaHomeOption: 'JDKVersion'
+            jdkVersionOption: $(JavaBuildVersion)
+            jdkArchitectureOption: 'x64'
+            publishJUnitResults: false
+            goals: 'clean package'
+
+
         - task: Maven@3
-          displayName: 'Generate Reports'
+          displayName: 'Generate Aggregate JavaDocs'
           inputs:
             mavenPomFile: pom.xml
-            options: '$(DefaultOptions) -Dinclude-non-shipping-modules -Dgpg.skip -Paggregatereports'
+            options: '$(DefaultOptions) -T 2C -Dinclude-non-shipping-modules -Pjavadoc'
             mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
             javaHomeOption: 'JDKVersion'
             jdkVersionOption: $(JavaBuildVersion)
             jdkArchitectureOption: 'x64'
             publishJUnitResults: false
-            goals: 'verify site:site site:stage'
+            goals: 'javadoc:aggregate'
 
         - task: Maven@3
-          condition: succeededOrFailed()
-          displayName: 'Generate BOM Reports'
+          displayName: 'Generate Aggregate JaCoCo coverage report'
           inputs:
-            mavenPomFile: eng/bomgenerator/pom.xml
-            options: '$(DefaultOptions)'
+            mavenPomFile: pom.xml
+            options: '$(DefaultOptions) -T 2C -Dinclude-non-shipping-modules -Dgpg.skip=true -Drevapi.skip=true -Dcodesnippet.skip=true -Pjacoco -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dspotbugs.skip=true -DskipCompile=true -DskipTestCompile=true'
             mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
             javaHomeOption: 'JDKVersion'
             jdkVersionOption: $(JavaBuildVersion)
             jdkArchitectureOption: 'x64'
             publishJUnitResults: false
-            goals: 'clean package'
+            goals: 'verify jacoco:report-aggregate'
 
         - task: PublishTestResults@2
           condition: succeededOrFailed()
@@ -100,17 +119,17 @@ stages:
           displayName: Generate Interdependency Report Data
 
         - pwsh: |
-            Copy-Item target/staging $(Build.ArtifactStagingDirectory) -Recurse
+            Copy-Item -Path target/site/apidocs -Destination $(Build.ArtifactStagingDirectory)/staging/apidocs -Force -Recurse
+            Copy-Item -Path eng/jacoco-test-coverage/target/site/test-coverage -Destination $(Build.ArtifactStagingDirectory)/staging/test-coverage -Force -Recurse
             Copy-Item eng/code-quality-reports/src/main/resources/index.html $(Build.ArtifactStagingDirectory)
             Copy-Item eng/code-quality-reports/src/main/resources/dependency-allowlist.html $(Build.ArtifactStagingDirectory)/staging
-
             Copy-Item eng/common/InterdependencyGraph.html $(Build.ArtifactStagingDirectory)/staging
             Copy-Item data.js $(Build.ArtifactStagingDirectory)/staging
+            ls -R $(Build.ArtifactStagingDirectory)/staging
           displayName: 'Copy reports to artifact staging'
 
         - pwsh: |
-            Copy-Item eng/bomgenerator/target/dependency_conflictlist.html $(Build.ArtifactStagingDirectory)/staging
-
+            Copy-Item eng/bomgenerator/outputdir/dependency_conflictlist.html $(Build.ArtifactStagingDirectory)/staging
           displayName: 'Copy BOM report to artifact staging'
           condition: succeededOrFailed()