POM restructure phase 2 (#9435)

* Moved all parents into sdk/parents.
AzureSDKAutomation · Apr 10, 2020 · 5f484b9 · 5f484b9
1 parent f92b56c
commit 5f484b9
Show file tree

Hide file tree

Showing 86 changed files with 166 additions and 153 deletions.
diff --git a/common/perf-test-core/pom.xml b/common/perf-test-core/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-client-sdk-parent</artifactId>
     <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
-    <relativePath>../../pom.client.xml</relativePath>
+    <relativePath>../../sdk/parents/azure-client-sdk-parent</relativePath>
   </parent>
 
   <groupId>com.azure</groupId>

diff --git a/eng/docgeneration/Generate-DocIndex.ps1 b/eng/docgeneration/Generate-DocIndex.ps1
@@ -105,7 +105,7 @@ foreach ($Dir in $ServiceListData)
             } 
             else 
             {
-                if (($parent.IndexOf('pom.client.xml') -ne -1) -or ($parent.IndexOf('pom.data.xml') -ne -1))
+                if (($parent.IndexOf('azure-client-sdk-parent') -ne -1) -or ($parent.IndexOf('azure-data-sdk-parent') -ne -1))
                 {
                     $clientArr += $artifactId
                 } 

diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
@@ -11,7 +11,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-client-sdk-parent</artifactId>
     <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
-    <relativePath>../../pom.client.xml</relativePath>
+    <relativePath>../../sdk/parents/azure-client-sdk-parent</relativePath>
   </parent>
 
   <groupId>com.azure</groupId>

diff --git a/eng/pipelines/aggregate-reports.yml b/eng/pipelines/aggregate-reports.yml
@@ -7,61 +7,22 @@ jobs:
     timeoutInMinutes: 180
     variables:
       - template: templates/variables/globals.yml
+      - name: ProjectList
+        value: com.azure:azure-data-appconfiguration,com.azure:azure-core,com.azure:azure-core-amqp,com.azure:azure-core-http-jdk-httpclient,com.azure:azure-core-http-netty,com.azure:azure-core-http-okhttp,com.azure:azure-core-test,com.azure:azure-core-tracing-opentelemetry,com.azure:azure-cosmos,com.azure:azure-messaging-eventhubs,com.azure:azure-messaging-eventhubs-checkpointstore-blob,com.azure:azure-identity,com.azure:azure-security-keyvault-certificates,com.azure:azure-security-keyvault-keys,com.azure:azure-security-keyvault-secrets,com.azure:azure-storage-blob,com.azure:azure-storage-blob-cryptography,com.azure:azure-storage-blob-nio,com.azure:azure-storage-common,com.azure:azure-storage-file-datalake,com.azure:azure-storage-file-share,com.azure:azure-storage-queue,com.azure:azure-sdk-template,com.azure:azure-ai-textanalytics
     pool:
       vmImage: 'ubuntu-16.04'
     steps:
-    - template: templates/steps/install-reporting-tools.yml
-      parameters:
-        Options: --batch-mode
-        MavenOptions: $(MemoryOptions) $(LoggingOptions)
-
-    - task: Maven@3
-      displayName: 'Install azure-sdk-parent'
-      inputs:
-        mavenPomFile: parent/pom.xml
-        options: '$(DefaultOptions) -DskipTests -Dgpg.skip'
-        mavenOptions: '$(MemoryOptions)  $(LoggingOptions)'
-        javaHomeOption: 'JDKVersion'
-        jdkVersionOption: '1.11'
-        jdkArchitectureOption: 'x64'
-        publishJUnitResults: false
-        goals: 'install'
-
-    - task: Maven@3
-      displayName: 'Install Module'
-      inputs:
-        mavenPomFile: pom.client.xml
-        options: '--no-transfer-progress -DskipTests -Dgpg.skip -Dcheckstyle.skip=true -Dspotbugs.skip=true -Dmaven.javadoc.skip=true -Drevapi.skip=true'
-        mavenOptions: '$(MemoryOptions)'
-        javaHomeOption: 'JDKVersion'
-        jdkVersionOption: '1.11'
-        jdkArchitectureOption: 'x64'
-        publishJUnitResults: false
-        goals: 'install'
-
     - task: Maven@3
-      displayName: 'Generate Maven project site, including JavaDocs, SpotBugs, and CheckStyle reports'
+      displayName: 'Generate Reports'
       inputs:
-        mavenPomFile: pom.client.xml
-        options: '$(DefaultOptions) -DskipTests -Dgpg.skip'
+        mavenPomFile: pom.xml
+        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'
         mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
         javaHomeOption: 'JDKVersion'
         jdkVersionOption: '1.11'
         jdkArchitectureOption: 'x64'
         publishJUnitResults: false
-        goals: 'site:site site:stage'
-
-    - task: Maven@3
-      displayName: 'Generate aggregate code coverage and dependency reports'
-      inputs:
-        mavenPomFile: pom.client.xml
-        options: '$(DefaultOptions) -Dinclude-non-shipping-modules -Ddependency-checker -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true'
-        mavenOptions: '-Xmx3072m $(LoggingOptions)'
-        javaHomeOption: 'JDKVersion'
-        jdkVersionOption: '1.11'
-        jdkArchitectureOption: 'x64'
-        publishJUnitResults: false
-        goals: 'verify'
+        goals: 'clean verify'
 
     - task: PublishTestResults@2
       condition: succeededOrFailed()

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-bom.yml b/eng/pipelines/templates/jobs/archetype-sdk-bom.yml
@@ -54,9 +54,9 @@ jobs:
       - task: Maven@3
         displayName: 'Build and Package'
         inputs:
-          mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml
+          mavenPomFile: pom.xml
           goals: 'install'
-          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 com.azure:azure-sdk-bom'
           mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: $(JavaVersion)

diff --git a/eng/pipelines/templates/steps/cache-maven-repository.yml b/eng/pipelines/templates/steps/cache-maven-repository.yml
@@ -9,7 +9,7 @@ steps:
   displayName: Detecting Maven repository on Linux and macOS
 - task: CacheBeta@0
   inputs:
-    key: $(Agent.JobName)|$(CacheSalt)|$(Build.SourcesDirectory)/sdk/**/pom.xml|$(Build.SourcesDirectory)/pom*.xml|$(Build.SourcesDirectory)/parent/pom.xml
+    key: $(Agent.JobName)|$(CacheSalt)|$(Build.SourcesDirectory)/sdk/**/pom.xml|$(Build.SourcesDirectory)/pom*.xml
     path: $(Maven.RepositoryPath)
   displayName: 'Download/upload cache'
   condition: and(succeeded(), ne(variables['EnableCaching'], 'false'))
diff --git a/eng/spotbugs-aggregate-report/pom.xml b/eng/spotbugs-aggregate-report/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>azure-client-sdk-parent</artifactId>
     <groupId>com.azure</groupId>
     <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
-    <relativePath>../../pom.client.xml</relativePath>
+    <relativePath>../../sdk/parents/azure-client-sdk-parent</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>spotbugs-reporting</artifactId>

diff --git a/eng/versioning/pom_file_version_scanner.ps1 b/eng/versioning/pom_file_version_scanner.ps1
@@ -259,7 +259,7 @@ Get-ChildItem -Path $Path -Filter pom*.xml -Recurse -File | ForEach-Object {
     $pomFile = $_.FullName
     $xmlPomFile = $null
 
-    if ($_.Name -eq "pom.management.xml")
+    if ($_.FullName -like "*azure-arm-parent*")
     {
         return
     }

diff --git a/pom.xml b/pom.xml
@@ -8,15 +8,18 @@
   <packaging>pom</packaging>
   <version>1.0.0</version><!-- Need not change for every release-->
   <modules>
+    <module>eng/jacoco-test-coverage</module>
     <module>eng/code-quality-reports</module>
     <module>sdk/appconfiguration</module>
     <module>sdk/authorization</module>
     <module>sdk/batch</module>
+    <module>sdk/boms</module>
     <module>sdk/core</module>
     <module>sdk/cosmos</module>
     <module>sdk/cognitiveservices</module>
     <module>sdk/eventgrid</module>
     <module>sdk/eventhubs</module>
+    <module>sdk/formrecognizer</module>
     <module>sdk/identity</module>
     <module>sdk/keyvault</module>
     <module>sdk/loganalytics</module>

diff --git a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml
@@ -8,7 +8,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-client-sdk-parent</artifactId>
     <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
-    <relativePath>../../../pom.client.xml</relativePath>
+    <relativePath>../../parents/azure-client-sdk-parent</relativePath>
   </parent>
 
   <groupId>com.azure</groupId>

diff --git a/sdk/authorization/microsoft-azure-authentication-msi-token-provider/pom.xml b/sdk/authorization/microsoft-azure-authentication-msi-token-provider/pom.xml
@@ -19,7 +19,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-data-sdk-parent</artifactId>
     <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-    <relativePath>../../../pom.data.xml</relativePath>
+    <relativePath>../../parents/azure-data-sdk-parent</relativePath>
   </parent>
 
   <licenses>

diff --git a/sdk/batch/microsoft-azure-batch/pom.xml b/sdk/batch/microsoft-azure-batch/pom.xml
@@ -10,7 +10,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-data-sdk-parent</artifactId>
     <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-    <relativePath>../../../pom.data.xml</relativePath>
+    <relativePath>../../parents/azure-data-sdk-client</relativePath>
   </parent>
 
   <groupId>com.microsoft.azure</groupId>

diff --git a/sdk/boms/pom.service.xml → sdk/boms/pom.xml b/sdk/boms/pom.service.xml → sdk/boms/pom.xml
diff --git a/sdk/cognitiveservices/ms-azure-cs-autosuggest/pom.xml b/sdk/cognitiveservices/ms-azure-cs-autosuggest/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../../pom.data.xml</relativePath>
+      <relativePath>../../parents/azure-data-sdk-client</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-autosuggest</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>

diff --git a/sdk/cognitiveservices/ms-azure-cs-computervision/pom.xml b/sdk/cognitiveservices/ms-azure-cs-computervision/pom.xml
@@ -11,7 +11,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../../pom.data.xml</relativePath>
+      <relativePath>../../parents/azure-data-sdk-client</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-computervision</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>

diff --git a/sdk/cognitiveservices/ms-azure-cs-contentmoderator/pom.xml b/sdk/cognitiveservices/ms-azure-cs-contentmoderator/pom.xml
@@ -11,7 +11,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../../pom.data.xml</relativePath>
+      <relativePath>../../parents/azure-data-sdk-client</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-contentmoderator</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>

diff --git a/sdk/cognitiveservices/ms-azure-cs-customimagesearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-customimagesearch/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../../pom.data.xml</relativePath>
+      <relativePath>../../parents/azure-data-sdk-client</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-customimagesearch</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>

diff --git a/sdk/cognitiveservices/ms-azure-cs-customsearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-customsearch/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../../pom.data.xml</relativePath>
+      <relativePath>../../parents/azure-data-sdk-client</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-customsearch</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>

diff --git a/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/pom.xml b/sdk/cognitiveservices/ms-azure-cs-customvision-prediction/pom.xml
@@ -11,7 +11,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../../pom.data.xml</relativePath>
+      <relativePath>../../parents/azure-data-sdk-client</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-customvision-prediction</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>

diff --git a/sdk/cognitiveservices/ms-azure-cs-customvision-training/pom.xml b/sdk/cognitiveservices/ms-azure-cs-customvision-training/pom.xml
@@ -11,7 +11,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../../pom.data.xml</relativePath>
+      <relativePath>../../parents/azure-data-sdk-client</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-customvision-training</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>

diff --git a/sdk/cognitiveservices/ms-azure-cs-entitysearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-entitysearch/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../../pom.data.xml</relativePath>
+      <relativePath>../../parents/azure-data-sdk-client</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-entitysearch</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>

diff --git a/sdk/cognitiveservices/ms-azure-cs-faceapi/pom.xml b/sdk/cognitiveservices/ms-azure-cs-faceapi/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../../pom.data.xml</relativePath>
+      <relativePath>../../parents/azure-data-sdk-client</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-faceapi</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>

diff --git a/sdk/cognitiveservices/ms-azure-cs-imagesearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-imagesearch/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../../pom.data.xml</relativePath>
+      <relativePath>../../parents/azure-data-sdk-client</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-imagesearch</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>

diff --git a/sdk/cognitiveservices/ms-azure-cs-luis-authoring/pom.xml b/sdk/cognitiveservices/ms-azure-cs-luis-authoring/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../../pom.data.xml</relativePath>
+      <relativePath>../../parents/azure-data-sdk-client</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-luis-authoring</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>

diff --git a/sdk/cognitiveservices/ms-azure-cs-luis-runtime/pom.xml b/sdk/cognitiveservices/ms-azure-cs-luis-runtime/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../../pom.data.xml</relativePath>
+      <relativePath>../../parents/azure-data-sdk-client</relativePath>
     </parent>
   <artifactId>azure-cognitiveservices-luis-runtime</artifactId>
   <groupId>com.microsoft.azure.cognitiveservices</groupId>

diff --git a/sdk/cognitiveservices/ms-azure-cs-newssearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-newssearch/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../../pom.data.xml</relativePath>
+      <relativePath>../../parents/azure-data-sdk-client</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-newssearch</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>

diff --git a/sdk/cognitiveservices/ms-azure-cs-qnamaker/pom.xml b/sdk/cognitiveservices/ms-azure-cs-qnamaker/pom.xml
@@ -11,7 +11,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../../pom.data.xml</relativePath>
+      <relativePath>../../parents/azure-data-sdk-client</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-qnamaker</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>

diff --git a/sdk/cognitiveservices/ms-azure-cs-spellcheck/pom.xml b/sdk/cognitiveservices/ms-azure-cs-spellcheck/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../../pom.data.xml</relativePath>
+      <relativePath>../../parents/azure-data-sdk-client</relativePath>
     </parent>
     <version>1.1.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure.cognitiveservices:azure-cognitiveservices-spellcheck;current} -->
     <artifactId>azure-cognitiveservices-spellcheck</artifactId>

diff --git a/sdk/cognitiveservices/ms-azure-cs-textanalytics/pom.xml b/sdk/cognitiveservices/ms-azure-cs-textanalytics/pom.xml
@@ -11,7 +11,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../../pom.data.xml</relativePath>
+      <relativePath>../../parents/azure-data-sdk-client</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-textanalytics</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>

diff --git a/sdk/cognitiveservices/ms-azure-cs-videosearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-videosearch/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../../pom.data.xml</relativePath>
+      <relativePath>../../parents/azure-data-sdk-client</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-videosearch</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>

diff --git a/sdk/cognitiveservices/ms-azure-cs-visualsearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-visualsearch/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../../pom.data.xml</relativePath>
+      <relativePath>../../parents/azure-data-sdk-client</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-visualsearch</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>

diff --git a/sdk/cognitiveservices/ms-azure-cs-websearch/pom.xml b/sdk/cognitiveservices/ms-azure-cs-websearch/pom.xml
@@ -9,7 +9,7 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-data-sdk-parent</artifactId>
       <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-data-sdk-parent;current} -->
