POM Restructuring Phase #1 (Azure#8242)

Changes ```pom.service.xml``` files to ```pom.xml``` and sets up a true aggregate in the root of the repo. First of a series of changes.
jianghaolu · Mar 19, 2020 · b1c1e3e · b1c1e3e
1 parent dff992b
commit b1c1e3e
Show file tree

Hide file tree

Showing 27 changed files with 155 additions and 511 deletions.
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -102,12 +102,16 @@ jobs:
           BuildSHA: $(Build.SourceVersion)
           RepoId: 'Azure/azure-sdk-for-java'
 
+      - template: ../steps/generate-project-list.yml
+        parameters:
+          Artifacts: ${{parameters.Artifacts}}
+
       - task: Maven@3
         displayName: 'Build and Package'
         inputs:
-          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml
+          mavenPomFile: pom.xml
           goals: 'package'
-          options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dgenerate-overview' # We include template-module so we ensure it always builds in CI
+          options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dgenerate-overview -pl $(ProjectList) -am' # We include template-module so we ensure it always builds in CI
           mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: $(JavaVersion)
@@ -155,32 +159,23 @@ jobs:
           Options: --batch-mode
           MavenOptions: $(MemoryOptions) $(LoggingOptions)
 
+      - template: ../steps/generate-project-list.yml
+        parameters:
+          Artifacts: ${{parameters.Artifacts}}
+
       # maven dependency:tree needs to be able to resolve dependencies, so these should be installed.
       - task: Maven@3
         displayName: 'Build and Install'
         inputs:
-          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml
+          mavenPomFile: pom.xml
           goals: 'install'
-          options: '$(DefaultOptions) -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true'
+          options: '$(DefaultOptions) -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true -pl $(ProjectList) -am'
           mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: '1.11'
           jdkArchitectureOption: 'x64'
           publishJUnitResults: false
 
-      - pwsh: |
-          if ("${{parameters.SDKType}}" -ieq "client") {
-            $excludes = "^(microsoft|mgmt)"
-          } else {
-            $excludes = "^(azure|mgmt)"
-          }
-
-          $directory = "$(Build.SourcesDirectory)/sdk/${{parameters.ServiceDirectory}}"
-
-          Write-Host "Directory: '$directory'. Excludes: '$excludes'"
-          $(Build.SourcesDirectory)/eng/Set-ComponentRegistrations.ps1 $directory -ExcludeRegex $excludes -Verbose
-        displayName: 'Generate cgmanifest.json'
-
       - 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.
@@ -190,8 +185,8 @@ jobs:
       - task: Maven@3
         displayName: 'Run SpotBugs, Checkstyle, RevApi, and Javadoc'
         inputs:
-          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml
-          options: '--no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme-windows'
+          mavenPomFile: pom.xml
+          options: '--no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme-windows -pl $(ProjectList)'
           mavenOptions: '$(MemoryOptions)'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: '1.11'
@@ -254,11 +249,15 @@ jobs:
         condition: and(succeeded(), eq(variables['ShouldRunSourceTests'],'true'))
         displayName: 'Update versions for source build'
 
+      - template: ../steps/generate-project-list.yml
+        parameters:
+          Artifacts: ${{parameters.Artifacts}}
+
       - task: Maven@3
         displayName: 'Run tests'
         inputs:
-          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml
-          options: ${{ parameters.TestOptions }}
+          mavenPomFile: pom.xml
+          options: ${{ parameters.TestOptions }} -pl $(ProjectList) -am
           mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: $(JavaVersion)
@@ -273,45 +272,4 @@ jobs:
         condition: and(always(), or(ne(variables['TestFromSource'],'true'), eq(variables['ShouldRunSourceTests'],'true')))
         inputs:
           mergeTestResults: true
-          testRunTitle: $(RunTitle)
-
-      # HACK: This has been disabled to unblock releases where aggregate code
-      #       coverage reporting was causing agent timeouts. We've got an issue
-      #       to discuss how to handle aggregate-style reporting across the repo
-      #       but at the moment this isn't going to work:
-      #
-      #         https://github.com/Azure/azure-sdk-for-java/issues/7271
-      #
-      #     # Generate JaCoCo code coverage report on Java 11, Linux builds if the build reason is not PR.
-      # - task: Maven@3
-      #   displayName: 'Generate aggregate code coverage report'
-      #   condition: and(eq(variables['OsName'], 'Linux'), eq(variables['JavaVersion'], '1.11'), ne(variables['Build.Reason'], 'PullRequest'))
-      #   inputs:
-      #       # Aggregate reports for non-PR builds will use pom.client.xml and include non-shipping modules
-      #       mavenPomFile: pom.client.xml
-      #       options: '$(DefaultOptions) -Dinclude-non-shipping-modules -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true'
-      #       mavenOptions: '-Xmx3072m $(LoggingOptions)'
-      #       javaHomeOption: 'JDKVersion'
-      #       jdkVersionOption: $(JavaVersion)
-      #       jdkArchitectureOption: 'x64'
-      #       publishJUnitResults: false
-      #       goals: 'verify'
-
-      #   # Azure DevOps only seems to respect the last code coverage result published, so only do this for Linux + Java LTS.
-      #   # Code coverage reporting is setup only for Track 2 modules.
-      # - task: PublishCodeCoverageResults@1
-      #   condition: and(eq(variables['OsName'], 'Linux'), eq(variables['JavaVersion'], '1.11'), ne(variables['Build.Reason'], 'PullRequest'))
-      #   inputs:
-      #       codeCoverageTool: JaCoCo
-      #       summaryFileLocation: eng/jacoco-test-coverage/target/site/test-coverage/jacoco.xml
-      #       reportDirectory: eng/jacoco-test-coverage/target/site/test-coverage/
-      #       failIfCoverageEmpty: true
-
-      #   # Publish code coverage to an artifact so it can be uploaded to the Maven site.
-      #   # Do this for track 2 modules only. Code coverage from previous step is only published for Linux + Java LTS.
-      # - task: PublishPipelineArtifact@0
-      #   displayName: 'Publish coverage artifact'
-      #   condition: and(eq(variables['OsName'], 'Linux'), eq(variables['JavaVersion'], '1.11'), ne(variables['Build.Reason'], 'PullRequest'))
-      #   inputs:
-      #       artifactName: coverage
-      #       targetPath: eng/jacoco-test-coverage/target/site/
+          testRunTitle: $(RunTitle)
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-data.yml b/eng/pipelines/templates/jobs/archetype-sdk-data.yml
@@ -90,12 +90,16 @@ jobs:
           BuildSHA: $(Build.SourceVersion)
           RepoId: 'Azure/azure-sdk-for-java'
 
