From f800ba62fa662cdb1d23adb2e7286ac2c0c4c8a3 Mon Sep 17 00:00:00 2001 From: Brandon Siegel Date: Fri, 8 Mar 2019 15:42:38 -0800 Subject: [PATCH 1/2] Run dependency checker during Analyze --- .azure-pipelines/client.yml | 18 ++++++++++++++++++ dependencies.json | 6 ++++++ 2 files changed, 24 insertions(+) create mode 100644 dependencies.json diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml index 38ec73c6980b..7b19493c55b4 100644 --- a/.azure-pipelines/client.yml +++ b/.azure-pipelines/client.yml @@ -95,10 +95,28 @@ jobs: publishJUnitResults: false goals: 'site:site site:stage' + - script: | + git clone https://github.com/JonathanGiles/DependencyChecker.git + mkdir input && cp dependencies.json input/ + displayName: 'Download dependency checker' + + - task: Maven@3 + displayName: 'Analyze dependencies' + inputs: + mavenPomFile: 'DependencyChecker/pom.xml' + options: '-Dexec.args="-showall"' + mavenOptions: '$(LoggingOptions)' + javaHomeOption: 'JDKVersion' + jdkVersionOption: '1.11' + jdkArchitectureOption: 'x64' + publishJUnitResults: false + goals: 'clean package exec:java' + - powershell: | copy -r target/staging $(Build.ArtifactStagingDirectory) copy eng/code-quality-reports/src/main/resources/index.html $(Build.ArtifactStagingDirectory) copy eng/spotbugs-aggregate-report/target/spotbugs/spotbugsXml.html (Join-Path $(Build.ArtifactStagingDirectory) "staging") + copy output/dependencies.html (Join-Path $(Build.ArtifactStagingDirectory) "staging") displayName: 'Copy reports to artifact staging' - task: PublishBuildArtifacts@1 diff --git a/dependencies.json b/dependencies.json new file mode 100644 index 000000000000..69e4ee727541 --- /dev/null +++ b/dependencies.json @@ -0,0 +1,6 @@ +[ + { + "projectName": "azure-sdk-for-java", + "pomUrls": ["file:./pom.client.xml"] + } +] From 80f033c7876536dde9811ca3d455f34b665be578 Mon Sep 17 00:00:00 2001 From: Brandon Siegel Date: Fri, 8 Mar 2019 16:38:12 -0800 Subject: [PATCH 2/2] Add docs links --- README.md | 2 +- eng/code-quality-reports/src/main/resources/index.html | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 77843d2dfe5d..27b268ef33da 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ | Component | Build Status | | --------- | ------------ | | Management Libraries | [![Build Status](https://travis-ci.org/Azure/azure-sdk-for-java.svg?branch=master)](https://travis-ci.org/Azure/azure-sdk-for-java) | -| Client Libraries | [![Build Status](https://dev.azure.com/azure-sdk/public/_apis/build/status/17?branchName=master)](https://dev.azure.com/azure-sdk/public/_build/latest?definitionId=17) | +| Client Libraries | [![Build Status](https://dev.azure.com/azure-sdk/public/_apis/build/status/17?branchName=master)](https://dev.azure.com/azure-sdk/public/_build/latest?definitionId=17)
[![Build Documentation](https://img.shields.io/badge/documentation-published-blue.svg)](https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java/index.html)| :+1: [Try Azure for FREE](http://go.microsoft.com/fwlink/?LinkId=330212) diff --git a/eng/code-quality-reports/src/main/resources/index.html b/eng/code-quality-reports/src/main/resources/index.html index e5c073f6edc9..31670352ad7c 100644 --- a/eng/code-quality-reports/src/main/resources/index.html +++ b/eng/code-quality-reports/src/main/resources/index.html @@ -499,6 +499,10 @@

Azure Java SDK

Maven Site +
  • + + Dependencies +
  • SpotBugs (Aggregate)