Aggregate-report fixes (part 1) (Azure#19315)

conniey · web-flow · commit c4a8ca01303d · 2021-02-19T10:04:50.000-08:00
* Fixing versioning line.

* Fix pom.xml for communication

* Split aggregate reports into two sections.

* Change SslUtil to final

* Removing clean.
diff --git a/eng/pipelines/aggregate-reports.yml b/eng/pipelines/aggregate-reports.yml
@@ -9,37 +9,14 @@ pr:
       - eng/pipelines/aggregate-reports.yml
 
 jobs:
-  - job: Generate
+  - job: Reporting
+    displayName: Generate reports (with build)
     timeoutInMinutes: 180
     variables:
       - template: templates/variables/globals.yml
     pool:
-      vmImage: 'windows-2019'
+      vmImage: 'ubuntu-18.04'
     steps:
-    # Put cred scan step before install and build packages to avoid the tool scans generated folder like /target.
-    - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
-      displayName: 'Run CredScan'
-      inputs:
-        suppressionsFile: 'eng\CredScanSuppression.json'
-      condition: succeededOrFailed()
-    - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@3
-      displayName: 'Publish Security Analysis Logs'
-      condition: succeededOrFailed()
-    - task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@2
-      displayName: 'Post Analysis'
-      inputs:
-        GdnBreakAllTools: false
-        GdnBreakGdnToolCredScan: true
-        GdnBreakGdnToolCredScanSeverity: Error
-        GdnBreakBaselineFiles: $(Build.SourcesDirectory)\eng\java.gdnbaselines
-        GdnBreakBaselines: baseline  
-        # Used for generating baseline file.
-        # GdnBreakOutputBaselineFile: java
-        # GdnBreakOutputBaseline: baseline
-      condition: succeededOrFailed()
-    - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@3
-      displayName: 'Publish Security Analysis Logs'
-      condition: succeededOrFailed()
     # We `install` the code quality reports tooling into our local m2 cache separately from building the Maven project
     # reports. This means it is available as part of that, but also so that this is not documented in the project report.
     - template: templates/steps/install-reporting-tools.yml
@@ -59,13 +36,6 @@ jobs:
         publishJUnitResults: false
         goals: 'clean install'
 
-    - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-      # ComponentGovernance is currently unable to run on pull requests of public projects. Running on non-PR
-      # builds should be sufficient.
-      # Only run if building all libraries succeeded.
-      condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
-      displayName: 'Component Detection'
-
     - task: Maven@3
       displayName: 'Generate Reports'
       inputs:
@@ -76,7 +46,7 @@ jobs:
         jdkVersionOption: $(JavaBuildVersion)
         jdkArchitectureOption: 'x64'
         publishJUnitResults: false
-        goals: 'clean verify site:site site:stage'
+        goals: 'verify site:site site:stage'
 
     - task: PublishTestResults@2
       condition: succeededOrFailed()
@@ -110,21 +80,55 @@ jobs:
         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
 
-        # What is this?
-        # copy output/pom.client.html (Join-Path $(Build.ArtifactStagingDirectory) "staging")
-
         Copy-Item eng/common/InterdependencyGraph.html $(Build.ArtifactStagingDirectory)/staging
         Copy-Item data.js $(Build.ArtifactStagingDirectory)/staging
       displayName: 'Copy reports to artifact staging'
 
+    - publish: $(Build.ArtifactStagingDirectory)
+      condition: succeededOrFailed()
+      displayName: 'Publish Report Artifacts'
+      artifact: reports
+  - job: Compliance
+    displayName: Analyze (no build)
+    timeoutInMinutes: 120
+    variables:
+      - template: templates/variables/globals.yml
+    pool:
+      # CredScan build task is Windows only (https://aka.ms/credscan).
+      vmImage: 'windows-2019'
+    steps:
+    - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+      # ComponentGovernance is currently unable to run on pull requests of public projects. Running on non-PR
+      # builds should be sufficient.
+      # Only run if building all libraries succeeded.
+      condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
+      displayName: 'Component Detection'
+
+    # Put cred scan step before install and build packages to avoid the tool scans generated folder like /target.
+    - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
+      displayName: 'Run CredScan'
+      inputs:
+        suppressionsFile: 'eng\CredScanSuppression.json'
+      condition: succeededOrFailed()
+    - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@3
+      displayName: 'Publish Security Analysis Logs'
+      condition: succeededOrFailed()
+    - task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@2
+      displayName: 'Post Analysis'
+      inputs:
+        GdnBreakAllTools: false
+        GdnBreakGdnToolCredScan: true
+        GdnBreakGdnToolCredScanSeverity: Error
+        GdnBreakBaselineFiles: $(Build.SourcesDirectory)\eng\java.gdnbaselines
+        GdnBreakBaselines: baseline
+        # Used for generating baseline file.
+        # GdnBreakOutputBaselineFile: java
+        # GdnBreakOutputBaseline: baseline
+      condition: succeededOrFailed()
     # Run link verification at the end as it will run no matter the pipeline passing or failing.
     # If this task fails with an error it shouldn't prevent aggregate reports from being generated.
     - template: ../common/pipelines/templates/steps/verify-links.yml
       parameters:
         Directory: ""
         CheckLinkGuidance: $true
         Condition: succeededOrFailed()
-    - publish: $(Build.ArtifactStagingDirectory)
-      condition: succeededOrFailed()
-      displayName: 'Publish Report Artifacts'
-      artifact: reports
diff --git a/pom.xml b/pom.xml
@@ -21,9 +21,10 @@
         <module>sdk/attestation/azure-security-attestation</module>
 
         <!-- Azure Communication Service -->
-        <module>sdk/communication/azure-communication-administration</module>
         <module>sdk/communication/azure-communication-chat</module>
         <module>sdk/communication/azure-communication-common</module>
+        <module>sdk/communication/azure-communication-identity</module>
+        <module>sdk/communication/azure-communication-phonenumbers</module>
         <module>sdk/communication/azure-communication-sms</module>
 
         <!-- Azure Core -->
@@ -45,7 +46,6 @@
         <!-- Digital Twins -->
         <module>sdk/digitaltwins/azure-digitaltwins-core</module>
 
-
         <!-- Event Grid -->
         <module>sdk/eventgrid/azure-messaging-eventgrid</module>
 
@@ -302,6 +302,10 @@
                     <title>Azure Mixed Reality Authentication</title>
                     <packages>com.azure.mixedreality.authentication*</packages>
                   </group>
+                  <group>
+                    <title>Azure Communication</title>
+                    <packages>com.azure.communication.*</packages>
+                  </group>
                 </groups>
                 <links>
                   <link>https://docs.oracle.com/javase/8/docs/api/</link>
diff --git a/sdk/communication/pom.xml b/sdk/communication/pom.xml
@@ -13,12 +13,11 @@
     <profile>
       <id>coverage</id>
       <modules>
+        <module>azure-communication-chat</module>
         <module>azure-communication-common</module>
         <module>azure-communication-identity</module>
         <module>azure-communication-sms</module>
-        <module>azure-communication-chat</module>
         <module>azure-communication-phonenumbers</module>
-
       </modules>
 
       <dependencies>
@@ -32,11 +31,6 @@
           <artifactId>azure-communication-common</artifactId>
           <version>1.0.0-beta.5</version> <!-- {x-version-update;com.azure:azure-communication-common;current} -->
         </dependency>
-        <dependency>
-          <groupId>com.azure</groupId>
-          <artifactId>azure-communication-sms</artifactId>
-          <version>1.0.0-beta.5</version> <!-- {x-version-update;com.azure:azure-communication-sms;current} -->
-        </dependency>
         <dependency>
           <groupId>com.azure</groupId>
           <artifactId>azure-communication-identity</artifactId>
@@ -47,21 +41,26 @@
           <artifactId>azure-communication-phonenumbers</artifactId>
           <version>1.0.0-beta.5</version> <!-- {x-version-update;com.azure:azure-communication-phonenumbers;current} -->
         </dependency>
+        <dependency>
+          <groupId>com.azure</groupId>
+          <artifactId>azure-communication-sms</artifactId>
+          <version>1.0.0-beta.5</version> <!-- {x-version-update;com.azure:azure-communication-sms;current} -->
+        </dependency>
       </dependencies>
 
       <build>
         <plugins>
           <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>
-            <version>0.8.5</version>
+            <version>0.8.5</version> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
             <configuration>
               <includes>
                 <include>com/azure/communication/chat/*.class</include>
                 <include>com/azure/communication/sms/*.class</include>
                 <include>com/azure/communication/phonenumbers/*.class</include>
               </includes>
-            </configuration> <!-- {x-version-update;org.jacoco:jacoco-maven-plugin;external_dependency} -->
+            </configuration>
             <executions>
               <execution>
                 <id>report-aggregate</id>
@@ -84,11 +83,11 @@
         <activeByDefault>true</activeByDefault>
       </activation>
       <modules>
+        <module>azure-communication-chat</module>
         <module>azure-communication-common</module>
         <module>azure-communication-identity</module>
-        <module>azure-communication-sms</module>
-        <module>azure-communication-chat</module>
         <module>azure-communication-phonenumbers</module>
+        <module>azure-communication-sms</module>
       </modules>
     </profile>
   </profiles>
diff --git a/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/util/IdentitySslUtil.java b/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/util/IdentitySslUtil.java
@@ -20,7 +20,7 @@
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 
-public class IdentitySslUtil {
+public final class IdentitySslUtil {
     public static final HostnameVerifier ALL_HOSTS_ACCEPT_HOSTNAME_VERIFIER;
 
     static {