+      - template: ../steps/generate-project-list.yml
+        parameters:
+          Artifacts: ${{parameters.Artifacts}}
+
       - task: Maven@3
         displayName: 'Build and Package'
         inputs:
-          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml
+          mavenPomFile: pom.xml
           goals: 'package'
-          options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dgenerate-overview' # We include template-module so we ensure it always builds in CI
+          options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dgenerate-overview -pl $(ProjectList) -am -amd' # We include template-module so we ensure it always builds in CI
           mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: $(JavaVersion)
@@ -150,11 +154,15 @@ jobs:
           Options: --batch-mode
           MavenOptions: $(MemoryOptions) $(LoggingOptions)
 
+      - template: ../steps/generate-project-list.yml
+        parameters:
+          Artifacts: ${{parameters.Artifacts}}
+
       - task: Maven@3
         displayName: 'Install Module and Run SpotBugs, Checkstyle, RevApi, and Javadoc'
         inputs:
-          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml
-          options: '--no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme'
+          mavenPomFile: pom.xml
+          options: '--no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme -pl $(ProjectList) -am'
           mavenOptions: '$(MemoryOptions)'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: '1.11'
@@ -186,6 +194,10 @@ jobs:
           Options: --batch-mode
           MavenOptions: $(MemoryOptions) $(LoggingOptions)
 
+      - template: ../steps/generate-project-list.yml
+        parameters:
+          Artifacts: ${{parameters.Artifacts}}
+
       - task: Maven@3
         displayName: 'Start Jetty'
         condition: succeeded()
@@ -204,8 +216,8 @@ jobs:
       - task: Maven@3
         displayName: 'Run tests'
         inputs:
-          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml
-          options: ${{ parameters.TestOptions }}
+          mavenPomFile: pom.xml
+          options: ${{ parameters.TestOptions }} -pl $(ProjectList) -am
           mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: $(JavaVersion)

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml
@@ -92,7 +92,7 @@ jobs:
       - task: Maven@3
         displayName: $(DisplayName)
         inputs:
-          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml
+          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.xml
           ${{ insert }}: ${{ parameters.TestStepMavenInputs }}
         env: ${{ parameters.EnvVars }}
 

diff --git a/eng/pipelines/templates/steps/generate-project-list.yml b/eng/pipelines/templates/steps/generate-project-list.yml
@@ -0,0 +1,18 @@
+# This job template uses the artifact list in the ci.yml file
+# to generate a variable at build time that can be passed into
+# the Maven -pl command-line switch to constrain what subset of
+# projects are targetted based on the artifacts this pipeline
+# produces. The -am and -amd switches are then applied as
+# appropriate to constrain the full graph that is built depending
+# on whether we are doing a recorded test play back or a full live
+# test.
+
+steps:
+- pwsh: |
+    Write-Host "##vso[task.setvariable variable=ProjectList;]"
+  displayName: Initialize project list variable
+
+- ${{each artifact in parameters.Artifacts }}:
+  - pwsh: |
+      Write-Host "##vso[task.setvariable variable=ProjectList;]$(ProjectList),${{artifact.groupId}}:${{artifact.name}}"
+    displayName: Append ${{artifact.groupId}}:${{artifact.name}} to project list
diff --git a/pom.data.xml b/pom.data.xml
@@ -601,7 +601,6 @@
       </build>
     </profile>
   </profiles>
-
   <modules>
     <module>./sdk/batch/microsoft-azure-batch</module>
     <module>./sdk/eventhubs/microsoft-azure-eventhubs/pom.xml</module>

diff --git a/pom.management.xml b/pom.management.xml
@@ -758,8 +758,11 @@
       </build>
     </profile>
   </profiles>
+  <!--
   <modules>
+
     <module>./profiles/2018-03-01-hybrid</module>
     <module>./profiles/2019-03-01-hybrid</module>
   </modules>
+  -->
 </project>