From d037752f3627bcc7f881b951fe75da76cff79a4e Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 18 Feb 2020 11:52:32 +1100 Subject: [PATCH 01/30] Remove modules from parent. --- pom.client.xml | 2 ++ pom.data.xml | 2 ++ pom.management.xml | 3 +++ 3 files changed, 7 insertions(+) diff --git a/pom.client.xml b/pom.client.xml index 653733fc6be04..4204e6860b9f2 100644 --- a/pom.client.xml +++ b/pom.client.xml @@ -1286,6 +1286,7 @@ + diff --git a/pom.data.xml b/pom.data.xml index 31c31125c5c98..95027a22d9808 100644 --- a/pom.data.xml +++ b/pom.data.xml @@ -602,6 +602,7 @@ + diff --git a/pom.management.xml b/pom.management.xml index 1e92a220ace08..926ca96faa1cf 100644 --- a/pom.management.xml +++ b/pom.management.xml @@ -758,8 +758,11 @@ + From 315ab6116deff3a910fa8e5f8a86dc6a1f5c0923 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 18 Feb 2020 12:05:10 +1100 Subject: [PATCH 02/30] Add specific core modules. --- sdk/core/pom.service.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sdk/core/pom.service.xml b/sdk/core/pom.service.xml index 3a4ec25b5af3e..2d69ad2381e37 100644 --- a/sdk/core/pom.service.xml +++ b/sdk/core/pom.service.xml @@ -9,6 +9,13 @@ pom 1.0.0 - ../../pom.client.xml + azure-core + azure-core-amqp + azure-core-http-netty + azure-core-http-okhttp + azure-core-management + azure-core-test + azure-core-tracing-opentelemetry + azure-perfstress From 84ae1c306e35cad6e8de6310a5dd933b9b28e273 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 18 Feb 2020 12:30:47 +1100 Subject: [PATCH 03/30] Remove management package from list of packages to build. --- sdk/core/pom.service.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/core/pom.service.xml b/sdk/core/pom.service.xml index 2d69ad2381e37..12c8cd51fa6c5 100644 --- a/sdk/core/pom.service.xml +++ b/sdk/core/pom.service.xml @@ -13,7 +13,7 @@ azure-core-amqp azure-core-http-netty azure-core-http-okhttp - azure-core-management + azure-core-test azure-core-tracing-opentelemetry azure-perfstress From e09a991effd3af88934b5d78a8e9b60511276e21 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Wed, 11 Mar 2020 10:07:17 +1100 Subject: [PATCH 04/30] Swap to building against root pom.xml. --- .../templates/jobs/archetype-sdk-client.yml | 2 +- pom.xml | 277 +----------------- sdk/core/{pom.service.xml => pom.xml} | 1 - 3 files changed, 4 insertions(+), 276 deletions(-) rename sdk/core/{pom.service.xml => pom.xml} (94%) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 46922a3c97b62..5bb1b145ef8cc 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -105,7 +105,7 @@ jobs: - task: Maven@3 displayName: 'Build and Package' inputs: - mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml + mavenPomFile: pom.xml goals: 'package' options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dgenerate-overview' # We include template-module so we ensure it always builds in CI mavenOptions: '$(MemoryOptions) $(LoggingOptions)' diff --git a/pom.xml b/pom.xml index 5c2b8aa02dcdc..3e0a54ddfd141 100644 --- a/pom.xml +++ b/pom.xml @@ -4,281 +4,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 com.azure - azure-sdk-all + azure-root-aggregate pom - 1.0.0 - - 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.6.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 - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.1.0 - - - com.azure - sdk-build-tools - 1.0.0 - - - com.puppycrawl.tools - checkstyle - 8.29 - - - - 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-jar-plugin - 3.1.2 - - ${packageOutputDirectory} - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.1.1 - - - attach-javadocs - - jar - - - ${packageOutputDirectory} - - - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - - jar - - - ${packageOutputDirectory} - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.8 - - - copy - package - - - - - - - run - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.0.0 - - - - - - - - java8 - - true - - !java-lts - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - true - true - -Xlint:all - - - - - - - - java-lts - - - java-lts - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 11 - 11 - true - true - -Xlint:all - - - - - - - - - javadoc-no-modules-fix - - [9,) - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.1.1 - - --no-module-directories - - - - - - - - template-module - - - include-template - - - - ./sdk/template/azure-sdk-template - - - - + 1.0.0 - ./pom.client.xml - ./pom.data.xml - ./pom.management.xml + sdk/core diff --git a/sdk/core/pom.service.xml b/sdk/core/pom.xml similarity index 94% rename from sdk/core/pom.service.xml rename to sdk/core/pom.xml index 12c8cd51fa6c5..ca1479fbb5a13 100644 --- a/sdk/core/pom.service.xml +++ b/sdk/core/pom.xml @@ -13,7 +13,6 @@ azure-core-amqp azure-core-http-netty azure-core-http-okhttp - azure-core-test azure-core-tracing-opentelemetry azure-perfstress From 6806b54393f3cf851eed52e0e2b42d950cdc71b4 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Wed, 11 Mar 2020 10:15:20 +1100 Subject: [PATCH 05/30] Removed commented out modules section. --- pom.client.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.client.xml b/pom.client.xml index 4204e6860b9f2..653733fc6be04 100644 --- a/pom.client.xml +++ b/pom.client.xml @@ -1286,7 +1286,6 @@ - From 7d9a579daf29fcc7814635f1e523f37a50dbc4b6 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Wed, 11 Mar 2020 10:25:02 +1100 Subject: [PATCH 06/30] Remove perf stress module from module list. --- sdk/core/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/core/pom.xml b/sdk/core/pom.xml index ca1479fbb5a13..143067b62c4e0 100644 --- a/sdk/core/pom.xml +++ b/sdk/core/pom.xml @@ -15,6 +15,5 @@ azure-core-http-okhttp azure-core-test azure-core-tracing-opentelemetry - azure-perfstress From 422b853d1900013e4ffe48c9ede86c7c9f8b7a87 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Wed, 11 Mar 2020 11:17:45 +1100 Subject: [PATCH 07/30] First attempt at a project list hack. --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 5bb1b145ef8cc..0c8d80178ff68 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -93,6 +93,14 @@ jobs: pip install markdown2 BeautifulSoup4 displayName: 'pip install markdown2 and BeautifulSoup4' + - ${{each artifact in parameters.Artifacts }}: + - pwsh: | + Write-Host "##vso[task.setvariable variable=ProjectList;]$(ProjectList) ${{artifact.groupId}}:${{artifact.name}}" + displayName: Append ${{artifact.name}} to project list + + - script: | + echo Project List: $(ProjectList) + - template: ../steps/cache-maven-repository.yml - template: eng/pipelines/templates/scripts/replace-relative-links.yml@azure-sdk-tools From 47a06c2ff6deece953fe605ef1d474bb64c0641d Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Wed, 11 Mar 2020 11:37:55 +1100 Subject: [PATCH 08/30] COntinue project list hack. --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 0c8d80178ff68..8f3255dbeded4 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -93,6 +93,10 @@ jobs: pip install markdown2 BeautifulSoup4 displayName: 'pip install markdown2 and BeautifulSoup4' + - pwsh: | + Write-Host "##vso[task.setvariable variable=ProjectList;]" + displayName: Establish project list variable + - ${{each artifact in parameters.Artifacts }}: - pwsh: | Write-Host "##vso[task.setvariable variable=ProjectList;]$(ProjectList) ${{artifact.groupId}}:${{artifact.name}}" From eb1a81d0bd1c5d9efd1d16728433140db204efa4 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Wed, 11 Mar 2020 11:47:32 +1100 Subject: [PATCH 09/30] Extract steps into a template. --- .../templates/jobs/archetype-sdk-client.yml | 18 +++++------------- .../templates/steps/generate-project-list.yml | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 eng/pipelines/templates/steps/generate-project-list.yml diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 8f3255dbeded4..a8041e7fb7479 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -93,18 +93,6 @@ jobs: pip install markdown2 BeautifulSoup4 displayName: 'pip install markdown2 and BeautifulSoup4' - - pwsh: | - Write-Host "##vso[task.setvariable variable=ProjectList;]" - displayName: Establish project list variable - - - ${{each artifact in parameters.Artifacts }}: - - pwsh: | - Write-Host "##vso[task.setvariable variable=ProjectList;]$(ProjectList) ${{artifact.groupId}}:${{artifact.name}}" - displayName: Append ${{artifact.name}} to project list - - - script: | - echo Project List: $(ProjectList) - - template: ../steps/cache-maven-repository.yml - template: eng/pipelines/templates/scripts/replace-relative-links.yml@azure-sdk-tools @@ -114,12 +102,16 @@ jobs: BuildSHA: $(Build.SourceVersion) RepoId: 'Azure/azure-sdk-for-java' + - template: ../steps/generate-project-list.yml + parameters: + Artifacts: ${{parameters.Artifacts}} + - task: Maven@3 displayName: 'Build and Package' inputs: mavenPomFile: pom.xml goals: 'package' - options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dgenerate-overview' # We include template-module so we ensure it always builds in CI + options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dgenerate-overview' -pl $(ProjectList) -am -amd # We include template-module so we ensure it always builds in CI mavenOptions: '$(MemoryOptions) $(LoggingOptions)' javaHomeOption: 'JDKVersion' jdkVersionOption: $(JavaVersion) diff --git a/eng/pipelines/templates/steps/generate-project-list.yml b/eng/pipelines/templates/steps/generate-project-list.yml new file mode 100644 index 0000000000000..d0e591e6abf62 --- /dev/null +++ b/eng/pipelines/templates/steps/generate-project-list.yml @@ -0,0 +1,18 @@ +# This job template uses the artifact list in the ci.yml file +# to generate a variable at build time that can be passed into +# the Maven -pl command-line switch to constrain what subset of +# projects are targetted based on the artifacts this pipeline +# produces. The -am and -amd switches are then applied as +# appropriate to constrain the full graph that is built depending +# on whether we are doing a recorded test play back or a full live +# test. + +steps: +- pwsh: | + Write-Host "##vso[task.setvariable variable=ProjectList;]" + displayName: Initialize project list variable + +- ${{each artifact in parameters.Artifacts }}: + - pwsh: | + Write-Host "##vso[task.setvariable variable=ProjectList;]$(ProjectList),${{artifact.groupId}}:${{artifact.name}}" + displayName: Append ${{artifact.groupId}}:${{artifact.name}} to project list \ No newline at end of file From 2b8061fad4d65d95c23ec4cd33e743ac4775444f Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Wed, 11 Mar 2020 11:52:51 +1100 Subject: [PATCH 10/30] Tweak quotes. --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index a8041e7fb7479..cec00e9a7110a 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -111,7 +111,7 @@ jobs: inputs: mavenPomFile: pom.xml goals: 'package' - options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dgenerate-overview' -pl $(ProjectList) -am -amd # We include template-module so we ensure it always builds in CI + options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dgenerate-overview -pl $(ProjectList) -am -amd' # We include template-module so we ensure it always builds in CI mavenOptions: '$(MemoryOptions) $(LoggingOptions)' javaHomeOption: 'JDKVersion' jdkVersionOption: $(JavaVersion) From 06f4d870501121a263e95cba93ffa942dd20d9f2 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Wed, 11 Mar 2020 12:03:44 +1100 Subject: [PATCH 11/30] Changes to make analyze use project list. --- .../templates/jobs/archetype-sdk-client.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index cec00e9a7110a..76b3987656a35 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -159,13 +159,17 @@ jobs: Options: --batch-mode MavenOptions: $(MemoryOptions) $(LoggingOptions) + - template: ../steps/generate-project-list.yml + parameters: + Artifacts: ${{parameters.Artifacts}} + # maven dependency:tree needs to be able to resolve dependencies, so these should be installed. - task: Maven@3 displayName: 'Build and Install' inputs: - mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml + mavenPomFile: pom.xml goals: 'install' - options: '$(DefaultOptions) -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true' + options: '$(DefaultOptions) -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true -pl $(ProjectList) -am' mavenOptions: '$(MemoryOptions) $(LoggingOptions)' javaHomeOption: 'JDKVersion' jdkVersionOption: '1.11' @@ -194,8 +198,8 @@ jobs: - task: Maven@3 displayName: 'Run SpotBugs, Checkstyle, RevApi, and Javadoc' inputs: - mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml - options: '--no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme-windows' + mavenPomFile: pom.xml + options: '--no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme-windows -pl $(ProjectList)' mavenOptions: '$(MemoryOptions)' javaHomeOption: 'JDKVersion' jdkVersionOption: '1.11' From de8a204d741003ee987bc6622359d7016b8a3129 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Wed, 11 Mar 2020 13:02:34 +1100 Subject: [PATCH 12/30] Add project list to test jobs. --- .../templates/jobs/archetype-sdk-client.yml | 51 +++---------------- 1 file changed, 7 insertions(+), 44 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 76b3987656a35..7ee9232c4cce6 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -262,11 +262,15 @@ jobs: condition: and(succeeded(), eq(variables['ShouldRunSourceTests'],'true')) displayName: 'Update versions for source build' + - template: ../steps/generate-project-list.yml + parameters: + Artifacts: ${{parameters.Artifacts}} + - task: Maven@3 displayName: 'Run tests' inputs: - mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml - options: ${{ parameters.TestOptions }} + mavenPomFile: pom.xml + options: ${{ parameters.TestOptions }} -pl $(ProjectList) -am -amd mavenOptions: '$(MemoryOptions) $(LoggingOptions)' javaHomeOption: 'JDKVersion' jdkVersionOption: $(JavaVersion) @@ -281,45 +285,4 @@ jobs: condition: and(always(), or(ne(variables['TestFromSource'],'true'), eq(variables['ShouldRunSourceTests'],'true'))) inputs: mergeTestResults: true - testRunTitle: $(RunTitle) - - # HACK: This has been disabled to unblock releases where aggregate code - # coverage reporting was causing agent timeouts. We've got an issue - # to discuss how to handle aggregate-style reporting across the repo - # but at the moment this isn't going to work: - # - # https://github.com/Azure/azure-sdk-for-java/issues/7271 - # - # # Generate JaCoCo code coverage report on Java 11, Linux builds if the build reason is not PR. - # - task: Maven@3 - # displayName: 'Generate aggregate code coverage report' - # condition: and(eq(variables['OsName'], 'Linux'), eq(variables['JavaVersion'], '1.11'), ne(variables['Build.Reason'], 'PullRequest')) - # inputs: - # # Aggregate reports for non-PR builds will use pom.client.xml and include non-shipping modules - # mavenPomFile: pom.client.xml - # options: '$(DefaultOptions) -Dinclude-non-shipping-modules -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true' - # mavenOptions: '-Xmx3072m $(LoggingOptions)' - # javaHomeOption: 'JDKVersion' - # jdkVersionOption: $(JavaVersion) - # jdkArchitectureOption: 'x64' - # publishJUnitResults: false - # goals: 'verify' - - # # Azure DevOps only seems to respect the last code coverage result published, so only do this for Linux + Java LTS. - # # Code coverage reporting is setup only for Track 2 modules. - # - task: PublishCodeCoverageResults@1 - # condition: and(eq(variables['OsName'], 'Linux'), eq(variables['JavaVersion'], '1.11'), ne(variables['Build.Reason'], 'PullRequest')) - # inputs: - # codeCoverageTool: JaCoCo - # summaryFileLocation: eng/jacoco-test-coverage/target/site/test-coverage/jacoco.xml - # reportDirectory: eng/jacoco-test-coverage/target/site/test-coverage/ - # failIfCoverageEmpty: true - - # # Publish code coverage to an artifact so it can be uploaded to the Maven site. - # # Do this for track 2 modules only. Code coverage from previous step is only published for Linux + Java LTS. - # - task: PublishPipelineArtifact@0 - # displayName: 'Publish coverage artifact' - # condition: and(eq(variables['OsName'], 'Linux'), eq(variables['JavaVersion'], '1.11'), ne(variables['Build.Reason'], 'PullRequest')) - # inputs: - # artifactName: coverage - # targetPath: eng/jacoco-test-coverage/target/site/ + testRunTitle: $(RunTitle) \ No newline at end of file From 5e2245bb2dc4c0243f32280593b5f9596c93b671 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Wed, 11 Mar 2020 13:04:02 +1100 Subject: [PATCH 13/30] Add install step which builds dependencies ahead of running tests. --- .../templates/jobs/archetype-sdk-client.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 7ee9232c4cce6..22c1b78036870 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -266,11 +266,23 @@ jobs: parameters: Artifacts: ${{parameters.Artifacts}} + - task: Maven@3 + displayName: 'Build and Install' + inputs: + mavenPomFile: pom.xml + goals: 'install' + options: '$(DefaultOptions) -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true -pl $(ProjectList) -am' + mavenOptions: '$(MemoryOptions) $(LoggingOptions)' + javaHomeOption: 'JDKVersion' + jdkVersionOption: '1.11' + jdkArchitectureOption: 'x64' + publishJUnitResults: false + - task: Maven@3 displayName: 'Run tests' inputs: mavenPomFile: pom.xml - options: ${{ parameters.TestOptions }} -pl $(ProjectList) -am -amd + options: ${{ parameters.TestOptions }} -pl $(ProjectList) -amd mavenOptions: '$(MemoryOptions) $(LoggingOptions)' javaHomeOption: 'JDKVersion' jdkVersionOption: $(JavaVersion) From cc255ef8ad18030773803f18f1f496160c1db39f Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Wed, 11 Mar 2020 13:05:45 +1100 Subject: [PATCH 14/30] Fix indentation. --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 22c1b78036870..e3971e2bd278f 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -264,7 +264,7 @@ jobs: - template: ../steps/generate-project-list.yml parameters: - Artifacts: ${{parameters.Artifacts}} + Artifacts: ${{parameters.Artifacts}} - task: Maven@3 displayName: 'Build and Install' From 034491e9fbc7139e0880b7af2f0b0f2eed8aa4ad Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Wed, 11 Mar 2020 14:00:11 +1100 Subject: [PATCH 15/30] Bringing identity and appconfiguration into scope. --- pom.xml | 2 ++ sdk/appconfiguration/{pom.service.xml => pom.xml} | 3 +++ sdk/identity/{pom.service.xml => pom.xml} | 3 --- 3 files changed, 5 insertions(+), 3 deletions(-) rename sdk/appconfiguration/{pom.service.xml => pom.xml} (86%) rename sdk/identity/{pom.service.xml => pom.xml} (83%) diff --git a/pom.xml b/pom.xml index 3e0a54ddfd141..2bdb756488281 100644 --- a/pom.xml +++ b/pom.xml @@ -9,5 +9,7 @@ 1.0.0 sdk/core + sdk/identity + sdk/appconfiguration diff --git a/sdk/appconfiguration/pom.service.xml b/sdk/appconfiguration/pom.xml similarity index 86% rename from sdk/appconfiguration/pom.service.xml rename to sdk/appconfiguration/pom.xml index 921cee0628142..9726e7c7e2ee1 100644 --- a/sdk/appconfiguration/pom.service.xml +++ b/sdk/appconfiguration/pom.xml @@ -9,6 +9,7 @@ pom 1.0.0 +<<<<<<< HEAD:sdk/appconfiguration/pom.service.xml ../core/azure-core @@ -16,6 +17,8 @@ ../core/azure-core-http-netty ../core/azure-core-http-okhttp ../identity/azure-identity +======= +>>>>>>> Bringing identity and appconfiguration into scope.:sdk/appconfiguration/pom.xml azure-data-appconfiguration diff --git a/sdk/identity/pom.service.xml b/sdk/identity/pom.xml similarity index 83% rename from sdk/identity/pom.service.xml rename to sdk/identity/pom.xml index c37d14e46a057..b9f57fa47d469 100644 --- a/sdk/identity/pom.service.xml +++ b/sdk/identity/pom.xml @@ -11,9 +11,6 @@ - ../core/azure-core - ../core/azure-core-http-netty - ../core/azure-core-test azure-identity From cec7573da19a4b06abae83f03063b10c6517918c Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Wed, 11 Mar 2020 14:32:22 +1100 Subject: [PATCH 16/30] Pulling all track 1 and track 2 modules into the root POM model. --- pom.xml | 13 +++++ sdk/applicationinsights/pom.xml | 14 +++++ .../{pom.service.xml => pom.xml} | 0 sdk/batch/{pom.service.xml => pom.xml} | 0 .../{pom.service.xml => pom.xml} | 0 sdk/cosmos/{pom.service.xml => pom.xml} | 1 - sdk/eventgrid/{pom.service.xml => pom.xml} | 0 sdk/eventhubs/pom.service.xml | 46 ---------------- sdk/eventhubs/pom.xml | 17 ++++++ sdk/keyvault/pom.service.xml | 52 ------------------- sdk/keyvault/pom.xml | 23 ++++++++ sdk/loganalytics/{pom.service.xml => pom.xml} | 0 .../{pom.service.xml => pom.xml} | 0 sdk/search/{pom.service.xml => pom.xml} | 6 --- sdk/servicebus/pom.service.xml | 42 --------------- sdk/servicebus/pom.xml | 14 +++++ sdk/storage/{pom.service.xml => pom.xml} | 5 -- 17 files changed, 81 insertions(+), 152 deletions(-) create mode 100644 sdk/applicationinsights/pom.xml rename sdk/authorization/{pom.service.xml => pom.xml} (100%) rename sdk/batch/{pom.service.xml => pom.xml} (100%) rename sdk/cognitiveservices/{pom.service.xml => pom.xml} (100%) rename sdk/cosmos/{pom.service.xml => pom.xml} (94%) rename sdk/eventgrid/{pom.service.xml => pom.xml} (100%) delete mode 100644 sdk/eventhubs/pom.service.xml create mode 100644 sdk/eventhubs/pom.xml delete mode 100644 sdk/keyvault/pom.service.xml create mode 100644 sdk/keyvault/pom.xml rename sdk/loganalytics/{pom.service.xml => pom.xml} (100%) rename sdk/mediaservices/{pom.service.xml => pom.xml} (100%) rename sdk/search/{pom.service.xml => pom.xml} (68%) delete mode 100644 sdk/servicebus/pom.service.xml create mode 100644 sdk/servicebus/pom.xml rename sdk/storage/{pom.service.xml => pom.xml} (82%) diff --git a/pom.xml b/pom.xml index 2bdb756488281..55b7364e1183d 100644 --- a/pom.xml +++ b/pom.xml @@ -8,8 +8,21 @@ pom 1.0.0 + common/perf-test-core sdk/core sdk/identity sdk/appconfiguration + sdk/applicationinsights + sdk/authorization + sdk/batch + sdk/cognitiveservices + sdk/cosmos + sdk/eventgrid + sdk/eventhubs + sdk/keyvault + sdk/mediaservices + sdk/search + sdk/servicebus + sdk/storage diff --git a/sdk/applicationinsights/pom.xml b/sdk/applicationinsights/pom.xml new file mode 100644 index 0000000000000..dbb6501612fb2 --- /dev/null +++ b/sdk/applicationinsights/pom.xml @@ -0,0 +1,14 @@ + + + 4.0.0 + com.azure + azure-appconfiguration-service + pom + 1.0.0 + + azure-data-appconfiguration + + diff --git a/sdk/authorization/pom.service.xml b/sdk/authorization/pom.xml similarity index 100% rename from sdk/authorization/pom.service.xml rename to sdk/authorization/pom.xml diff --git a/sdk/batch/pom.service.xml b/sdk/batch/pom.xml similarity index 100% rename from sdk/batch/pom.service.xml rename to sdk/batch/pom.xml diff --git a/sdk/cognitiveservices/pom.service.xml b/sdk/cognitiveservices/pom.xml similarity index 100% rename from sdk/cognitiveservices/pom.service.xml rename to sdk/cognitiveservices/pom.xml diff --git a/sdk/cosmos/pom.service.xml b/sdk/cosmos/pom.xml similarity index 94% rename from sdk/cosmos/pom.service.xml rename to sdk/cosmos/pom.xml index 06d12d53f008c..28d36830a6dae 100644 --- a/sdk/cosmos/pom.service.xml +++ b/sdk/cosmos/pom.xml @@ -9,7 +9,6 @@ pom 1.0.0 - ../core/azure-core azure-cosmos azure-cosmos-benchmark azure-cosmos-examples diff --git a/sdk/eventgrid/pom.service.xml b/sdk/eventgrid/pom.xml similarity index 100% rename from sdk/eventgrid/pom.service.xml rename to sdk/eventgrid/pom.xml diff --git a/sdk/eventhubs/pom.service.xml b/sdk/eventhubs/pom.service.xml deleted file mode 100644 index 13f62f3717377..0000000000000 --- a/sdk/eventhubs/pom.service.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 4.0.0 - com.azure - azure-eventhubs-service - pom - 1.0.0 - - - data - - - env.SDKTYPE - data - - - - microsoft-azure-eventhubs - microsoft-azure-eventhubs-eph - microsoft-azure-eventhubs-extensions - - - - client - - - env.SDKTYPE - !data - - - - ../core/azure-core - ../core/azure-core-test - ../core/azure-core-http-netty - ../identity/azure-identity - ../core/azure-core-amqp - ../storage/azure-storage-common - ../storage/azure-storage-blob - azure-messaging-eventhubs - azure-messaging-eventhubs-checkpointstore-blob - - - - diff --git a/sdk/eventhubs/pom.xml b/sdk/eventhubs/pom.xml new file mode 100644 index 0000000000000..1fa460214c9a6 --- /dev/null +++ b/sdk/eventhubs/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + com.azure + azure-eventhubs-service + pom + 1.0.0 + + microsoft-azure-eventhubs + microsoft-azure-eventhubs-eph + microsoft-azure-eventhubs-extensions + azure-messaging-eventhubs + azure-messaging-eventhubs-checkpointstore-blob + + diff --git a/sdk/keyvault/pom.service.xml b/sdk/keyvault/pom.service.xml deleted file mode 100644 index 43c5f66b4562f..0000000000000 --- a/sdk/keyvault/pom.service.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - 4.0.0 - com.azure - azure-keyvault-service - pom - - 1.0.0 - - - data - - - env.SDKTYPE - data - - - - microsoft-azure-keyvault - microsoft-azure-keyvault-complete - microsoft-azure-keyvault-core - microsoft-azure-keyvault-cryptography - microsoft-azure-keyvault-extensions - microsoft-azure-keyvault-test - microsoft-azure-keyvault-webkey - - - - client - - - env.SDKTYPE - !data - - - - - ../core/azure-core - ../core/azure-core-test - ../core/azure-core-http-netty - ../core/azure-core-http-okhttp - ../identity/azure-identity - azure-security-keyvault-certificates - azure-security-keyvault-keys - azure-security-keyvault-secrets - - - - diff --git a/sdk/keyvault/pom.xml b/sdk/keyvault/pom.xml new file mode 100644 index 0000000000000..76c6b3ec95911 --- /dev/null +++ b/sdk/keyvault/pom.xml @@ -0,0 +1,23 @@ + + + 4.0.0 + com.azure + azure-keyvault-service + pom + + 1.0.0 + + microsoft-azure-keyvault + microsoft-azure-keyvault-complete + microsoft-azure-keyvault-core + microsoft-azure-keyvault-cryptography + microsoft-azure-keyvault-extensions + microsoft-azure-keyvault-test + microsoft-azure-keyvault-webkey + azure-security-keyvault-certificates + azure-security-keyvault-keys + azure-security-keyvault-secrets + + diff --git a/sdk/loganalytics/pom.service.xml b/sdk/loganalytics/pom.xml similarity index 100% rename from sdk/loganalytics/pom.service.xml rename to sdk/loganalytics/pom.xml diff --git a/sdk/mediaservices/pom.service.xml b/sdk/mediaservices/pom.xml similarity index 100% rename from sdk/mediaservices/pom.service.xml rename to sdk/mediaservices/pom.xml diff --git a/sdk/search/pom.service.xml b/sdk/search/pom.xml similarity index 68% rename from sdk/search/pom.service.xml rename to sdk/search/pom.xml index 085abd47628de..1b3d5f98f1273 100644 --- a/sdk/search/pom.service.xml +++ b/sdk/search/pom.xml @@ -9,12 +9,6 @@ pom 1.0.0 - ../core/azure-core - ../core/azure-core-test - ../core/azure-core-http-netty - ../identity/azure-identity - ../storage/azure-storage-common - ../storage/azure-storage-blob azure-search diff --git a/sdk/servicebus/pom.service.xml b/sdk/servicebus/pom.service.xml deleted file mode 100644 index 8fc7725b41841..0000000000000 --- a/sdk/servicebus/pom.service.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - com.azure - azure-servicebus-service - pom - 1.0.0 - - - data - - - env.SDKTYPE - data - - - - microsoft-azure-servicebus - - - - client - - - env.SDKTYPE - !data - - - - ../core/azure-core - ../core/azure-core-amqp - ../core/azure-core-http-netty - ../core/azure-core-test - ../identity/azure-identity - azure-messaging-servicebus - - - - diff --git a/sdk/servicebus/pom.xml b/sdk/servicebus/pom.xml new file mode 100644 index 0000000000000..3e8b922255978 --- /dev/null +++ b/sdk/servicebus/pom.xml @@ -0,0 +1,14 @@ + + + 4.0.0 + com.azure + azure-servicebus-service + pom + 1.0.0 + + microsoft-azure-servicebus + azure-messaging-servicebus + + diff --git a/sdk/storage/pom.service.xml b/sdk/storage/pom.xml similarity index 82% rename from sdk/storage/pom.service.xml rename to sdk/storage/pom.xml index 375257dbaa287..291c6460c8693 100644 --- a/sdk/storage/pom.service.xml +++ b/sdk/storage/pom.xml @@ -12,11 +12,6 @@ - ../../common/perf-test-core - ../core/azure-core - ../core/azure-core-test - ../core/azure-core-http-netty - ../identity/azure-identity azure-storage-common azure-storage-blob azure-storage-blob-batch From 7bb0d389311076bf85db9a4c79bc8122e0795466 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Thu, 12 Mar 2020 13:17:52 +1100 Subject: [PATCH 17/30] Removed appinsights dir from root POM. --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 55b7364e1183d..e3248c04cd2fe 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,6 @@ sdk/core sdk/identity sdk/appconfiguration - sdk/applicationinsights sdk/authorization sdk/batch sdk/cognitiveservices From 47629980635d757087b6c332940844eeefdd30e2 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Thu, 12 Mar 2020 14:01:59 +1100 Subject: [PATCH 18/30] Tweaks to data plane template. --- .../templates/jobs/archetype-sdk-data.yml | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-data.yml b/eng/pipelines/templates/jobs/archetype-sdk-data.yml index ffc60a79525c1..39ab708e5b3c2 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-data.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-data.yml @@ -90,12 +90,16 @@ jobs: BuildSHA: $(Build.SourceVersion) RepoId: 'Azure/azure-sdk-for-java' + - template: ../steps/generate-project-list.yml + parameters: + Artifacts: ${{parameters.Artifacts}} + - task: Maven@3 displayName: 'Build and Package' inputs: - mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml + mavenPomFile: pom.xml goals: 'package' - options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dgenerate-overview' # We include template-module so we ensure it always builds in CI + options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dgenerate-overview -pl $(ProjectList) -am -amd' # We include template-module so we ensure it always builds in CI mavenOptions: '$(MemoryOptions) $(LoggingOptions)' javaHomeOption: 'JDKVersion' jdkVersionOption: $(JavaVersion) @@ -150,11 +154,15 @@ jobs: Options: --batch-mode MavenOptions: $(MemoryOptions) $(LoggingOptions) + - template: ../steps/generate-project-list.yml + parameters: + Artifacts: ${{parameters.Artifacts}} + - task: Maven@3 displayName: 'Install Module and Run SpotBugs, Checkstyle, RevApi, and Javadoc' inputs: - mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml - options: '--no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme' + mavenPomFile: pom.xml + options: '--no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme -pl $(ProjectList) -am' mavenOptions: '$(MemoryOptions)' javaHomeOption: 'JDKVersion' jdkVersionOption: '1.11' @@ -186,6 +194,10 @@ jobs: Options: --batch-mode MavenOptions: $(MemoryOptions) $(LoggingOptions) + - template: ../steps/generate-project-list.yml + parameters: + Artifacts: ${{parameters.Artifacts}} + - task: Maven@3 displayName: 'Start Jetty' condition: succeeded() @@ -204,8 +216,8 @@ jobs: - task: Maven@3 displayName: 'Run tests' inputs: - mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml - options: ${{ parameters.TestOptions }} + mavenPomFile: pom.xml + options: ${{ parameters.TestOptions }} -pl $(ProjectList) -am mavenOptions: '$(MemoryOptions) $(LoggingOptions)' javaHomeOption: 'JDKVersion' jdkVersionOption: $(JavaVersion) From eff4e5a9f1dec13b6bec613d3cb6a16070db6a33 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Fri, 13 Mar 2020 11:31:35 +1100 Subject: [PATCH 19/30] Try adding azure-storage-perf to artifact list. --- sdk/storage/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml index 7c3cb207ac6e6..a96a4f22d4683 100644 --- a/sdk/storage/ci.yml +++ b/sdk/storage/ci.yml @@ -65,3 +65,6 @@ stages: - name: azure-storage-queue groupId: com.azure safeName: azurestoragequeue + - name: azure-storage-perf + groupId: com.azure + safeName: azurestorageperf From 2f3747add318ad036ae785ee7c930e849e220b8b Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Fri, 13 Mar 2020 12:01:11 +1100 Subject: [PATCH 20/30] Make perf core a dependency of blob (HACK!). --- sdk/storage/azure-storage-blob/pom.xml | 7 ++++++- sdk/storage/ci.yml | 3 --- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml index 28b114457bb5c..0e017e375703f 100644 --- a/sdk/storage/azure-storage-blob/pom.xml +++ b/sdk/storage/azure-storage-blob/pom.xml @@ -77,13 +77,18 @@ 3.0.2 provided - com.azure azure-core-test 1.1.0 test + + com.azure + perf-test-core + 1.0.0-beta.1 + test + com.azure azure-core-http-netty diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml index a96a4f22d4683..7c3cb207ac6e6 100644 --- a/sdk/storage/ci.yml +++ b/sdk/storage/ci.yml @@ -65,6 +65,3 @@ stages: - name: azure-storage-queue groupId: com.azure safeName: azurestoragequeue - - name: azure-storage-perf - groupId: com.azure - safeName: azurestorageperf From d103219d55997da1edd74f9a1c3e2bcb118fb8cf Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Fri, 13 Mar 2020 12:59:35 +1100 Subject: [PATCH 21/30] Added dependency tags to perf-test-core and moved to storage common. --- sdk/storage/azure-storage-blob/pom.xml | 6 ------ sdk/storage/azure-storage-common/pom.xml | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml index 0e017e375703f..1556c9916c210 100644 --- a/sdk/storage/azure-storage-blob/pom.xml +++ b/sdk/storage/azure-storage-blob/pom.xml @@ -83,12 +83,6 @@ 1.1.0 test - - com.azure - perf-test-core - 1.0.0-beta.1 - test - com.azure azure-core-http-netty diff --git a/sdk/storage/azure-storage-common/pom.xml b/sdk/storage/azure-storage-common/pom.xml index 666d176d7832a..bcf708ff640b4 100644 --- a/sdk/storage/azure-storage-common/pom.xml +++ b/sdk/storage/azure-storage-common/pom.xml @@ -70,6 +70,12 @@ 1.1.0 test + + com.azure + perf-test-core + 1.0.0-beta.1 + test + com.azure azure-identity From 2670b8b50664aac4c2835942d74475b7ae6bd4c5 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Fri, 13 Mar 2020 14:12:49 +1100 Subject: [PATCH 22/30] HACK: Adding storage blob as a test dependency of azure-messaging-eventhubs. --- sdk/eventhubs/azure-messaging-eventhubs/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml index be5394c2dc35d..d167279924837 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml @@ -58,6 +58,12 @@ 1.1.0 test + + com.azure + azure-storage-blob + 12.4.0 + test + org.junit.jupiter junit-jupiter-api From 3599c95a6464689f4451790f2e85fa7e371ca213 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Fri, 13 Mar 2020 14:31:31 +1100 Subject: [PATCH 23/30] Fix version. --- sdk/eventhubs/azure-messaging-eventhubs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml index d167279924837..aad3b768f6a28 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml @@ -61,7 +61,7 @@ com.azure azure-storage-blob - 12.4.0 + 12.5.0 test From 91195a16e2b3296a81469b9df317bd8a706739ef Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Mon, 16 Mar 2020 13:28:44 +1100 Subject: [PATCH 24/30] Fix log analytics build. --- pom.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index e3248c04cd2fe..4e79991cb409e 100644 --- a/pom.xml +++ b/pom.xml @@ -8,18 +8,19 @@ pom 1.0.0 - common/perf-test-core - sdk/core - sdk/identity sdk/appconfiguration sdk/authorization sdk/batch - sdk/cognitiveservices + sdk/core sdk/cosmos + sdk/cognitiveservices sdk/eventgrid sdk/eventhubs + sdk/identity sdk/keyvault + sdk/loganalytics sdk/mediaservices + common/perf-test-core sdk/search sdk/servicebus sdk/storage From a2c0aea014cbad1dc993be3c9be9a7cb55b8d7ed Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 17 Mar 2020 14:27:12 +1100 Subject: [PATCH 25/30] Remove -amd switch. --- .../templates/jobs/archetype-sdk-client.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index e3971e2bd278f..f16a397054a83 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -266,23 +266,11 @@ jobs: parameters: Artifacts: ${{parameters.Artifacts}} - - task: Maven@3 - displayName: 'Build and Install' - inputs: - mavenPomFile: pom.xml - goals: 'install' - options: '$(DefaultOptions) -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true -pl $(ProjectList) -am' - mavenOptions: '$(MemoryOptions) $(LoggingOptions)' - javaHomeOption: 'JDKVersion' - jdkVersionOption: '1.11' - jdkArchitectureOption: 'x64' - publishJUnitResults: false - - task: Maven@3 displayName: 'Run tests' inputs: mavenPomFile: pom.xml - options: ${{ parameters.TestOptions }} -pl $(ProjectList) -amd + options: ${{ parameters.TestOptions }} -pl $(ProjectList) -am mavenOptions: '$(MemoryOptions) $(LoggingOptions)' javaHomeOption: 'JDKVersion' jdkVersionOption: $(JavaVersion) From 6705c09e5698da64516804e66afa1a569894fb9e Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 17 Mar 2020 14:27:49 +1100 Subject: [PATCH 26/30] Extra -amd switch removal. --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index f16a397054a83..14ba7650730e4 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -111,7 +111,7 @@ jobs: inputs: mavenPomFile: pom.xml goals: 'package' - options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dgenerate-overview -pl $(ProjectList) -am -amd' # We include template-module so we ensure it always builds in CI + options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dgenerate-overview -pl $(ProjectList) -am' # We include template-module so we ensure it always builds in CI mavenOptions: '$(MemoryOptions) $(LoggingOptions)' javaHomeOption: 'JDKVersion' jdkVersionOption: $(JavaVersion) From 5a1c586cd6453e3c523443f61d2a0c31b24dea20 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 17 Mar 2020 17:29:44 +1100 Subject: [PATCH 27/30] Removed CG manifest creation. Default behavior should work. --- .../templates/jobs/archetype-sdk-client.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 14ba7650730e4..24bc4fbf54b50 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -176,19 +176,6 @@ jobs: jdkArchitectureOption: 'x64' publishJUnitResults: false - - pwsh: | - if ("${{parameters.SDKType}}" -ieq "client") { - $excludes = "^(microsoft|mgmt)" - } else { - $excludes = "^(azure|mgmt)" - } - - $directory = "$(Build.SourcesDirectory)/sdk/${{parameters.ServiceDirectory}}" - - Write-Host "Directory: '$directory'. Excludes: '$excludes'" - $(Build.SourcesDirectory)/eng/Set-ComponentRegistrations.ps1 $directory -ExcludeRegex $excludes -Verbose - displayName: 'Generate cgmanifest.json' - - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 # ComponentGovernance is currently unable to run on pull requests of public projects. Running on non-PR # builds should be sufficient. From 66b1d52fbf61e33ecb42ed8b5d483a28d9b58cf7 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Wed, 18 Mar 2020 11:06:20 +1100 Subject: [PATCH 28/30] Tweak test template for Cosmos. --- eng/pipelines/templates/jobs/archetype-sdk-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml index 2a47c53997383..57ff485803991 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml @@ -92,7 +92,7 @@ jobs: - task: Maven@3 displayName: $(DisplayName) inputs: - mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.service.xml + mavenPomFile: sdk/${{parameters.ServiceDirectory}}/pom.xml ${{ insert }}: ${{ parameters.TestStepMavenInputs }} env: ${{ parameters.EnvVars }} From 686baeeb46de1883c9869b3b773cd379a5ff1de7 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Wed, 18 Mar 2020 11:26:48 +1100 Subject: [PATCH 29/30] Fix up app config. --- sdk/appconfiguration/pom.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sdk/appconfiguration/pom.xml b/sdk/appconfiguration/pom.xml index 9726e7c7e2ee1..dbb6501612fb2 100644 --- a/sdk/appconfiguration/pom.xml +++ b/sdk/appconfiguration/pom.xml @@ -9,16 +9,6 @@ pom 1.0.0 -<<<<<<< HEAD:sdk/appconfiguration/pom.service.xml - - ../core/azure-core - ../core/azure-core-test - ../core/azure-core-http-netty - ../core/azure-core-http-okhttp - ../identity/azure-identity -======= ->>>>>>> Bringing identity and appconfiguration into scope.:sdk/appconfiguration/pom.xml azure-data-appconfiguration From 42aeeb349d0a62f5db36ddb3ba4cdb86a5351657 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Thu, 19 Mar 2020 11:51:37 +1100 Subject: [PATCH 30/30] Respond to PR feedback. --- eng/pipelines/templates/steps/generate-project-list.yml | 2 +- pom.data.xml | 3 --- pom.xml | 2 +- sdk/eventhubs/azure-messaging-eventhubs/pom.xml | 6 ------ sdk/search/pom.xml | 2 +- sdk/storage/azure-storage-common/pom.xml | 6 ------ 6 files changed, 3 insertions(+), 18 deletions(-) diff --git a/eng/pipelines/templates/steps/generate-project-list.yml b/eng/pipelines/templates/steps/generate-project-list.yml index d0e591e6abf62..a015c38a9acfd 100644 --- a/eng/pipelines/templates/steps/generate-project-list.yml +++ b/eng/pipelines/templates/steps/generate-project-list.yml @@ -15,4 +15,4 @@ steps: - ${{each artifact in parameters.Artifacts }}: - pwsh: | Write-Host "##vso[task.setvariable variable=ProjectList;]$(ProjectList),${{artifact.groupId}}:${{artifact.name}}" - displayName: Append ${{artifact.groupId}}:${{artifact.name}} to project list \ No newline at end of file + displayName: Append ${{artifact.groupId}}:${{artifact.name}} to project list diff --git a/pom.data.xml b/pom.data.xml index 95027a22d9808..8c0ea8fd7b3de 100644 --- a/pom.data.xml +++ b/pom.data.xml @@ -601,8 +601,6 @@ - - diff --git a/pom.xml b/pom.xml index 4e79991cb409e..6994a083a0c1e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 com.azure - azure-root-aggregate + azure-sdk-all pom 1.0.0 diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml index aad3b768f6a28..be5394c2dc35d 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml @@ -58,12 +58,6 @@ 1.1.0 test - - com.azure - azure-storage-blob - 12.5.0 - test - org.junit.jupiter junit-jupiter-api diff --git a/sdk/search/pom.xml b/sdk/search/pom.xml index 1b3d5f98f1273..e92814367ba63 100644 --- a/sdk/search/pom.xml +++ b/sdk/search/pom.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.azure - azure-search-service-parent + azure-search-service pom 1.0.0 diff --git a/sdk/storage/azure-storage-common/pom.xml b/sdk/storage/azure-storage-common/pom.xml index bcf708ff640b4..666d176d7832a 100644 --- a/sdk/storage/azure-storage-common/pom.xml +++ b/sdk/storage/azure-storage-common/pom.xml @@ -70,12 +70,6 @@ 1.1.0 test - - com.azure - perf-test-core - 1.0.0-beta.1 - test - com.azure azure-identity