Refactor pom structure (#3768)

* Refactor pom files * Remove spotbugs from uber pom * Fix spacing * Fix NPE in header decoder * Add gpg.skip to travis config * Add parent install before dependency checker * Skip first mvn build in travis CI * Remove jetty server from management library builds * Use variables for versions in pom.management.xml * More variables for versions in poms * Fix typo in management pom * Change management pom back to original group and artifact id * Update all references to pom.management.xml * Fix typo non-shipping-modules * Fix data plane module's parent ref
Azure · Jun 4, 2019 · 03722f2 · 03722f2
1 parent 6940873
commit 03722f2
Show file tree

Hide file tree

Showing 125 changed files with 2,048 additions and 1,249 deletions.
diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml
@@ -97,6 +97,18 @@ jobs:
           mkdir input && cp dependencies.json input/
         displayName: 'Download dependency checker'
 
+      - task: Maven@3
+        displayName: 'Install azure-sdk-parent'
+        inputs:
+          mavenPomFile: parent/pom.xml
+          options: '$(DefaultOptions) -DskipTests -Dgpg.skip'
+          mavenOptions: '$(LoggingOptions)'
+          javaHomeOption: 'JDKVersion'
+          jdkVersionOption: '1.11'
+          jdkArchitectureOption: 'x64'
+          publishJUnitResults: false
+          goals: 'install'
+
       - task: Maven@3
         displayName: 'Analyze dependencies'
         inputs:

diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,9 @@
 language: java
 sudo: required
+install: true
 jdk:
 - oraclejdk8
 - openjdk7
-before_script:
-- mvn jetty:run &
-- sleep 5
 script:
 - |-
-  for i in `ls -d */*/v20* | grep -v "node_modules/*/*"`; do cd $i; mvn compile; if [ $? != 0 ]; then cd -; exit -1; else cd -; fi; done
+  for i in `ls -d */*/v20* | grep -v "node_modules/*/*"`; do cd $i; mvn compile -Dgpg.skip; if [ $? != 0 ]; then cd -; exit -1; else cd -; fi; done
diff --git a/applicationinsights/resource-manager/v2015_05_01/pom.xml b/applicationinsights/resource-manager/v2015_05_01/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-insights</artifactId>
     <version>1.0.0-beta</version>

diff --git a/appservice/resource-manager/v2016_03_01/pom.xml b/appservice/resource-manager/v2016_03_01/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-appservice</artifactId>
     <version>1.0.0-beta</version>

diff --git a/appservice/resource-manager/v2016_08_01/pom.xml b/appservice/resource-manager/v2016_08_01/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-appservice</artifactId>
     <version>1.0.0-beta</version>

diff --git a/appservice/resource-manager/v2016_09_01/pom.xml b/appservice/resource-manager/v2016_09_01/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-appservice</artifactId>
     <version>1.0.0-beta</version>

diff --git a/appservice/resource-manager/v2018_02_01/pom.xml b/appservice/resource-manager/v2018_02_01/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-appservice</artifactId>
     <version>1.0.0-beta</version>

diff --git a/authorization/resource-manager/v2015_07_01/pom.xml b/authorization/resource-manager/v2015_07_01/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-authorization</artifactId>
     <version>1.0.0-beta</version>

diff --git a/authorization/resource-manager/v2018_09_01_preview/pom.xml b/authorization/resource-manager/v2018_09_01_preview/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-authorization</artifactId>
     <version>1.0.0-beta</version>

diff --git a/automation/resource-manager/v2015_10_31/pom.xml b/automation/resource-manager/v2015_10_31/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-automation</artifactId>
     <version>1.0.0-beta</version>

diff --git a/batch/data-plane/pom.xml b/batch/data-plane/pom.xml
@@ -8,9 +8,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>com.azure</groupId>
-    <artifactId>azure-client-sdk-parent</artifactId>
+    <artifactId>azure-data-sdk-parent</artifactId>
     <version>1.0.0</version>
-    <relativePath>../../pom.client.xml</relativePath>
+    <relativePath>../../pom.data.xml</relativePath>
   </parent>
 
   <groupId>com.microsoft.azure</groupId>

diff --git a/batchai/resource-manager/v2017_09_01_preview/pom.xml b/batchai/resource-manager/v2017_09_01_preview/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-batchai</artifactId>
     <version>1.0.0-beta-SNAPSHOT</version>

diff --git a/batchai/resource-manager/v2018_03_01/pom.xml b/batchai/resource-manager/v2018_03_01/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-batchai</artifactId>
     <version>1.0.0-beta-SNAPSHOT</version>

diff --git a/batchai/resource-manager/v2018_05_01/pom.xml b/batchai/resource-manager/v2018_05_01/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-batchai</artifactId>
     <version>1.0.0-beta-SNAPSHOT</version>

diff --git a/cognitiveservices/resource-manager/v2016_02_01_preview/pom.xml b/cognitiveservices/resource-manager/v2016_02_01_preview/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-cognitiveservices</artifactId>
     <version>1.0.0-beta-SNAPSHOT</version>

diff --git a/cognitiveservices/resource-manager/v2017_04_18/pom.xml b/cognitiveservices/resource-manager/v2017_04_18/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-cognitiveservices</artifactId>
     <version>1.0.0-beta-SNAPSHOT</version>

diff --git a/compute/resource-manager/v2017_03_30/pom.xml b/compute/resource-manager/v2017_03_30/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-compute</artifactId>
     <version>1.0.0-beta-1</version>

diff --git a/compute/resource-manager/v2017_09_01/pom.xml b/compute/resource-manager/v2017_09_01/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-compute</artifactId>
     <version>1.0.0-beta</version>

diff --git a/compute/resource-manager/v2017_12_01/pom.xml b/compute/resource-manager/v2017_12_01/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-compute</artifactId>
     <version>1.0.0-beta</version>

diff --git a/compute/resource-manager/v2018_04_01/pom.xml b/compute/resource-manager/v2018_04_01/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-compute</artifactId>
     <version>1.0.0-beta</version>

diff --git a/containerinstance/resource-manager/v2017_08_01_preview/pom.xml b/containerinstance/resource-manager/v2017_08_01_preview/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-containerinstance</artifactId>
     <version>1.0.0-beta</version>

diff --git a/containerinstance/resource-manager/v2017_10_01_preview/pom.xml b/containerinstance/resource-manager/v2017_10_01_preview/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-containerinstance</artifactId>
     <version>1.0.0-beta</version>

diff --git a/containerinstance/resource-manager/v2017_12_01_preview/pom.xml b/containerinstance/resource-manager/v2017_12_01_preview/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-containerinstance</artifactId>
     <version>1.0.0-beta</version>

diff --git a/containerinstance/resource-manager/v2018_02_01_preview/pom.xml b/containerinstance/resource-manager/v2018_02_01_preview/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-containerinstance</artifactId>
     <version>1.0.0-beta</version>

diff --git a/containerinstance/resource-manager/v2018_04_01/pom.xml b/containerinstance/resource-manager/v2018_04_01/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-containerinstance</artifactId>
     <version>1.0.0-beta</version>

diff --git a/containerinstance/resource-manager/v2018_10_01/pom.xml b/containerinstance/resource-manager/v2018_10_01/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-containerinstance</artifactId>
     <version>1.0.0-beta</version>

diff --git a/containerregistry/resource-manager/v2016_06_27_preview/pom.xml b/containerregistry/resource-manager/v2016_06_27_preview/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-containerregistry</artifactId>
     <version>1.0.0-beta</version>

diff --git a/containerregistry/resource-manager/v2017_03_01/pom.xml b/containerregistry/resource-manager/v2017_03_01/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-containerregistry</artifactId>
     <version>1.0.0-beta</version>

diff --git a/containerregistry/resource-manager/v2017_06_01_preview/pom.xml b/containerregistry/resource-manager/v2017_06_01_preview/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-containerregistry</artifactId>
     <version>1.0.0-beta</version>

diff --git a/containerregistry/resource-manager/v2017_10_01/pom.xml b/containerregistry/resource-manager/v2017_10_01/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-containerregistry</artifactId>
     <version>1.0.0-beta</version>

diff --git a/containerregistry/resource-manager/v2018_02_01_preview/pom.xml b/containerregistry/resource-manager/v2018_02_01_preview/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-containerregistry</artifactId>
     <version>1.0.0-beta</version>

diff --git a/containerregistry/resource-manager/v2018_09_01/pom.xml b/containerregistry/resource-manager/v2018_09_01/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-containerregistry</artifactId>
     <version>1.0.0-beta-1</version>

diff --git a/containerservice/resource-manager/pom.xml b/containerservice/resource-manager/pom.xml
@@ -8,8 +8,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-containerservice-parent</artifactId>
     <version>1.0.0-beta</version>

diff --git a/containerservice/resource-manager/v2017_07_01/pom.xml b/containerservice/resource-manager/v2017_07_01/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-containerservice</artifactId>
     <version>1.0.0-beta-SNAPSHOT</version>

diff --git a/containerservice/resource-manager/v2017_08_31/pom.xml b/containerservice/resource-manager/v2017_08_31/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-containerservice</artifactId>
     <version>1.0.0-beta-SNAPSHOT</version>