From 03722f247a7abec87de1f3e286e64498c9aaad9d Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Tue, 4 Jun 2019 14:54:56 -0700 Subject: [PATCH] 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-pipelines/client.yml | 12 + .travis.yml | 6 +- .../resource-manager/v2015_05_01/pom.xml | 4 +- .../resource-manager/v2016_03_01/pom.xml | 4 +- .../resource-manager/v2016_08_01/pom.xml | 4 +- .../resource-manager/v2016_09_01/pom.xml | 4 +- .../resource-manager/v2018_02_01/pom.xml | 4 +- .../resource-manager/v2015_07_01/pom.xml | 4 +- .../v2018_09_01_preview/pom.xml | 4 +- .../resource-manager/v2015_10_31/pom.xml | 4 +- batch/data-plane/pom.xml | 4 +- .../v2017_09_01_preview/pom.xml | 4 +- batchai/resource-manager/v2018_03_01/pom.xml | 4 +- batchai/resource-manager/v2018_05_01/pom.xml | 4 +- .../v2016_02_01_preview/pom.xml | 4 +- .../resource-manager/v2017_04_18/pom.xml | 4 +- compute/resource-manager/v2017_03_30/pom.xml | 4 +- compute/resource-manager/v2017_09_01/pom.xml | 4 +- compute/resource-manager/v2017_12_01/pom.xml | 4 +- compute/resource-manager/v2018_04_01/pom.xml | 4 +- .../v2017_08_01_preview/pom.xml | 4 +- .../v2017_10_01_preview/pom.xml | 4 +- .../v2017_12_01_preview/pom.xml | 4 +- .../v2018_02_01_preview/pom.xml | 4 +- .../resource-manager/v2018_04_01/pom.xml | 4 +- .../resource-manager/v2018_10_01/pom.xml | 4 +- .../v2016_06_27_preview/pom.xml | 4 +- .../resource-manager/v2017_03_01/pom.xml | 4 +- .../v2017_06_01_preview/pom.xml | 4 +- .../resource-manager/v2017_10_01/pom.xml | 4 +- .../v2018_02_01_preview/pom.xml | 4 +- .../resource-manager/v2018_09_01/pom.xml | 4 +- containerservice/resource-manager/pom.xml | 4 +- .../resource-manager/v2017_07_01/pom.xml | 4 +- .../resource-manager/v2017_08_31/pom.xml | 4 +- .../resource-manager/v2017_09_30/pom.xml | 4 +- .../v2018_09_30_preview/pom.xml | 4 +- .../resource-manager/v2019_02_01/pom.xml | 4 +- .../resource-manager/v2019_04_01/pom.xml | 4 +- .../serializer/HttpResponseHeaderDecoder.java | 2 +- cosmosdb/resource-manager/v2015_04_08/pom.xml | 4 +- .../v2015_10_01_preview/pom.xml | 4 +- .../resource-manager/v2016_11_01/pom.xml | 4 +- .../v2015_10_01_preview/pom.xml | 4 +- .../resource-manager/v2016_11_01/pom.xml | 4 +- .../v2017_11_15_preview/pom.xml | 4 +- .../v2018_03_31_preview/pom.xml | 4 +- .../v2018_07_15_preview/pom.xml | 4 +- .../v2018_06_01_preview/pom.xml | 4 +- dns/resource-manager/v2016_04_01/pom.xml | 4 +- dns/resource-manager/v2017_10_01/pom.xml | 4 +- .../resource-manager/v2019_03_01/pom.xml | 4 +- eng/spotbugs-aggregate-report/pom.xml | 280 +++++--- .../resource-manager/v2018_01_01/pom.xml | 4 +- .../v2018_05_01_preview/pom.xml | 4 +- .../v2018_09_15_preview/pom.xml | 4 +- .../resource-manager/v2019_01_01/pom.xml | 4 +- eventhubs/data-plane/pom.xml | 4 +- .../resource-manager/v2017_04_01/pom.xml | 4 +- features/resource-manager/v2015_12_01/pom.xml | 4 +- .../v2018_06_01_preview/pom.xml | 4 +- .../v2017_07_01_privatepreview/pom.xml | 4 +- .../resource-manager/v2018_09_01/pom.xml | 4 +- iothub/resource-manager/v2018_04_01/pom.xml | 4 +- keyvault/data-plane/pom.xml | 4 +- keyvault/resource-manager/v2015_06_01/pom.xml | 4 +- keyvault/resource-manager/v2016_10_01/pom.xml | 4 +- .../v2018_09_07_preview/pom.xml | 4 +- .../resource-manager/v2018_10_15/pom.xml | 4 +- locks/resource-manager/v2016_09_01/pom.xml | 4 +- logic/resource-manager/v2016_06_01/pom.xml | 4 +- .../resource-manager/v2015_06_01/pom.xml | 4 +- .../resource-manager/v2015_10_01/pom.xml | 4 +- .../v2018_03_30_preview/pom.xml | 4 +- .../v2018_06_01_preview/pom.xml | 4 +- .../resource-manager/v2018_07_01/pom.xml | 4 +- .../v2019_02_28_preview/pom.xml | 4 +- mysql/resource-manager/v2017_12_01/pom.xml | 4 +- network/resource-manager/v2017_10_01/pom.xml | 4 +- network/resource-manager/v2018_04_01/pom.xml | 4 +- network/resource-manager/v2018_06_01/pom.xml | 4 +- network/resource-manager/v2018_07_01/pom.xml | 4 +- network/resource-manager/v2018_08_01/pom.xml | 4 +- network/resource-manager/v2018_12_01/pom.xml | 4 +- .../resource-manager/v2014_09_01/pom.xml | 4 +- .../resource-manager/v2016_03_01/pom.xml | 4 +- .../resource-manager/v2017_04_01/pom.xml | 4 +- parent/pom.xml | 649 ++++++++++++++++++ policy/resource-manager/v2016_12_01/pom.xml | 4 +- policy/resource-manager/v2018_03_01/pom.xml | 4 +- .../resource-manager/v2018_04_04/pom.xml | 4 +- pom.client.xml | 578 +--------------- pom.data.xml | 550 +++++++++++++++ pom.management.xml | 219 ++++++ pom.xml | 533 ++++++-------- .../resource-manager/v2017_12_01/pom.xml | 4 +- .../resource-manager/v2018_09_01/pom.xml | 4 +- profiles/2018-03-01-hybrid/pom.xml | 8 +- .../resource-manager/v2016_06_01/pom.xml | 4 +- .../resource-manager/v2016_12_01/pom.xml | 4 +- .../resource-manager/v2017_07_01/pom.xml | 4 +- .../resource-manager/v2016_06_01/pom.xml | 4 +- redis/resource-manager/v2017_10_01/pom.xml | 4 +- redis/resource-manager/v2018_03_01/pom.xml | 4 +- .../resource-manager/v2019_04_01/pom.xml | 4 +- .../resource-manager/v2016_06_01/pom.xml | 4 +- .../resource-manager/v2016_09_01/pom.xml | 4 +- .../resource-manager/v2018_02_01/pom.xml | 4 +- .../resource-manager/v2018_05_01/pom.xml | 4 +- servicebus/data-plane/pom.xml | 4 +- .../v2018_03_01_preview/pom.xml | 4 +- sql/resource-manager/v2014_04_01/pom.xml | 4 +- .../v2015_05_01_preview/pom.xml | 4 +- .../v2017_03_01_preview/pom.xml | 4 +- .../v2017_10_01_preview/pom.xml | 4 +- .../v2018_06_01_preview/pom.xml | 4 +- storage/data-plane/pom.xml | 4 +- storage/resource-manager/v2016_01_01/pom.xml | 4 +- storage/resource-manager/v2017_10_01/pom.xml | 4 +- storage/resource-manager/v2018_02_01/pom.xml | 4 +- .../v2018_03_01_preview/pom.xml | 4 +- storage/resource-manager/v2018_07_01/pom.xml | 4 +- storage/resource-manager/v2018_11_01/pom.xml | 4 +- storage/resource-manager/v2019_04_01/pom.xml | 4 +- .../resource-manager/v2016_03_01/pom.xml | 4 +- 125 files changed, 2048 insertions(+), 1249 deletions(-) create mode 100644 parent/pom.xml create mode 100644 pom.data.xml create mode 100644 pom.management.xml diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml index a40906714d05e..d6c75cc6082c4 100644 --- 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 index a6ecd32b9cd06..c10bf73476465 100644 --- 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 index 2ccdda4304b0b..28346ca61ee2d 100644 --- a/applicationinsights/resource-manager/v2015_05_01/pom.xml +++ b/applicationinsights/resource-manager/v2015_05_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-insights 1.0.0-beta diff --git a/appservice/resource-manager/v2016_03_01/pom.xml b/appservice/resource-manager/v2016_03_01/pom.xml index c4cd08801c8c5..472a369295f18 100644 --- a/appservice/resource-manager/v2016_03_01/pom.xml +++ b/appservice/resource-manager/v2016_03_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 0.0.3-beta - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-appservice 1.0.0-beta diff --git a/appservice/resource-manager/v2016_08_01/pom.xml b/appservice/resource-manager/v2016_08_01/pom.xml index b7f8a2636370d..6ee5977d120f0 100644 --- a/appservice/resource-manager/v2016_08_01/pom.xml +++ b/appservice/resource-manager/v2016_08_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 0.0.3-beta - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-appservice 1.0.0-beta diff --git a/appservice/resource-manager/v2016_09_01/pom.xml b/appservice/resource-manager/v2016_09_01/pom.xml index 193b07eb35c96..d0331227bb150 100644 --- a/appservice/resource-manager/v2016_09_01/pom.xml +++ b/appservice/resource-manager/v2016_09_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 0.0.3-beta - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-appservice 1.0.0-beta diff --git a/appservice/resource-manager/v2018_02_01/pom.xml b/appservice/resource-manager/v2018_02_01/pom.xml index 95029af72d7c5..ae766862a942f 100644 --- a/appservice/resource-manager/v2018_02_01/pom.xml +++ b/appservice/resource-manager/v2018_02_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 0.0.3-beta - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-appservice 1.0.0-beta diff --git a/authorization/resource-manager/v2015_07_01/pom.xml b/authorization/resource-manager/v2015_07_01/pom.xml index 58d6998247384..b467785b7eaba 100644 --- a/authorization/resource-manager/v2015_07_01/pom.xml +++ b/authorization/resource-manager/v2015_07_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-authorization 1.0.0-beta diff --git a/authorization/resource-manager/v2018_09_01_preview/pom.xml b/authorization/resource-manager/v2018_09_01_preview/pom.xml index 5eaac785ccca4..190f02ab5a9e8 100644 --- a/authorization/resource-manager/v2018_09_01_preview/pom.xml +++ b/authorization/resource-manager/v2018_09_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-authorization 1.0.0-beta diff --git a/automation/resource-manager/v2015_10_31/pom.xml b/automation/resource-manager/v2015_10_31/pom.xml index aaa8554d30745..b640bfa84eb5c 100644 --- a/automation/resource-manager/v2015_10_31/pom.xml +++ b/automation/resource-manager/v2015_10_31/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-automation 1.0.0-beta diff --git a/batch/data-plane/pom.xml b/batch/data-plane/pom.xml index aaeea944476d8..174ea0a49dcf3 100644 --- a/batch/data-plane/pom.xml +++ b/batch/data-plane/pom.xml @@ -8,9 +8,9 @@ 4.0.0 com.azure - azure-client-sdk-parent + azure-data-sdk-parent 1.0.0 - ../../pom.client.xml + ../../pom.data.xml com.microsoft.azure diff --git a/batchai/resource-manager/v2017_09_01_preview/pom.xml b/batchai/resource-manager/v2017_09_01_preview/pom.xml index a549a272fadd2..af95463db6158 100644 --- a/batchai/resource-manager/v2017_09_01_preview/pom.xml +++ b/batchai/resource-manager/v2017_09_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-batchai 1.0.0-beta-SNAPSHOT diff --git a/batchai/resource-manager/v2018_03_01/pom.xml b/batchai/resource-manager/v2018_03_01/pom.xml index 55574c75032f6..1668a3b564964 100644 --- a/batchai/resource-manager/v2018_03_01/pom.xml +++ b/batchai/resource-manager/v2018_03_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-batchai 1.0.0-beta-SNAPSHOT diff --git a/batchai/resource-manager/v2018_05_01/pom.xml b/batchai/resource-manager/v2018_05_01/pom.xml index 9b6c25cbca24b..70d0419639a1c 100644 --- a/batchai/resource-manager/v2018_05_01/pom.xml +++ b/batchai/resource-manager/v2018_05_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-batchai 1.0.0-beta-SNAPSHOT diff --git a/cognitiveservices/resource-manager/v2016_02_01_preview/pom.xml b/cognitiveservices/resource-manager/v2016_02_01_preview/pom.xml index a5700f89ae515..aa793759b74e9 100644 --- a/cognitiveservices/resource-manager/v2016_02_01_preview/pom.xml +++ b/cognitiveservices/resource-manager/v2016_02_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-cognitiveservices 1.0.0-beta-SNAPSHOT diff --git a/cognitiveservices/resource-manager/v2017_04_18/pom.xml b/cognitiveservices/resource-manager/v2017_04_18/pom.xml index 55633914d9e17..550eaef6854ef 100644 --- a/cognitiveservices/resource-manager/v2017_04_18/pom.xml +++ b/cognitiveservices/resource-manager/v2017_04_18/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-cognitiveservices 1.0.0-beta-SNAPSHOT diff --git a/compute/resource-manager/v2017_03_30/pom.xml b/compute/resource-manager/v2017_03_30/pom.xml index 41f9d4220fff3..bde76009bbb77 100644 --- a/compute/resource-manager/v2017_03_30/pom.xml +++ b/compute/resource-manager/v2017_03_30/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-compute 1.0.0-beta-1 diff --git a/compute/resource-manager/v2017_09_01/pom.xml b/compute/resource-manager/v2017_09_01/pom.xml index a5d37655a5be2..bced99070acd2 100644 --- a/compute/resource-manager/v2017_09_01/pom.xml +++ b/compute/resource-manager/v2017_09_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-compute 1.0.0-beta diff --git a/compute/resource-manager/v2017_12_01/pom.xml b/compute/resource-manager/v2017_12_01/pom.xml index f0227bdbb32e9..6d9608aa5b01d 100644 --- a/compute/resource-manager/v2017_12_01/pom.xml +++ b/compute/resource-manager/v2017_12_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-compute 1.0.0-beta diff --git a/compute/resource-manager/v2018_04_01/pom.xml b/compute/resource-manager/v2018_04_01/pom.xml index 4af3fd45c046c..bc65ef2b06f50 100644 --- a/compute/resource-manager/v2018_04_01/pom.xml +++ b/compute/resource-manager/v2018_04_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-compute 1.0.0-beta diff --git a/containerinstance/resource-manager/v2017_08_01_preview/pom.xml b/containerinstance/resource-manager/v2017_08_01_preview/pom.xml index a2d91180e3714..39c2deb58f1c4 100644 --- a/containerinstance/resource-manager/v2017_08_01_preview/pom.xml +++ b/containerinstance/resource-manager/v2017_08_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-containerinstance 1.0.0-beta diff --git a/containerinstance/resource-manager/v2017_10_01_preview/pom.xml b/containerinstance/resource-manager/v2017_10_01_preview/pom.xml index deacf8598e95b..de3939f17c52e 100644 --- a/containerinstance/resource-manager/v2017_10_01_preview/pom.xml +++ b/containerinstance/resource-manager/v2017_10_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-containerinstance 1.0.0-beta diff --git a/containerinstance/resource-manager/v2017_12_01_preview/pom.xml b/containerinstance/resource-manager/v2017_12_01_preview/pom.xml index 39962712976d2..16e27a8caf640 100644 --- a/containerinstance/resource-manager/v2017_12_01_preview/pom.xml +++ b/containerinstance/resource-manager/v2017_12_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-containerinstance 1.0.0-beta diff --git a/containerinstance/resource-manager/v2018_02_01_preview/pom.xml b/containerinstance/resource-manager/v2018_02_01_preview/pom.xml index 72e4964aab3e3..a21902ca531c7 100644 --- a/containerinstance/resource-manager/v2018_02_01_preview/pom.xml +++ b/containerinstance/resource-manager/v2018_02_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-containerinstance 1.0.0-beta diff --git a/containerinstance/resource-manager/v2018_04_01/pom.xml b/containerinstance/resource-manager/v2018_04_01/pom.xml index da673df7e39cb..ae871e4ab49fd 100644 --- a/containerinstance/resource-manager/v2018_04_01/pom.xml +++ b/containerinstance/resource-manager/v2018_04_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-containerinstance 1.0.0-beta diff --git a/containerinstance/resource-manager/v2018_10_01/pom.xml b/containerinstance/resource-manager/v2018_10_01/pom.xml index 89e425dff041f..be4d1abe3172b 100644 --- a/containerinstance/resource-manager/v2018_10_01/pom.xml +++ b/containerinstance/resource-manager/v2018_10_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-containerinstance 1.0.0-beta diff --git a/containerregistry/resource-manager/v2016_06_27_preview/pom.xml b/containerregistry/resource-manager/v2016_06_27_preview/pom.xml index 9bac60d539a13..64400aeff25d1 100644 --- a/containerregistry/resource-manager/v2016_06_27_preview/pom.xml +++ b/containerregistry/resource-manager/v2016_06_27_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-containerregistry 1.0.0-beta diff --git a/containerregistry/resource-manager/v2017_03_01/pom.xml b/containerregistry/resource-manager/v2017_03_01/pom.xml index 145e98d12fad7..dbbf572fde39b 100644 --- a/containerregistry/resource-manager/v2017_03_01/pom.xml +++ b/containerregistry/resource-manager/v2017_03_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-containerregistry 1.0.0-beta diff --git a/containerregistry/resource-manager/v2017_06_01_preview/pom.xml b/containerregistry/resource-manager/v2017_06_01_preview/pom.xml index ef6c8503d59c5..dd95ea6a35f1a 100644 --- a/containerregistry/resource-manager/v2017_06_01_preview/pom.xml +++ b/containerregistry/resource-manager/v2017_06_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-containerregistry 1.0.0-beta diff --git a/containerregistry/resource-manager/v2017_10_01/pom.xml b/containerregistry/resource-manager/v2017_10_01/pom.xml index aedc4db92ffb9..8186bfcee8cd4 100644 --- a/containerregistry/resource-manager/v2017_10_01/pom.xml +++ b/containerregistry/resource-manager/v2017_10_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-containerregistry 1.0.0-beta diff --git a/containerregistry/resource-manager/v2018_02_01_preview/pom.xml b/containerregistry/resource-manager/v2018_02_01_preview/pom.xml index 7bc1414a6da8d..3bffb3cb2b9df 100644 --- a/containerregistry/resource-manager/v2018_02_01_preview/pom.xml +++ b/containerregistry/resource-manager/v2018_02_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-containerregistry 1.0.0-beta diff --git a/containerregistry/resource-manager/v2018_09_01/pom.xml b/containerregistry/resource-manager/v2018_09_01/pom.xml index f931be0453199..33f92935da873 100644 --- a/containerregistry/resource-manager/v2018_09_01/pom.xml +++ b/containerregistry/resource-manager/v2018_09_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-containerregistry 1.0.0-beta-1 diff --git a/containerservice/resource-manager/pom.xml b/containerservice/resource-manager/pom.xml index 0563c4828974f..40c8bb7dd8e23 100644 --- a/containerservice/resource-manager/pom.xml +++ b/containerservice/resource-manager/pom.xml @@ -8,8 +8,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../pom.xml + 1.1.0 + ../../pom.management.xml azure-mgmt-containerservice-parent 1.0.0-beta diff --git a/containerservice/resource-manager/v2017_07_01/pom.xml b/containerservice/resource-manager/v2017_07_01/pom.xml index dfc7b34e8272b..65a4cc8aae7de 100644 --- a/containerservice/resource-manager/v2017_07_01/pom.xml +++ b/containerservice/resource-manager/v2017_07_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-containerservice 1.0.0-beta-SNAPSHOT diff --git a/containerservice/resource-manager/v2017_08_31/pom.xml b/containerservice/resource-manager/v2017_08_31/pom.xml index b329530f80636..6d5d8ec2451b6 100644 --- a/containerservice/resource-manager/v2017_08_31/pom.xml +++ b/containerservice/resource-manager/v2017_08_31/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-containerservice 1.0.0-beta-SNAPSHOT diff --git a/containerservice/resource-manager/v2017_09_30/pom.xml b/containerservice/resource-manager/v2017_09_30/pom.xml index 882053cb748a9..a21292e4183c4 100644 --- a/containerservice/resource-manager/v2017_09_30/pom.xml +++ b/containerservice/resource-manager/v2017_09_30/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-containerservice 1.0.0-beta-SNAPSHOT diff --git a/containerservice/resource-manager/v2018_09_30_preview/pom.xml b/containerservice/resource-manager/v2018_09_30_preview/pom.xml index 2a8e06ce68ed7..36df5fcfdb4b4 100644 --- a/containerservice/resource-manager/v2018_09_30_preview/pom.xml +++ b/containerservice/resource-manager/v2018_09_30_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 0.0.3-beta - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-containerservice 1.0.0-beta diff --git a/containerservice/resource-manager/v2019_02_01/pom.xml b/containerservice/resource-manager/v2019_02_01/pom.xml index dd63b2a00bce2..c5a34cf0361c8 100644 --- a/containerservice/resource-manager/v2019_02_01/pom.xml +++ b/containerservice/resource-manager/v2019_02_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 0.0.3-beta - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-containerservice 1.0.0-beta diff --git a/containerservice/resource-manager/v2019_04_01/pom.xml b/containerservice/resource-manager/v2019_04_01/pom.xml index 90618c127da89..558ca726c99d5 100644 --- a/containerservice/resource-manager/v2019_04_01/pom.xml +++ b/containerservice/resource-manager/v2019_04_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 0.0.3-beta - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-containerservice 1.0.0-beta diff --git a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseHeaderDecoder.java b/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseHeaderDecoder.java index 0f2310ac42749..907f4883e5300 100644 --- a/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseHeaderDecoder.java +++ b/core/azure-core/src/main/java/com/azure/core/implementation/serializer/HttpResponseHeaderDecoder.java @@ -42,7 +42,7 @@ static Mono decode(HttpResponse httpResponse, SerializerAdapter serializ } else { return Mono.defer(() -> { try { - return Mono.just(deserializeHeaders(httpResponse.headers(), serializer, decodeData)); + return Mono.justOrEmpty(deserializeHeaders(httpResponse.headers(), serializer, decodeData)); } catch (IOException e) { return Mono.error(new HttpResponseException("HTTP response has malformed headers", httpResponse, e)); } diff --git a/cosmosdb/resource-manager/v2015_04_08/pom.xml b/cosmosdb/resource-manager/v2015_04_08/pom.xml index 03fa4a662c433..fa141394178a7 100644 --- a/cosmosdb/resource-manager/v2015_04_08/pom.xml +++ b/cosmosdb/resource-manager/v2015_04_08/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 0.0.3-beta - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-cosmosdb 1.0.0-beta diff --git a/datalakeanalytics/resource-manager/v2015_10_01_preview/pom.xml b/datalakeanalytics/resource-manager/v2015_10_01_preview/pom.xml index 2e452db8e3f44..51ebb52e77cc2 100644 --- a/datalakeanalytics/resource-manager/v2015_10_01_preview/pom.xml +++ b/datalakeanalytics/resource-manager/v2015_10_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-datalakeanalytics 1.0.0-beta-2 diff --git a/datalakeanalytics/resource-manager/v2016_11_01/pom.xml b/datalakeanalytics/resource-manager/v2016_11_01/pom.xml index 6a1494e41df79..e392e2a220e4f 100644 --- a/datalakeanalytics/resource-manager/v2016_11_01/pom.xml +++ b/datalakeanalytics/resource-manager/v2016_11_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-datalakeanalytics 1.0.0-beta-2 diff --git a/datalakestore/resource-manager/v2015_10_01_preview/pom.xml b/datalakestore/resource-manager/v2015_10_01_preview/pom.xml index 66c58ac91c0f2..93ed7509556b5 100644 --- a/datalakestore/resource-manager/v2015_10_01_preview/pom.xml +++ b/datalakestore/resource-manager/v2015_10_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-datalakestore 1.0.0-beta-2 diff --git a/datalakestore/resource-manager/v2016_11_01/pom.xml b/datalakestore/resource-manager/v2016_11_01/pom.xml index 9c88414f4b329..5752f920e8684 100644 --- a/datalakestore/resource-manager/v2016_11_01/pom.xml +++ b/datalakestore/resource-manager/v2016_11_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-datalakestore 1.0.0-beta-2 diff --git a/datamigration/resource-manager/v2017_11_15_preview/pom.xml b/datamigration/resource-manager/v2017_11_15_preview/pom.xml index f9d6e3508d824..6ed04f4d56baa 100644 --- a/datamigration/resource-manager/v2017_11_15_preview/pom.xml +++ b/datamigration/resource-manager/v2017_11_15_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-datamigration 1.0.0-beta diff --git a/datamigration/resource-manager/v2018_03_31_preview/pom.xml b/datamigration/resource-manager/v2018_03_31_preview/pom.xml index f3d0ea875c7ec..ad25a5f585b53 100644 --- a/datamigration/resource-manager/v2018_03_31_preview/pom.xml +++ b/datamigration/resource-manager/v2018_03_31_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-datamigration 1.0.0-beta diff --git a/datamigration/resource-manager/v2018_07_15_preview/pom.xml b/datamigration/resource-manager/v2018_07_15_preview/pom.xml index 9673ac01fa2e4..f8e10a9824e57 100644 --- a/datamigration/resource-manager/v2018_07_15_preview/pom.xml +++ b/datamigration/resource-manager/v2018_07_15_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-datamigration 1.0.0-beta diff --git a/devspaces/resource-manager/v2018_06_01_preview/pom.xml b/devspaces/resource-manager/v2018_06_01_preview/pom.xml index e4c4b6b18c3b1..16e89ea3179bf 100644 --- a/devspaces/resource-manager/v2018_06_01_preview/pom.xml +++ b/devspaces/resource-manager/v2018_06_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-devspaces 1.0.0-beta diff --git a/dns/resource-manager/v2016_04_01/pom.xml b/dns/resource-manager/v2016_04_01/pom.xml index 3abc40bf0a835..69ca5a625278d 100644 --- a/dns/resource-manager/v2016_04_01/pom.xml +++ b/dns/resource-manager/v2016_04_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-dns 1.0.0-beta-1 diff --git a/dns/resource-manager/v2017_10_01/pom.xml b/dns/resource-manager/v2017_10_01/pom.xml index c7f6d6167c5b1..a445f900ec81f 100644 --- a/dns/resource-manager/v2017_10_01/pom.xml +++ b/dns/resource-manager/v2017_10_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-network 1.0.0-beta diff --git a/edgegateway/resource-manager/v2019_03_01/pom.xml b/edgegateway/resource-manager/v2019_03_01/pom.xml index dfb3c00f304f2..7c4d55a857e55 100644 --- a/edgegateway/resource-manager/v2019_03_01/pom.xml +++ b/edgegateway/resource-manager/v2019_03_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 0.0.3-beta - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-databoxedge 1.0.0-beta diff --git a/eng/spotbugs-aggregate-report/pom.xml b/eng/spotbugs-aggregate-report/pom.xml index 6ba14ab80173d..f3382fc728d82 100644 --- a/eng/spotbugs-aggregate-report/pom.xml +++ b/eng/spotbugs-aggregate-report/pom.xml @@ -3,151 +3,207 @@ - - azure-client-sdk-parent - com.azure - 1.0.0 - ../../pom.client.xml - - 4.0.0 - - spotbugs-reporting + + azure-client-sdk-parent + com.azure 1.0.0 + ../../pom.client.xml + + 4.0.0 + spotbugs-reporting + 1.0.0 + + 5.0.1 + 2.3.1 + 2.5.1 + 1.2.0 + 2.0.0 + 10.5.0 + 1.0.0-SNAPSHOT + + + + azure-java-build-docs + https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java/ + + - - 5.0.1 - 2.3.1 - 2.5.1 - 1.2.0 - 2.0.0 - 10.5.0 - + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-client-source + ${client.phase} + + add-source + + + + ..\..\applicationconfig\client\src\main\java + ..\..\core\azure-core\src\main\java + ..\..\core\azure-core-auth\src\main\jasva + ..\..\core\azure-core-management\src\main\java + ..\..\core\azure-core-test\src\main\java + + + + + - - - azure-java-build-docs - https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java/ - - + + org.codehaus.mojo + build-helper-maven-plugin + + + add-data-source + ${data.phase} + + add-source + + + + ..\..\batch\data-plane\src\main\java + ..\..\eventhubs\data-plane\azure-eventhubs\src\main\java + ..\..\eventhubs\data-plane\azure-eventhubs-eph\src\main\java + ..\..\eventhubs\data-plane\azure-eventhubs-extensions\src\main\java + + + ..\..\keyvault\data-plane\azure-keyvault\src\main\java + ..\..\keyvault\data-plane\azure-keyvault-cryptography\src\main\java + ..\..\keyvault\data-plane\azure-keyvault-core\src\main\java + ..\..\keyvault\data-plane\azure-keyvault-extensions\src\main\java + ..\..\keyvault\data-plane\azure-keyvault-webkey\src\main\java + ..\..\servicebus\data-plane\azure-servicebus\src\main\java + + + + + + + - + + + client-modules + + + !data-plane + + true + + - com.microsoft.azure - azure-keyvault - ${azure-keyvault.version} + com.azure + azure-core + ${azure-core.version} - com.microsoft.azure - azure-keyvault-cryptography - ${azure-keyvault.version} + com.azure + azure-core-auth + ${azure-core-auth.version} - com.microsoft.azure - azure-keyvault-core - ${azure-keyvault.version} + com.azure + azure-core-management + ${azure-core-management.version} - com.microsoft.azure - azure-keyvault-extensions - ${azure-keyvault.version} + com.azure + azure-core-test + ${azure-core-test.version} - com.microsoft.azure - azure-keyvault-webkey - ${azure-keyvault.version} + com.azure + azure-core-test + ${azure-core-test.version} - com.microsoft.azure - azure-batch - ${azure-batch.version} + com.azure + azure-app-configuration + ${azure-app-configuration.version} + + + generate-sources + none + + + + + data-modules + + + data-plane + + + - com.microsoft.azure - azure-eventhubs - ${azure-eventhubs.version} + com.microsoft.azure + azure-keyvault + ${azure-keyvault.version} - com.microsoft.azure - azure-eventhubs-eph - ${azure-eventhubs-eph.version} + com.microsoft.azure + azure-keyvault-cryptography + ${azure-keyvault.version} - com.microsoft.azure - azure-eventhubs-extensions - ${azure-eventhubs.version} + com.microsoft.azure + azure-keyvault-core + ${azure-keyvault.version} - - - com.azure - azure-core - ${azure-core.version} + com.microsoft.azure + azure-keyvault-extensions + ${azure-keyvault.version} - com.azure - azure-core-auth - ${azure-core-auth.version} + com.microsoft.azure + azure-keyvault-webkey + ${azure-keyvault.version} - com.azure - azure-core-management - ${azure-core-management.version} + com.microsoft.azure + azure-batch + ${azure-batch.version} - com.azure - azure-core-test - ${azure-core-test.version} + com.microsoft.azure + azure-eventhubs + ${azure-eventhubs.version} + + + com.microsoft.azure + azure-eventhubs-eph + ${azure-eventhubs-eph.version} + + com.microsoft.azure + azure-eventhubs-extensions + ${azure-eventhubs.version} + + + com.microsoft.azure azure-servicebus ${azure-servicebus.version} - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - generate-sources - - add-source - - - - ..\..\applicationconfig\client\src\main\java - ..\..\batch\data-plane\src\main\java - ..\..\core\azure-core\src\main\java - ..\..\core\azure-core-auth\src\main\java - ..\..\core\azure-core-management\src\main\java - ..\..\core\azure-core-test\src\main\java - ..\..\eventhubs\data-plane\azure-eventhubs\src\main\java - ..\..\eventhubs\data-plane\azure-eventhubs-eph\src\main\java - ..\..\eventhubs\data-plane\azure-eventhubs-extensions\src\main\java - - - ..\..\keyvault\data-plane\azure-keyvault\src\main\java - ..\..\keyvault\data-plane\azure-keyvault-cryptography\src\main\java - ..\..\keyvault\data-plane\azure-keyvault-core\src\main\java - ..\..\keyvault\data-plane\azure-keyvault-extensions\src\main\java - ..\..\keyvault\data-plane\azure-keyvault-webkey\src\main\java - ..\..\servicebus\data-plane\azure-servicebus\src\main\java - - - - - - - + + + none + generate-sources + + + diff --git a/eventgrid/resource-manager/v2018_01_01/pom.xml b/eventgrid/resource-manager/v2018_01_01/pom.xml index 68fbf173491bb..7a030dbddb9fd 100644 --- a/eventgrid/resource-manager/v2018_01_01/pom.xml +++ b/eventgrid/resource-manager/v2018_01_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-eventgrid 1.0.0-beta diff --git a/eventgrid/resource-manager/v2018_05_01_preview/pom.xml b/eventgrid/resource-manager/v2018_05_01_preview/pom.xml index 1f86ced2e9c68..f2dc0645b10d7 100644 --- a/eventgrid/resource-manager/v2018_05_01_preview/pom.xml +++ b/eventgrid/resource-manager/v2018_05_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-eventgrid 1.0.0-beta diff --git a/eventgrid/resource-manager/v2018_09_15_preview/pom.xml b/eventgrid/resource-manager/v2018_09_15_preview/pom.xml index 547ff55383216..3b683a3d18a2f 100644 --- a/eventgrid/resource-manager/v2018_09_15_preview/pom.xml +++ b/eventgrid/resource-manager/v2018_09_15_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-eventgrid 1.0.0-beta diff --git a/eventgrid/resource-manager/v2019_01_01/pom.xml b/eventgrid/resource-manager/v2019_01_01/pom.xml index 2840bc413103c..3d1cdd0a8fa34 100644 --- a/eventgrid/resource-manager/v2019_01_01/pom.xml +++ b/eventgrid/resource-manager/v2019_01_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-eventgrid 1.0.0 diff --git a/eventhubs/data-plane/pom.xml b/eventhubs/data-plane/pom.xml index 5d96107a73097..3c1235e0732c8 100644 --- a/eventhubs/data-plane/pom.xml +++ b/eventhubs/data-plane/pom.xml @@ -6,9 +6,9 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.azure - azure-client-sdk-parent + azure-data-sdk-parent 1.0.0 - ../../pom.client.xml + ../../pom.data.xml 4.0.0 diff --git a/eventhubs/resource-manager/v2017_04_01/pom.xml b/eventhubs/resource-manager/v2017_04_01/pom.xml index ecbebaa7e2db6..838645e252e41 100644 --- a/eventhubs/resource-manager/v2017_04_01/pom.xml +++ b/eventhubs/resource-manager/v2017_04_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 0.0.3-beta - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-eventhub 1.0.0-beta diff --git a/features/resource-manager/v2015_12_01/pom.xml b/features/resource-manager/v2015_12_01/pom.xml index 0eec0e2dce11a..1819142d116e8 100644 --- a/features/resource-manager/v2015_12_01/pom.xml +++ b/features/resource-manager/v2015_12_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-features 1.0.0-beta diff --git a/hdinsight/resource-manager/v2018_06_01_preview/pom.xml b/hdinsight/resource-manager/v2018_06_01_preview/pom.xml index 875c8105eb0d9..a85570de3c33b 100644 --- a/hdinsight/resource-manager/v2018_06_01_preview/pom.xml +++ b/hdinsight/resource-manager/v2018_06_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-hdinsight 1.0.0 diff --git a/iotcentral/resource-manager/v2017_07_01_privatepreview/pom.xml b/iotcentral/resource-manager/v2017_07_01_privatepreview/pom.xml index 6e349a466fd6b..9496b92f3de77 100644 --- a/iotcentral/resource-manager/v2017_07_01_privatepreview/pom.xml +++ b/iotcentral/resource-manager/v2017_07_01_privatepreview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-iotcentral 1.0.0-beta diff --git a/iotcentral/resource-manager/v2018_09_01/pom.xml b/iotcentral/resource-manager/v2018_09_01/pom.xml index df7f0323b95e3..3a9f7b0fab320 100644 --- a/iotcentral/resource-manager/v2018_09_01/pom.xml +++ b/iotcentral/resource-manager/v2018_09_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-iotcentral 1.0.0-beta diff --git a/iothub/resource-manager/v2018_04_01/pom.xml b/iothub/resource-manager/v2018_04_01/pom.xml index 9c70cb03d0db5..f5c932b928c7b 100644 --- a/iothub/resource-manager/v2018_04_01/pom.xml +++ b/iothub/resource-manager/v2018_04_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-iothub 1.0.0-beta-SNAPSHOT diff --git a/keyvault/data-plane/pom.xml b/keyvault/data-plane/pom.xml index 64d6894a27ba9..c3bac6c2f660a 100644 --- a/keyvault/data-plane/pom.xml +++ b/keyvault/data-plane/pom.xml @@ -8,9 +8,9 @@ 4.0.0 com.azure - azure-client-sdk-parent + azure-data-sdk-parent 1.0.0 - ../../pom.client.xml + ../../pom.data.xml 1.2.1 diff --git a/keyvault/resource-manager/v2015_06_01/pom.xml b/keyvault/resource-manager/v2015_06_01/pom.xml index 8c2bbc27271f1..75c327675d3b1 100644 --- a/keyvault/resource-manager/v2015_06_01/pom.xml +++ b/keyvault/resource-manager/v2015_06_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-keyvault 1.0.0-beta diff --git a/keyvault/resource-manager/v2016_10_01/pom.xml b/keyvault/resource-manager/v2016_10_01/pom.xml index 6afa8dcafc0e2..749343d4395da 100644 --- a/keyvault/resource-manager/v2016_10_01/pom.xml +++ b/keyvault/resource-manager/v2016_10_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-keyvault 1.0.0-beta-1 diff --git a/kusto/resource-manager/v2018_09_07_preview/pom.xml b/kusto/resource-manager/v2018_09_07_preview/pom.xml index 00f958e2c8744..f286261bd1d93 100644 --- a/kusto/resource-manager/v2018_09_07_preview/pom.xml +++ b/kusto/resource-manager/v2018_09_07_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-kusto 1.0.0-beta diff --git a/labservices/resource-manager/v2018_10_15/pom.xml b/labservices/resource-manager/v2018_10_15/pom.xml index 3705f489a6f78..224eec2801143 100644 --- a/labservices/resource-manager/v2018_10_15/pom.xml +++ b/labservices/resource-manager/v2018_10_15/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-labservices 1.0.0-beta diff --git a/locks/resource-manager/v2016_09_01/pom.xml b/locks/resource-manager/v2016_09_01/pom.xml index e225e17cbd5f1..234b043e8efd7 100644 --- a/locks/resource-manager/v2016_09_01/pom.xml +++ b/locks/resource-manager/v2016_09_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 0.0.3-beta - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-locks 1.0.0-beta-2 diff --git a/logic/resource-manager/v2016_06_01/pom.xml b/logic/resource-manager/v2016_06_01/pom.xml index ec2398e10aff0..4a977657812ed 100644 --- a/logic/resource-manager/v2016_06_01/pom.xml +++ b/logic/resource-manager/v2016_06_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-logic 1.0.0-beta diff --git a/marketplaceordering/resource-manager/v2015_06_01/pom.xml b/marketplaceordering/resource-manager/v2015_06_01/pom.xml index f203f3a051ae5..1f05c31ea3153 100644 --- a/marketplaceordering/resource-manager/v2015_06_01/pom.xml +++ b/marketplaceordering/resource-manager/v2015_06_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 0.0.3-beta - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-marketplaceordering 1.0.0-beta diff --git a/mediaservices/resource-manager/v2015_10_01/pom.xml b/mediaservices/resource-manager/v2015_10_01/pom.xml index 528964fc3b8a4..f5b4359736385 100644 --- a/mediaservices/resource-manager/v2015_10_01/pom.xml +++ b/mediaservices/resource-manager/v2015_10_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.1 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-media 1.0.0-beta diff --git a/mediaservices/resource-manager/v2018_03_30_preview/pom.xml b/mediaservices/resource-manager/v2018_03_30_preview/pom.xml index 2ee27709d1189..ba718f498aa76 100644 --- a/mediaservices/resource-manager/v2018_03_30_preview/pom.xml +++ b/mediaservices/resource-manager/v2018_03_30_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.1 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-media 1.0.0-beta-2 diff --git a/mediaservices/resource-manager/v2018_06_01_preview/pom.xml b/mediaservices/resource-manager/v2018_06_01_preview/pom.xml index c9820d28e18d2..c8c6619f31129 100644 --- a/mediaservices/resource-manager/v2018_06_01_preview/pom.xml +++ b/mediaservices/resource-manager/v2018_06_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.1 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-media 1.0.0-beta-2 diff --git a/mediaservices/resource-manager/v2018_07_01/pom.xml b/mediaservices/resource-manager/v2018_07_01/pom.xml index 9103094bcec8f..90de0c8b23e7a 100644 --- a/mediaservices/resource-manager/v2018_07_01/pom.xml +++ b/mediaservices/resource-manager/v2018_07_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.1 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-media 1.0.0-beta-3 diff --git a/mixedreality/resource-manager/v2019_02_28_preview/pom.xml b/mixedreality/resource-manager/v2019_02_28_preview/pom.xml index 59e15acb0454d..6f32cbd9758e3 100644 --- a/mixedreality/resource-manager/v2019_02_28_preview/pom.xml +++ b/mixedreality/resource-manager/v2019_02_28_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 0.0.3-beta - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-mixedreality 1.0.0-beta diff --git a/mysql/resource-manager/v2017_12_01/pom.xml b/mysql/resource-manager/v2017_12_01/pom.xml index 468bac1caa4e7..49ec11fab7da9 100644 --- a/mysql/resource-manager/v2017_12_01/pom.xml +++ b/mysql/resource-manager/v2017_12_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-mysql 1.0.0-beta-2 diff --git a/network/resource-manager/v2017_10_01/pom.xml b/network/resource-manager/v2017_10_01/pom.xml index 524597607819f..03fe169492059 100644 --- a/network/resource-manager/v2017_10_01/pom.xml +++ b/network/resource-manager/v2017_10_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-network 1.0.0-beta diff --git a/network/resource-manager/v2018_04_01/pom.xml b/network/resource-manager/v2018_04_01/pom.xml index 548c88db41a25..352906ae13607 100644 --- a/network/resource-manager/v2018_04_01/pom.xml +++ b/network/resource-manager/v2018_04_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-network 1.0.0-beta diff --git a/network/resource-manager/v2018_06_01/pom.xml b/network/resource-manager/v2018_06_01/pom.xml index a2b29dd709bc1..888b62d359a7f 100644 --- a/network/resource-manager/v2018_06_01/pom.xml +++ b/network/resource-manager/v2018_06_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-network 1.0.0-beta diff --git a/network/resource-manager/v2018_07_01/pom.xml b/network/resource-manager/v2018_07_01/pom.xml index 487caadd0f86c..bcd4bb8d1ab66 100644 --- a/network/resource-manager/v2018_07_01/pom.xml +++ b/network/resource-manager/v2018_07_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-network 1.0.0-beta diff --git a/network/resource-manager/v2018_08_01/pom.xml b/network/resource-manager/v2018_08_01/pom.xml index 60b878ff1d526..8de72a675e9bc 100644 --- a/network/resource-manager/v2018_08_01/pom.xml +++ b/network/resource-manager/v2018_08_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-network 1.0.0-beta diff --git a/network/resource-manager/v2018_12_01/pom.xml b/network/resource-manager/v2018_12_01/pom.xml index 2f2e76a8d637c..ecbf4b930ea52 100644 --- a/network/resource-manager/v2018_12_01/pom.xml +++ b/network/resource-manager/v2018_12_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 0.0.3-beta - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-network 1.0.0-beta diff --git a/notificationhubs/resource-manager/v2014_09_01/pom.xml b/notificationhubs/resource-manager/v2014_09_01/pom.xml index 4afef0742b47e..0b2142bcb9db7 100644 --- a/notificationhubs/resource-manager/v2014_09_01/pom.xml +++ b/notificationhubs/resource-manager/v2014_09_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-notificationhubs 1.0.0-beta diff --git a/notificationhubs/resource-manager/v2016_03_01/pom.xml b/notificationhubs/resource-manager/v2016_03_01/pom.xml index cd7eed8382e78..61c69279d5cda 100644 --- a/notificationhubs/resource-manager/v2016_03_01/pom.xml +++ b/notificationhubs/resource-manager/v2016_03_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-notificationhubs 1.0.0-beta diff --git a/notificationhubs/resource-manager/v2017_04_01/pom.xml b/notificationhubs/resource-manager/v2017_04_01/pom.xml index d6785b7fb57e2..c1b4ea875acbf 100644 --- a/notificationhubs/resource-manager/v2017_04_01/pom.xml +++ b/notificationhubs/resource-manager/v2017_04_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-notificationhubs 1.0.0-beta diff --git a/parent/pom.xml b/parent/pom.xml new file mode 100644 index 0000000000000..61d61c219b521 --- /dev/null +++ b/parent/pom.xml @@ -0,0 +1,649 @@ + + + 4.0.0 + com.azure + azure-sdk-parent + pom + 1.0.0 + + Microsoft Azure SDK for Java Parent + Parent POM for Microsoft Azure SDK for Java + https://github.com/Azure/azure-sdk-for-java + + Microsoft Corporation + http://microsoft.com + + + + com.microsoft.maven + java-8-parent + 8.0.2 + + + + + The MIT License (MIT) + http://opensource.org/licenses/MIT + repo + + + + + + microsoft + Microsoft Corporation + + + + + + + ossrh + Sonatype Snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + default + + true + daily + + + + + + + ossrh + Sonatype Snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + default + + true + always + + + + + + + ossrh + Sonatype Snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + true + default + + + azure-java-build-docs + ${site.url}/site/ + + + + + GitHub + ${issues.url} + + + + https://github.com/Azure/azure-sdk-for-java + scm:git:https://github.com/Azure/azure-sdk-for-java.git + + HEAD + + + + UTF-8 + + + https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java + https://github.com/Azure/azure-sdk-for-java/issues + + + 2.9.6 + 1.6.5 + 1.10 + 3.1.11 + 0.31.0 + 1.2.0 + 2.11.1 + 2.9.3-01 + 2.4.16-03 + 2.1.1 + 1.7.5 + 1.7.0 + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT + 0.8.3.RELEASE + 4.1.33.Final + 2.5.2 + 0.20.0 + 1.2.4 + 20.0 + 1.7.0 + 4.5.0.201609210915-r + 3.3 + 1.14.0 + + + 1.0.0-SNAPSHOT + 1.6.3 + 1.59 + 1.11.1 + 1.3.0 + 1.3.1-SNAPSHOT + 1.3.0 + 1.3.0 + 8.0.0 + 1.1-groovy-2.4 + 3.2.7 + 1.2.0 + 3.2.3.RELEASE + 2.15.0 + 9.4.8.v20171121 + 9.4.8.v20171121 + 4.12 + 2.4 + + + 1.0.2 + 1.0.0 + 3.0.1 + 2.5.3 + 3.8.0 + 9.3.22.v20171030 + 1.0.0 + 2.4.3 + 3.0.0 + 1.0.0 + 2.18.1 + 2.4.1 + 3.0.0 + 3.0.2 + 1.0 + 3.7.1 + 3.0.0 + 1.8 + 3.0.0 + 8.18 + + + + + + + com.microsoft.azure + azure-client-runtime + ${client-runtime.version} + + + + com.microsoft.azure + azure-arm-client-runtime + ${client-runtime.version} + + + + com.microsoft.azure + adal4j + ${adal4j.version} + + + + com.azure + azure-core + ${azure-core.version} + + + + com.azure + azure-core-auth + ${azure-core-auth.version} + + + + com.microsoft.azure + azure-annotations + ${azure-annotations.version} + + + + + com.microsoft.rest + client-runtime + ${client-runtime.version} + + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson.version} + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + + + + + org.apache.qpid + proton-j + ${proton-j-version} + + + + com.microsoft.azure + qpid-proton-j-extensions + ${qpid-proton-j-extensions-version} + + + + + + commons-codec + commons-codec + ${commons-codec.version} + + + + org.apache.logging.log4j + log4j-api + ${log4j-api.version} + + + + com.microsoft.rest.v2 + client-runtime + ${client-runtime.version.v2} + + + + org.slf4j + slf4j-api + ${slf4j-api.version} + + + + org.slf4j + slf4j-log4j12 + ${slf4j-log4j12.version} + + + + io.projectreactor.netty + reactor-netty + ${reactor-netty.version} + + + + io.netty + netty-buffer + ${netty.version} + + + + junit + junit + ${junit.version} + + + + org.asynchttpclient + async-http-client + ${async-http-client.version} + + + + io.opencensus + opencensus-api + ${opencensus.version} + + + + io.reactivex + rxjava + ${rxjava.version} + + + + com.google.guava + guava + ${guava.version} + + + + org.eclipse.jgit + org.eclipse.jgit + ${jgit.version} + + + org.apache.httpcomponents + httpclient + + + + + + commons-net + commons-net + ${commons-net.version} + + + + + com.azure + azure-core-test + ${azure-core-test.version} + + + + com.microsoft.azure + azure-mgmt-storage + ${azure-mgmt-storage.version} + test + + + + com.microsoft.azure + azure-mgmt-graph-rbac + ${azure-mgmt-graph-rbac.version} + test + + + + com.microsoft.azure + azure-mgmt-resources + ${azure-mgmt-resources-test.version} + test-jar + test + + + + com.microsoft.azure + azure-client-authentication + ${client-runtime.version} + test + + + + com.microsoft.azure + azure-arm-client-runtime + ${client-runtime.version} + test-jar + test + + + + org.bouncycastle + bcprov-jdk15on + ${bcprov-jdk15on.version} + + + + com.microsoft.azure + azure-mgmt-keyvault + ${azure-mgmt-keyvault.version} + test + + + + com.microsoft.azure + azure-mgmt-resources + ${azure-mgmt-resources.version} + test + + + + com.microsoft.azure + azure-storage + ${azure-storage.version} + + + + commons-io + commons-io + ${commons-io.version} + test + + + + org.spockframework + spock-core + test + ${spock-core.version} + + + + cglib + cglib-nodep + ${cglib-nodep.version} + test + + + + org.slf4j + slf4j-simple + ${slf4j.version} + test + + + + io.projectreactor + reactor-test + ${reactor-test.version} + test + + + + uk.org.lidalia + slf4j-test + ${slf4j-test.version} + test + + + + com.github.tomakehurst + wiremock-standalone + ${wiremock-standalone.version} + test + + + + org.eclipse.jetty + jetty-http + ${jetty-http.version} + test + + + + org.eclipse.jetty + jetty-server + ${jetty-server.version} + test + + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper-maven-plugin.version} + + + compile-samples-source + generate-test-sources + + add-test-source + + + + src/samples/java + + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin.version} + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/Test*.java + **/*Test.java + **/*Tests.java + **/*TestCase.java + + + runtimeConfiguration + runtimeConfiguration + + + ${testMode} + https://azure-keyvault-3.vault.azure.net + https://azure-keyvault-2.vault.azure.net + environmentConfiguration + environmentConfiguration + + + + + + + org.apache.maven.plugins + maven-release-plugin + ${maven-release-plugin.version} + + + + + org.apache.maven.plugins + maven-clean-plugin + ${maven-clean-plugin.version} + + true + + + target + false + + ** + + + test-classes/session-records/ + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + ${lifecycle-mapping.version} + + + + + + com.googlecode.addjars-maven-plugin + addjars-maven-plugin + [1.0.5,) + + add-jars + + + + + + + + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven-failsafe-plugin.version} + + + + integration-test + verify + + + + + + + + org.eclipse.jetty + jetty-maven-plugin + ${jetty-maven-plugin.version} + + 0 + 11079 + STOP + false + ./jetty.xml + + + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin.version} + + + + + org.apache.maven.plugins + maven-site-plugin + ${maven-site-plugin.version} + + false + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + ${maven-project-info-reports-plugin.version} + + + + + diff --git a/policy/resource-manager/v2016_12_01/pom.xml b/policy/resource-manager/v2016_12_01/pom.xml index 46843fc0ca4cc..4f52a022e5c78 100644 --- a/policy/resource-manager/v2016_12_01/pom.xml +++ b/policy/resource-manager/v2016_12_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-policy 1.0.0-beta-1 diff --git a/policy/resource-manager/v2018_03_01/pom.xml b/policy/resource-manager/v2018_03_01/pom.xml index 52e7de29327dc..0286b5e804841 100644 --- a/policy/resource-manager/v2018_03_01/pom.xml +++ b/policy/resource-manager/v2018_03_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-policy 1.0.0-beta diff --git a/policyinsights/resource-manager/v2018_04_04/pom.xml b/policyinsights/resource-manager/v2018_04_04/pom.xml index 2429053120fa4..a653b51b57303 100644 --- a/policyinsights/resource-manager/v2018_04_04/pom.xml +++ b/policyinsights/resource-manager/v2018_04_04/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-policyinsights 1.0.0-beta-1 diff --git a/pom.client.xml b/pom.client.xml index fee9b82ed58fa..32749cb7636e2 100644 --- a/pom.client.xml +++ b/pom.client.xml @@ -8,7 +8,7 @@ pom 1.0.0 - Microsoft Azure SDK for Java + Microsoft Azure SDK for Java - Client Libraries Parent POM for Microsoft Azure SDK for Java https://github.com/Azure/azure-sdk-for-java @@ -17,9 +17,10 @@ - com.microsoft.maven - java-8-parent - 8.0.0 + com.azure + azure-sdk-parent + 1.0.0 + ./parent/pom.xml @@ -37,47 +38,6 @@ - - - - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default - - true - daily - - - - - - - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - default - - true - always - - - - - - - ossrh - Sonatype Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - true - default - - - azure-java-build-docs - ${site.url}/site/ - - - GitHub ${issues.url} @@ -101,333 +61,9 @@ https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java https://github.com/Azure/azure-sdk-for-java/issues - - - 2.9.6 - 1.6.4 - 1.6.1 - 1.10 - 3.1.11 - 0.31.0 - 1.2.0 - 2.11.1 - 2.9.3-01 - 2.4.16-03 - 2.1.1 - 1.7.5 - 1.7.0 - 1.0.0-SNAPSHOT - 1.0.0-SNAPSHOT - 1.0.0-SNAPSHOT - 0.8.3.RELEASE - 4.1.33.Final - 2.5.2 - 0.20.0 - - - 1.0.0-SNAPSHOT - 1.6.3 - 1.59 - 1.11.1 - 1.3.0 - 1.3.1-SNAPSHOT - 1.3.0 - 1.3.0 - 8.0.0 - 1.6.3 - 1.1-groovy-2.4 - 3.2.7 - 1.2.0 - 3.2.3.RELEASE - 2.15.0 - 9.4.8.v20171121 - 9.4.8.v20171121 - 4.12 - - - 1.0.1-SNAPSHOT - 3.0.1 - 2.5.3 - 3.8.0 - 9.3.22.v20171030 - 1.0.0 - 2.4.3 - 3.0.0 - 1.0.0 - 2.18.1 - 2.4.1 - 3.0.0 - 3.0.2 - 1.0.0 - 1.0 - 3.7.1 - 3.0.0 - 2.4 - 8.18 + azure-client-sdk-parent - - - - - - com.microsoft.azure - azure-client-runtime - ${azure-client-runtime.version} - - - - com.microsoft.azure - adal4j - ${adal4j.version} - - - - com.azure - azure-core - ${azure-core.version} - - - - com.azure - azure-core-auth - ${azure-core-auth.version} - - - - - com.microsoft.rest - client-runtime - ${client-runtime.version} - - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} - - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson.version} - - - - - org.apache.qpid - proton-j - ${proton-j-version} - - - - com.microsoft.azure - qpid-proton-j-extensions - ${qpid-proton-j-extensions-version} - - - - - - commons-codec - commons-codec - ${commons-codec.version} - - - - org.apache.logging.log4j - log4j-api - ${log4j-api.version} - - - - com.microsoft.rest.v2 - client-runtime - ${client-runtime.version.v2} - - - - org.slf4j - slf4j-api - ${slf4j-api.version} - - - - org.slf4j - slf4j-log4j12 - ${slf4j-log4j12.version} - - - - io.projectreactor.netty - reactor-netty - ${reactor-netty.version} - - - - io.netty - netty-buffer - ${netty.version} - - - - junit - junit - ${junit.version} - - - - org.asynchttpclient - async-http-client - ${async-http-client.version} - - - - io.opencensus - opencensus-api - ${opencensus.version} - - - - - com.azure - azure-core-test - ${azure-core-test.version} - - - - com.microsoft.azure - azure-mgmt-storage - ${azure-mgmt-storage.version} - test - - - - com.microsoft.azure - azure-mgmt-graph-rbac - ${azure-mgmt-graph-rbac.version} - test - - - - com.microsoft.azure - azure-mgmt-resources - ${azure-mgmt-resources-test.version} - test-jar - test - - - - com.microsoft.azure - azure-client-authentication - ${azure-client-authentication.version} - test - - - - org.bouncycastle - bcprov-jdk15on - ${bcprov-jdk15on.version} - - - - com.microsoft.azure - azure-mgmt-keyvault - ${azure-mgmt-keyvault.version} - test - - - - com.microsoft.azure - azure-mgmt-resources - ${azure-mgmt-resources.version} - test - - - - com.microsoft.azure - azure-storage - ${azure-storage.version} - - - - commons-io - commons-io - ${commons-io.version} - test - - - - org.spockframework - spock-core - test - ${spock-core.version} - - - - cglib - cglib-nodep - ${cglib-nodep.version} - test - - - - org.slf4j - slf4j-simple - ${slf4j.version} - test - - - - io.projectreactor - reactor-test - ${reactor-test.version} - test - - - - uk.org.lidalia - slf4j-test - ${slf4j-test.version} - test - - - - com.github.tomakehurst - wiremock-standalone - ${wiremock-standalone.version} - test - - - - org.eclipse.jetty - jetty-http - ${jetty-http.version} - test - - - - org.eclipse.jetty - jetty-server - ${jetty-server.version} - test - - - - @@ -438,7 +74,7 @@ com.azure sdk-build-tools - ${maven-build-tools.version} + ${sdk-build-tools.version} com.puppycrawl.tools @@ -479,7 +115,7 @@ com.azure sdk-build-tools - ${maven-build-tools.version} + ${sdk-build-tools.version} @@ -586,7 +222,7 @@ maven-antrun-plugin - 1.8 + ${maven-antrun-plugin.version} copy @@ -611,9 +247,7 @@ - - org.apache.maven.plugins maven-javadoc-plugin @@ -631,18 +265,6 @@ com.azure.tracing.opencensus* - - Azure Batch - com.microsoft.azure.batch* - - - Azure Event Hubs - com.microsoft.azure.eventhubs*:com.microsoft.azure.eventprocessorhost - - - Azure Key Vault - com.microsoft.azure.keyvault* - Azure Core com.azure.core:com.azure.core.annotations:com.azure.core.credentials:com.azure.core.exception:com.azure.core.http* @@ -656,12 +278,8 @@ com.azure.core.auth* - Azure Service Bus - com.microsoft.azure.servicebus* - - - Azure Storage - com.microsoft.azure.storage* + Azure App Configuration + com.azure.applicationconfig* @@ -682,7 +300,7 @@ com.azure sdk-build-tools - ${maven-build-tools.version} + ${sdk-build-tools.version} @@ -696,172 +314,7 @@ false - - - - org.codehaus.mojo - build-helper-maven-plugin - ${build-helper-maven-plugin.version} - - - compile-samples-source - generate-test-sources - - add-test-source - - - - src/samples/java - - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - ${maven-resources-plugin.version} - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/Test*.java - **/*Test.java - **/*Tests.java - **/*TestCase.java - - - runtimeConfiguration - runtimeConfiguration - - - ${testMode} - https://azure-keyvault-3.vault.azure.net - https://azure-keyvault-2.vault.azure.net - environmentConfiguration - environmentConfiguration - - - - - - - org.apache.maven.plugins - maven-release-plugin - ${maven-release-plugin.version} - - - - - org.apache.maven.plugins - maven-clean-plugin - ${maven-clean-plugin.version} - - true - - - target - false - - ** - - - test-classes/session-records/ - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - ${lifecycle-mapping.version} - - - - - - com.googlecode.addjars-maven-plugin - addjars-maven-plugin - [1.0.5,) - - add-jars - - - - - - - - - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven-failsafe-plugin.version} - - - - integration-test - verify - - - - - - - - org.eclipse.jetty - jetty-maven-plugin - ${jetty-maven-plugin.version} - - 0 - 11079 - STOP - false - ./jetty.xml - - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven-jar-plugin.version} - - - - - org.apache.maven.plugins - maven-site-plugin - ${maven-site-plugin.version} - - false - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - ${maven-project-info-reports-plugin.version} - - - @@ -885,7 +338,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.0.0 + ${maven-checkstyle-plugin.version} checkstyle/checkstyle.xml checkstyle/checkstyle-suppressions.xml @@ -1092,13 +545,8 @@ ./applicationconfig/client - ./batch/data-plane ./core - ./eventhubs/data-plane - ./keyvault/data-plane ./keyvault/client - ./servicebus/data-plane - ./storage/data-plane ./tracing diff --git a/pom.data.xml b/pom.data.xml new file mode 100644 index 0000000000000..7af06b7c4a398 --- /dev/null +++ b/pom.data.xml @@ -0,0 +1,550 @@ + + + 4.0.0 + com.azure + azure-data-sdk-parent + pom + 1.0.0 + + Microsoft Azure SDK for Java - Data Plane Libraries + Parent POM for Microsoft Azure SDK for Java + https://github.com/Azure/azure-sdk-for-java + + Microsoft Corporation + http://microsoft.com + + + + com.azure + azure-sdk-parent + 1.0.0 + ./parent/pom.xml + + + + + The MIT License (MIT) + http://opensource.org/licenses/MIT + repo + + + + + + microsoft + Microsoft Corporation + + + + + GitHub + ${issues.url} + + + + https://github.com/Azure/azure-sdk-for-java + scm:git:https://github.com/Azure/azure-sdk-for-java.git + + HEAD + + + + UTF-8 + ${project.build.directory} + + + playback + 11080 + 11081 + + https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java + https://github.com/Azure/azure-sdk-for-java/issues + azure-data-sdk-parent + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + com.azure + sdk-build-tools + ${sdk-build-tools.version} + + + com.puppycrawl.tools + checkstyle + ${checkstyle.version} + + + + checkstyle/checkstyle.xml + checkstyle/checkstyle-suppressions.xml + checkstyle/java.header + samedir= + UTF-8 + true + true + true + + + false + false + + + + verify + + check + + + + + + + + com.github.spotbugs + spotbugs-maven-plugin + ${spotbugs.version} + + + com.azure + sdk-build-tools + ${sdk-build-tools.version} + + + + Max + Low + true + ${project.build.directory}/spotbugs + spotbugs/spotbugs-exclude.xml + + + false + + + + verify + + check + + + + + + + + org.codehaus.mojo + xml-maven-plugin + ${xml-maven-plugin.version} + + + verify + + transform + + + + + + + ${project.build.directory}/spotbugs + spotbugsXml.xml + ${project.build.directory}/spotbugs + fancy-hist.xsl + + + .html + + + + + + + + com.github.spotbugs + spotbugs + ${spotbugs.version} + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + ${packageOutputDirectory} + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + ${packageOutputDirectory} + + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + ${packageOutputDirectory} + + + + + + + + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + copy + package + + + + + + + run + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + 8 + Azure SDK for Java Reference Documentation + Azure SDK for Java Reference Documentation + false +
Visit the <a href="https://docs.microsoft.com/java/azure/">Azure for Java Developers</a>site for more Java documentation, including quick starts, tutorials, and code samples.
+ false + com.microsoft.azure.template:*.impl.*:*.implementation.* + + + Azure Batch + com.microsoft.azure.batch* + + + Azure Event Hubs + com.microsoft.azure.eventhubs*:com.microsoft.azure.eventprocessorhost + + + Azure Key Vault + com.microsoft.azure.keyvault* + + + Azure Service Bus + com.microsoft.azure.servicebus* + + + Azure Storage + com.microsoft.azure.storage* + + + + https://docs.oracle.com/javase/8/docs/api/ + https://projectreactor.io/docs/core/release/api/ + https://netty.io/4.1/api/ + http://reactivex.io/RxJava/javadoc/ + + false + + + + + com.github.spotbugs + spotbugs-maven-plugin + ${spotbugs.version} + + + com.azure + sdk-build-tools + ${sdk-build-tools.version} + + + + Max + Low + true + ${project.build.directory}/spotbugs + spotbugs/spotbugs-exclude.xml + + + false + + + + + + + + + + org.apache.maven.plugins + maven-jxr-plugin + 3.0.0 + + + aggregate + false + + aggregate + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven-checkstyle-plugin.version} + + checkstyle/checkstyle.xml + checkstyle/checkstyle-suppressions.xml + checkstyle/java.header + samedir= + UTF-8 + true + true + true + + + false + false + + + + non-aggregate + + checkstyle + + + + aggregate + false + + checkstyle-aggregate + + + + + + com.github.spotbugs + spotbugs-maven-plugin + ${spotbugs.version} + + + non-aggregate + + spotbugs + + + + aggregate + false + + spotbugs + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc.version} + + + non-aggregate + + javadoc + + + + aggregate + false + + aggregate + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.0.0 + + + + index + summary + dependency-info + dependency-management + dependency-convergence + ci-management + dependencies + issue-management + licenses + scm + plugins + plugin-management + team + + + + + + + + + + + + java8 + + true + + !java-lts + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + true + true + -Xlint:all + + + + + + + + java-lts + + + java-lts + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 11 + 11 + true + true + -Xlint:all + + + + + + + + + javadoc-no-modules-fix + + [9,) + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + --no-module-directories + + + + + + + + non-shippping-modules + + + include-non-shipping-modules + + + + ./eng/spotbugs-aggregate-report + ./eng/code-quality-reports + + + + + template-module + + + include-template + + + + ./sdk/template/azure-sdk-template + + + + + + ./batch/data-plane + ./eventhubs/data-plane + ./keyvault/data-plane + ./servicebus/data-plane + ./storage/data-plane + + diff --git a/pom.management.xml b/pom.management.xml new file mode 100644 index 0000000000000..b3e54a8c50355 --- /dev/null +++ b/pom.management.xml @@ -0,0 +1,219 @@ + + + 4.0.0 + com.microsoft.azure + 1.1.0 + azure-arm-parent + pom + + Microsoft Azure SDK for Java - Management Plane Libraries + Parent POM for Microsoft Azure SDK for Java + https://github.com/Azure/azure-sdk-for-java + + Microsoft Corporation + http://microsoft.com + + + + com.azure + azure-sdk-parent + 1.0.0 + ./parent/pom.xml + + + + + The MIT License (MIT) + http://opensource.org/licenses/MIT + repo + + + + + + microsoft + Microsoft Corporation + + + + + GitHub + ${issues.url} + + + + https://github.com/Azure/azure-sdk-for-java + scm:git:https://github.com/Azure/azure-sdk-for-java.git + + HEAD + + + + UTF-8 + ${project.build.directory} + + + playback + 11080 + 11081 + + https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java + https://github.com/Azure/azure-sdk-for-java/issues + true + + + + + + org.codehaus.mojo + properties-maven-plugin + ${properties-maven-plugin.version} + + + generate-resources + + write-project-properties + + + + ${project.build.outputDirectory}/maven.properties + + + + + + + com.github.spotbugs + spotbugs-maven-plugin + ${spotbugs.version} + + + + none + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + + none + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.7 + 1.7 + true + true + -Xlint:unchecked + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc.version} + + Microsoft Azure Management Libraries for Java ${project.version} + Microsoft Azure Management Libraries for Java ${project.version} + -Xdoclint:none + *.samples;*.implementation.*;*.utils.*;com.microsoft.azure.utility;*.management.billing;*.management.cognitiveservices;*.management.consumption;*.management.customerinsights;*.management.devices;*.management.devtestlab;*.management.insights;*.management.logic;*.management.machinelearning;*.management.notificationhubs;*.management.powerbi;*.management.recoveryservices;*.management.relay;*.management.scheduler;*.management.servicefabric;*.management.streamanalytics + /** +
* Copyright (c) Microsoft Corporation. All rights reserved. +
* Licensed under the MIT License. See License.txt in the project root for +
* license information. +
*/]]> + + + + + org.apache.maven.plugins + maven-release-plugin + ${maven-release-plugin.version} + + + + + + com.github.spotbugs + spotbugs-maven-plugin + ${spotbugs.version} + + + + none + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + + none + + + + + + + + + run-shade-plugin + + runShadePlugin + + + + + org.apache.maven.plugins + maven-shade-plugin + ${maven-shade-plugin.version} + + + + + shade-plugin + package + + shade + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + + + + + + + + + ./profiles/2018-03-01-hybrid + + diff --git a/pom.xml b/pom.xml index 0ecd9392839c6..04446fa2474fa 100644 --- a/pom.xml +++ b/pom.xml @@ -1,18 +1,27 @@ - - + + 4.0.0 - com.microsoft.azure - 1.0.1 - azure-arm-parent + com.azure + azure-sdk-all pom + 1.0.0 - Microsoft Azure SDK ARM Parent - This package contains the parent module of Autogenerated Microsoft Azure ARM SDK. + Microsoft Azure SDK for Java - All Modules + Aggregated POM for Microsoft Azure SDK for Java https://github.com/Azure/azure-sdk-for-java + + Microsoft Corporation + http://microsoft.com + + + + com.azure + azure-sdk-parent + 1.0.0 + ./parent/pom.xml + @@ -22,389 +31,247 @@ + + + microsoft + Microsoft Corporation + + + + + GitHub + ${issues.url} + + - scm:git:https://github.com/Azure/azure-sdk-for-java - scm:git:git@github.com:Azure/azure-sdk-for-java.git + https://github.com/Azure/azure-sdk-for-java + scm:git:https://github.com/Azure/azure-sdk-for-java.git + HEAD UTF-8 - + ${project.build.directory} + + playback 11080 - 1.6.6 - 1.14.0 - + 11081 - - - microsoft - Microsoft - - - - - - local-nexus - Local Nexus - http://localhost:8081/repository/maven-releases/ - - + https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java + https://github.com/Azure/azure-sdk-for-java/issues + - - - - com.fasterxml.jackson.core - jackson-core - 2.9.4 - - - com.fasterxml.jackson.core - jackson-databind - 2.9.4 - - - com.fasterxml.jackson.core - jackson-annotations - 2.9.0 - - - commons-codec - commons-codec - 1.10 - - - io.reactivex - rxjava - 1.2.4 - - - com.microsoft.azure - azure-arm-client-runtime - ${runtime.version} - - - com.microsoft.azure - azure-client-runtime - ${runtime.version} - - - com.google.guava - guava - 20.0 - - - - com.microsoft.azure - azure-client-authentication - ${runtime.version} - test - - - com.microsoft.azure - azure-arm-client-runtime - ${runtime.version} - test-jar - test - - - com.microsoft.azure - azure-mgmt-resources - ${fluentsdk.version} - test - - - junit - junit - 4.12 - test - - - commons-io - commons-io - 2.4 - test - - - com.microsoft.azure - azure-annotations - 1.7.0 - - - org.eclipse.jgit - org.eclipse.jgit - 4.5.0.201609210915-r - - - org.apache.httpcomponents - httpclient - - - - - commons-net - commons-net - 3.3 - - - - - org.eclipse.jetty - jetty-maven-plugin - 9.2.22.v20170606 - - 0 - 11079 - STOP - - ${playbackServerPort} - - - - - org.codehaus.mojo - properties-maven-plugin - 1.0.0 - - - generate-resources - - write-project-properties - - - - ${project.build.outputDirectory}/maven.properties - - - - - + org.apache.maven.plugins maven-checkstyle-plugin - 2.17 - com.microsoft.azure - autorest-build-tools - [1.0.0,2.0.0) + com.azure + sdk-build-tools + ${sdk-build-tools.version} com.puppycrawl.tools checkstyle - 6.18 + ${checkstyle.version} - checkstyle.xml - samedir=runtimes/build-tools/src/main/resources - suppressions.xml + checkstyle/checkstyle.xml + checkstyle/checkstyle-suppressions.xml + checkstyle/java.header + samedir= + UTF-8 true + true + true + + + false + false + + + verify + + check + + + - + + org.apache.maven.plugins - maven-compiler-plugin - 3.1 + maven-jar-plugin - 1.7 - 1.7 - true - true - -Xlint:unchecked + ${packageOutputDirectory} + org.apache.maven.plugins maven-javadoc-plugin - 3.0.0 - - Microsoft Azure Management Libraries for Java ${project.version} - Microsoft Azure Management Libraries for Java ${project.version} - -Xdoclint:none - *.samples;*.implementation.*;*.utils.*;com.microsoft.azure.utility;*.management.billing;*.management.cognitiveservices;*.management.consumption;*.management.customerinsights;*.management.devices;*.management.devtestlab;*.management.insights;*.management.logic;*.management.machinelearning;*.management.notificationhubs;*.management.powerbi;*.management.recoveryservices;*.management.relay;*.management.scheduler;*.management.servicefabric;*.management.streamanalytics - /** -
* Copyright (c) Microsoft Corporation. All rights reserved. -
* Licensed under the MIT License. See License.txt in the project root for -
* license information. -
*/]]> - + + + attach-javadocs + + jar + + + ${packageOutputDirectory} + + + + org.apache.maven.plugins - maven-release-plugin - 2.5.3 + maven-source-plugin + + + attach-sources + + jar + + + ${packageOutputDirectory} + + + - - com.googlecode.addjars-maven-plugin - addjars-maven-plugin - 1.0.5 - - - - add-jars - - - - - ../extlib - - - - + + + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + copy + package + + + + + + + run + + + + + org.codehaus.mojo + build-helper-maven-plugin + - - - - com.github.spotbugs - spotbugs-maven-plugin - 3.1.1 - - ${project.parent.basedir}/spotbugs-includeFilter.xml - ${project.parent.basedir}/spotbugs-excludeFilter.xml - - - - - com.github.spotbugs - spotbugs - 3.1.1 - - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.20 - - false - - **/Test*.java - **/*Test.java - **/*Tests.java - **/*TestCase.java - - - ${testMode} - - - + - - org.apache.maven.plugins - maven-release-plugin - 2.5.2 - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - com.googlecode.addjars-maven-plugin - - - addjars-maven-plugin - - [1.0.5,) - - add-jars - - - - - - - - - - + + + + java8 + + true + + !java-lts + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + true + true + -Xlint:all + + + + + - - maven-clean-plugin - 3.0.0 - - - - . - - serial.output - - - - - + + java-lts + + + java-lts + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 11 + 11 + true + true + -Xlint:all + + + + + - - com.microsoft.azure - bundler-maven-plugin - 0.0.4 - - - - - + - run-shade-plugin + javadoc-no-modules-fix - runShadePlugin + [9,) org.apache.maven.plugins - maven-shade-plugin - 2.4.1 + maven-javadoc-plugin + --no-module-directories - - - shade-plugin - package - - shade - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - + + + template-module + + + include-template + + + + ./sdk/template/azure-sdk-template + + + + + ./pom.client.xml + ./pom.data.xml + ./pom.management.xml + diff --git a/postgresql/resource-manager/v2017_12_01/pom.xml b/postgresql/resource-manager/v2017_12_01/pom.xml index 5b22fbce26a9c..1c00c290516a7 100644 --- a/postgresql/resource-manager/v2017_12_01/pom.xml +++ b/postgresql/resource-manager/v2017_12_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-postgresql 1.0.0-beta-2 diff --git a/privatedns/resource-manager/v2018_09_01/pom.xml b/privatedns/resource-manager/v2018_09_01/pom.xml index f1d5cb1f889ba..6312fae23da57 100644 --- a/privatedns/resource-manager/v2018_09_01/pom.xml +++ b/privatedns/resource-manager/v2018_09_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-privatedns 1.0.0-beta diff --git a/profiles/2018-03-01-hybrid/pom.xml b/profiles/2018-03-01-hybrid/pom.xml index 7e3dfc074abd3..b66cf78f58df0 100644 --- a/profiles/2018-03-01-hybrid/pom.xml +++ b/profiles/2018-03-01-hybrid/pom.xml @@ -9,8 +9,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../pom.xml + 1.1.0 + ../../pom.management.xml azure-profile-parent 1.0.0-beta @@ -51,13 +51,13 @@ com.microsoft.azure azure-client-authentication - ${runtime.version} + ${client-runtime.version} test com.microsoft.azure azure-arm-client-runtime - ${runtime.version} + ${client-runtime.version} test-jar test diff --git a/recoveryservices.backup/resource-manager/v2016_06_01/pom.xml b/recoveryservices.backup/resource-manager/v2016_06_01/pom.xml index 2e7bc4f2cb0ba..0af05a39c24b8 100644 --- a/recoveryservices.backup/resource-manager/v2016_06_01/pom.xml +++ b/recoveryservices.backup/resource-manager/v2016_06_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-recoveryservices 1.0.0-beta diff --git a/recoveryservices.backup/resource-manager/v2016_12_01/pom.xml b/recoveryservices.backup/resource-manager/v2016_12_01/pom.xml index 71a55a8ce24ae..e72ea374c3c46 100644 --- a/recoveryservices.backup/resource-manager/v2016_12_01/pom.xml +++ b/recoveryservices.backup/resource-manager/v2016_12_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-recoveryservices 1.0.0-beta diff --git a/recoveryservices.backup/resource-manager/v2017_07_01/pom.xml b/recoveryservices.backup/resource-manager/v2017_07_01/pom.xml index 9f264560a0174..7db0fda5f6f4f 100644 --- a/recoveryservices.backup/resource-manager/v2017_07_01/pom.xml +++ b/recoveryservices.backup/resource-manager/v2017_07_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-recoveryservices 1.0.0-beta diff --git a/recoveryservices/resource-manager/v2016_06_01/pom.xml b/recoveryservices/resource-manager/v2016_06_01/pom.xml index 9124d2b0066d8..744618c00d17b 100644 --- a/recoveryservices/resource-manager/v2016_06_01/pom.xml +++ b/recoveryservices/resource-manager/v2016_06_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-recoveryservices 1.0.0-beta diff --git a/redis/resource-manager/v2017_10_01/pom.xml b/redis/resource-manager/v2017_10_01/pom.xml index fe052f01935f2..0f5c735750ece 100644 --- a/redis/resource-manager/v2017_10_01/pom.xml +++ b/redis/resource-manager/v2017_10_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-redis 1.0.0-beta-SNAPSHOT diff --git a/redis/resource-manager/v2018_03_01/pom.xml b/redis/resource-manager/v2018_03_01/pom.xml index 7ddde2188b621..0c3b787e5df06 100644 --- a/redis/resource-manager/v2018_03_01/pom.xml +++ b/redis/resource-manager/v2018_03_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-redis 1.0.0-beta-SNAPSHOT diff --git a/resourcegraph/resource-manager/v2019_04_01/pom.xml b/resourcegraph/resource-manager/v2019_04_01/pom.xml index eac2fda689bac..8a7b31f63debc 100644 --- a/resourcegraph/resource-manager/v2019_04_01/pom.xml +++ b/resourcegraph/resource-manager/v2019_04_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 0.0.3-beta - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-resourcegraph 1.0.0-beta diff --git a/resources/resource-manager/v2016_06_01/pom.xml b/resources/resource-manager/v2016_06_01/pom.xml index d734835f4ed36..f98dab9217b03 100644 --- a/resources/resource-manager/v2016_06_01/pom.xml +++ b/resources/resource-manager/v2016_06_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-subscriptions 1.0.0-beta diff --git a/resources/resource-manager/v2016_09_01/pom.xml b/resources/resource-manager/v2016_09_01/pom.xml index f32c92d464636..0fa6698b6ff77 100644 --- a/resources/resource-manager/v2016_09_01/pom.xml +++ b/resources/resource-manager/v2016_09_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-resources 1.0.0-beta diff --git a/resources/resource-manager/v2018_02_01/pom.xml b/resources/resource-manager/v2018_02_01/pom.xml index c8482a14c284d..e818f341267c3 100644 --- a/resources/resource-manager/v2018_02_01/pom.xml +++ b/resources/resource-manager/v2018_02_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-resources 1.0.0-beta-1 diff --git a/resources/resource-manager/v2018_05_01/pom.xml b/resources/resource-manager/v2018_05_01/pom.xml index 8cd08fc2272af..f3b514096cb6b 100644 --- a/resources/resource-manager/v2018_05_01/pom.xml +++ b/resources/resource-manager/v2018_05_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 0.0.3-beta - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-resources 1.0.0-beta diff --git a/servicebus/data-plane/pom.xml b/servicebus/data-plane/pom.xml index c1fe2e41d0090..2576f2a662aa4 100644 --- a/servicebus/data-plane/pom.xml +++ b/servicebus/data-plane/pom.xml @@ -15,9 +15,9 @@ com.azure - azure-client-sdk-parent + azure-data-sdk-parent 1.0.0 - ../../pom.client.xml + ../../pom.data.xml diff --git a/signalr/resource-manager/v2018_03_01_preview/pom.xml b/signalr/resource-manager/v2018_03_01_preview/pom.xml index 9e422bc90835a..167fdfbd80f7b 100644 --- a/signalr/resource-manager/v2018_03_01_preview/pom.xml +++ b/signalr/resource-manager/v2018_03_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-signalr 1.0.0-beta-SNAPSHOT diff --git a/sql/resource-manager/v2014_04_01/pom.xml b/sql/resource-manager/v2014_04_01/pom.xml index 2e5725258d977..a75f6d3f80f4e 100644 --- a/sql/resource-manager/v2014_04_01/pom.xml +++ b/sql/resource-manager/v2014_04_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-sql 1.0.0-beta diff --git a/sql/resource-manager/v2015_05_01_preview/pom.xml b/sql/resource-manager/v2015_05_01_preview/pom.xml index c9b062ea9f5dd..96d2be996b045 100644 --- a/sql/resource-manager/v2015_05_01_preview/pom.xml +++ b/sql/resource-manager/v2015_05_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-sql 1.0.0-beta diff --git a/sql/resource-manager/v2017_03_01_preview/pom.xml b/sql/resource-manager/v2017_03_01_preview/pom.xml index 9cbe03ff1bb94..30cff37678098 100644 --- a/sql/resource-manager/v2017_03_01_preview/pom.xml +++ b/sql/resource-manager/v2017_03_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-sql 1.0.0-beta diff --git a/sql/resource-manager/v2017_10_01_preview/pom.xml b/sql/resource-manager/v2017_10_01_preview/pom.xml index 9fdda84f95eba..db97895f8b5c2 100644 --- a/sql/resource-manager/v2017_10_01_preview/pom.xml +++ b/sql/resource-manager/v2017_10_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-sql 1.0.0-beta diff --git a/sql/resource-manager/v2018_06_01_preview/pom.xml b/sql/resource-manager/v2018_06_01_preview/pom.xml index b41478acdd331..c6cb47e892026 100644 --- a/sql/resource-manager/v2018_06_01_preview/pom.xml +++ b/sql/resource-manager/v2018_06_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-sql 1.0.0-beta diff --git a/storage/data-plane/pom.xml b/storage/data-plane/pom.xml index e0001b87c20f3..de02bb38fb1be 100644 --- a/storage/data-plane/pom.xml +++ b/storage/data-plane/pom.xml @@ -8,9 +8,9 @@ 4.0.0 com.azure - azure-client-sdk-parent + azure-data-sdk-parent 1.0.0 - ../../pom.client.xml + ../../pom.data.xml com.microsoft.azure diff --git a/storage/resource-manager/v2016_01_01/pom.xml b/storage/resource-manager/v2016_01_01/pom.xml index 046e2874fc06b..b2517b9f9f7cb 100644 --- a/storage/resource-manager/v2016_01_01/pom.xml +++ b/storage/resource-manager/v2016_01_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-storage 1.0.0-beta diff --git a/storage/resource-manager/v2017_10_01/pom.xml b/storage/resource-manager/v2017_10_01/pom.xml index 873beda01c6f1..ba63619685251 100644 --- a/storage/resource-manager/v2017_10_01/pom.xml +++ b/storage/resource-manager/v2017_10_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-storage 1.0.0-beta diff --git a/storage/resource-manager/v2018_02_01/pom.xml b/storage/resource-manager/v2018_02_01/pom.xml index 880c3c2893038..722c2f28a10ee 100644 --- a/storage/resource-manager/v2018_02_01/pom.xml +++ b/storage/resource-manager/v2018_02_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-storage 1.0.0-beta diff --git a/storage/resource-manager/v2018_03_01_preview/pom.xml b/storage/resource-manager/v2018_03_01_preview/pom.xml index 076435476d25f..44316d8d4c45d 100644 --- a/storage/resource-manager/v2018_03_01_preview/pom.xml +++ b/storage/resource-manager/v2018_03_01_preview/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-storage 1.0.0-beta diff --git a/storage/resource-manager/v2018_07_01/pom.xml b/storage/resource-manager/v2018_07_01/pom.xml index 64e8d44085b0f..684a9fb25f9fe 100644 --- a/storage/resource-manager/v2018_07_01/pom.xml +++ b/storage/resource-manager/v2018_07_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-storage 1.0.0-beta diff --git a/storage/resource-manager/v2018_11_01/pom.xml b/storage/resource-manager/v2018_11_01/pom.xml index 02589a7106bb7..3cb6519e9955b 100644 --- a/storage/resource-manager/v2018_11_01/pom.xml +++ b/storage/resource-manager/v2018_11_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 0.0.3-beta - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-storage 1.0.0-beta diff --git a/storage/resource-manager/v2019_04_01/pom.xml b/storage/resource-manager/v2019_04_01/pom.xml index 199d03aa15bf5..d55be144f4957 100644 --- a/storage/resource-manager/v2019_04_01/pom.xml +++ b/storage/resource-manager/v2019_04_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 0.0.3-beta - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-storage 1.0.0-beta diff --git a/streamanalytics/resource-manager/v2016_03_01/pom.xml b/streamanalytics/resource-manager/v2016_03_01/pom.xml index e7bb05df1ac60..3e869e13d62c8 100644 --- a/streamanalytics/resource-manager/v2016_03_01/pom.xml +++ b/streamanalytics/resource-manager/v2016_03_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.0.0 - ../../../pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-streamanalytics 1.0.0-beta