-      <relativePath>../../../pom.data.xml</relativePath>
+      <relativePath>../../parents/azure-data-sdk-client</relativePath>
     </parent>
     <artifactId>azure-cognitiveservices-websearch</artifactId>
     <groupId>com.microsoft.azure.cognitiveservices</groupId>

diff --git a/sdk/core/azure-core-amqp/pom.xml b/sdk/core/azure-core-amqp/pom.xml
@@ -8,7 +8,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-client-sdk-parent</artifactId>
     <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
-    <relativePath>../../../pom.client.xml</relativePath>
+    <relativePath>../../parents/azure-client-sdk-parent</relativePath>
   </parent>
 
   <groupId>com.azure</groupId>

diff --git a/sdk/core/azure-core-http-jdk-httpclient/pom.xml b/sdk/core/azure-core-http-jdk-httpclient/pom.xml
@@ -9,7 +9,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-client-sdk-parent</artifactId>
     <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
-    <relativePath>../../../pom.client.xml</relativePath>
+    <relativePath>../../parents/azure-client-sdk-parent</relativePath>
   </parent>
 
   <groupId>com.azure</groupId>

diff --git a/sdk/core/azure-core-http-netty/pom.xml b/sdk/core/azure-core-http-netty/pom.xml
@@ -9,7 +9,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-client-sdk-parent</artifactId>
     <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
-    <relativePath>../../../pom.client.xml</relativePath>
+    <relativePath>../../parents/azure-client-sdk-parent</relativePath>
   </parent>
 
   <groupId>com.azure</groupId>

diff --git a/sdk/core/azure-core-http-okhttp/pom.xml b/sdk/core/azure-core-http-okhttp/pom.xml
@@ -9,7 +9,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-client-sdk-parent</artifactId>
     <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
-    <relativePath>../../../pom.client.xml</relativePath>
+    <relativePath>../../parents/azure-client-sdk-parent</relativePath>
   </parent>
 
   <groupId>com.azure</groupId>

diff --git a/sdk/core/azure-core-management/pom.xml b/sdk/core/azure-core-management/pom.xml
@@ -8,7 +8,7 @@
     <groupId>com.azure</groupId>
     <artifactId>azure-client-sdk-parent</artifactId>
     <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
-    <relativePath>../../../pom.client.xml</relativePath>
+    <relativePath>../../parents/azure-client-sdk-parent</relativePath>
   </parent>
 
   <groupId>com.azure</groupId>
-Original file line number
+Diff line change
@@ Expand Up / @@ -105,7 +105,7 @@ foreach ($Dir in $ServiceListData) @@
                 }
                 else
                 {
-                    if (($parent.IndexOf('pom.client.xml') -ne -1) -or ($parent.IndexOf('pom.data.xml') -ne -1))
+                    if (($parent.IndexOf('azure-client-sdk-parent') -ne -1) -or ($parent.IndexOf('azure-data-sdk-parent') -ne -1))
                     {
                         $clientArr += $artifactId
                     }
@@ Expand Down @@