diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c083345..9ea018b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,12 +1,16 @@
+
strategy:
matrix:
- linux:
+ Linux:
imageName: 'ubuntu-latest'
- mac:
+ macOS:
imageName: 'macOS-latest'
- windows:
+ Windows:
imageName: 'windows-latest'
+trigger:
+- master
+
pool:
vmImage: $(imageName)
@@ -57,4 +61,6 @@ steps:
publishJUnitResults: true
testResultsFiles: '**/surefire-reports/TEST-*.xml'
findBugsRunAnalysis: true
-
\ No newline at end of file
+
+- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+ displayName: 'Component Detection'
\ No newline at end of file
diff --git a/sdk/pom.xml b/sdk/pom.xml
index 789aa72..9413002 100644
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.microsoft.store
partnercenter-samples
- 1.14.1
+ 1.15.2
jar
Samples
http://maven.apache.org
@@ -14,7 +14,7 @@
com.microsoft.store
partnercenter
- 1.14.1
+ 1.15.2
diff --git a/sdk/src/main/java/com/microsoft/store/partnercenter/samples/Program.java b/sdk/src/main/java/com/microsoft/store/partnercenter/samples/Program.java
index fda6a62..4f8f036 100644
--- a/sdk/src/main/java/com/microsoft/store/partnercenter/samples/Program.java
+++ b/sdk/src/main/java/com/microsoft/store/partnercenter/samples/Program.java
@@ -121,7 +121,6 @@ import com.microsoft.store.partnercenter.samples.ratecards.GetAzureRateCard;
import com.microsoft.store.partnercenter.samples.ratecards.GetAzureSharedRateCard;
import com.microsoft.store.partnercenter.samples.ratedusage.GetCustomerSubscriptionsUsage;
import com.microsoft.store.partnercenter.samples.ratedusage.GetCustomerUsageSummary;
-import com.microsoft.store.partnercenter.samples.ratedusage.GetSubscriptionResourceUsage;
import com.microsoft.store.partnercenter.samples.ratedusage.GetSubscriptionUsageRecords;
import com.microsoft.store.partnercenter.samples.ratedusage.GetSubscriptionUsageSummary;
import com.microsoft.store.partnercenter.samples.serviceincidents.GetServiceIncidents;
@@ -295,7 +294,6 @@ public class Program
ratedUsageScenarios.add( new GetCustomerUsageSummary( context ) );
ratedUsageScenarios.add( new GetCustomerSubscriptionsUsage( context ) );
- ratedUsageScenarios.add( new GetSubscriptionResourceUsage( context ) );
ratedUsageScenarios.add( new GetSubscriptionUsageRecords( context ) );
ratedUsageScenarios.add( new GetSubscriptionUsageSummary( context ) );
diff --git a/sdk/src/main/java/com/microsoft/store/partnercenter/samples/ratedusage/GetSubscriptionResourceUsage.java b/sdk/src/main/java/com/microsoft/store/partnercenter/samples/ratedusage/GetSubscriptionResourceUsage.java
deleted file mode 100644
index fc3fba5..0000000
--- a/sdk/src/main/java/com/microsoft/store/partnercenter/samples/ratedusage/GetSubscriptionResourceUsage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-//-----------------------------------------------------------------------
-//
-// Copyright (c) Microsoft Corporation. All rights reserved.
-//
-//-----------------------------------------------------------------------
-
-package com.microsoft.store.partnercenter.samples.ratedusage;
-
-import com.microsoft.store.partnercenter.IAggregatePartner;
-import com.microsoft.store.partnercenter.models.ResourceCollection;
-import com.microsoft.store.partnercenter.models.usage.AzureResourceMonthlyUsageRecord;
-import com.microsoft.store.partnercenter.samples.BasePartnerScenario;
-import com.microsoft.store.partnercenter.samples.IScenarioContext;
-
-/**
-* Gets a single customer details.
-*/
-public class GetSubscriptionResourceUsage
- extends BasePartnerScenario
-{
- /**
- * Initializes a new instance of the {@link #GetSubscriptionResourceUsage} class.
- *
- * @param context The scenario context.
- */
- public GetSubscriptionResourceUsage( IScenarioContext context )
- {
- super( "Get subscription resource usage", context );
- }
-
- /**
- * Executes the get customer details scenario.
- */
- @Override
- protected void runScenario()
- {
- String customerId = this.obtainCustomerIdForUsage( "Enter the ID of the customer to retrieve" );
- String subscriptionId = this.obtainSubscriptionIdForUsage( customerId, "Enter the ID of the subscription with usage" );
- IAggregatePartner partnerOperations = this.getContext().getUserPartnerOperations();
- this.getContext().getConsoleHelper().startProgress( "Retrieving customer" );
- ResourceCollection usageRecords =
- partnerOperations.getCustomers().byId( customerId ).getSubscriptions().byId( subscriptionId ).getUsageRecords().getResources().get();
- this.getContext().getConsoleHelper().stopProgress();
- this.getContext().getConsoleHelper().writeObject( usageRecords, "Subscription resource usage records" );
- System.out.println( "Demonstrate iterating over the resources." );
- this.getContext().getConsoleHelper().writeObject( usageRecords.getTotalCount(), "Quantity" );
- for( AzureResourceMonthlyUsageRecord usageRecord : usageRecords.getItems() )
- {
- System.out.println();
- System.out.println( "Id: " + usageRecord.getResourceId() );
- System.out.println( "Name: " + usageRecord.getResourceName() );
- System.out.println( "Category: " + usageRecord.getCategory());
- System.out.println( "QuantityUsed: " + usageRecord.getQuantityUsed() );
- System.out.println( "Unit: " + usageRecord.getUnit());
- System.out.println( "TotalCost" + usageRecord.getTotalCost() );
- }
- }
-
-}
diff --git a/secure-app-model/keyvault/cpvsample/pom.xml b/secure-app-model/keyvault/cpvsample/pom.xml
index 67a8301..bf78338 100644
--- a/secure-app-model/keyvault/cpvsample/pom.xml
+++ b/secure-app-model/keyvault/cpvsample/pom.xml
@@ -24,7 +24,7 @@
com.microsoft.azure
azure-keyvault
- 1.1.2
+ 1.2.2
com.microsoft.graph
diff --git a/secure-app-model/keyvault/cspsample/pom.xml b/secure-app-model/keyvault/cspsample/pom.xml
index 5fd13f6..50e6df8 100644
--- a/secure-app-model/keyvault/cspsample/pom.xml
+++ b/secure-app-model/keyvault/cspsample/pom.xml
@@ -24,7 +24,7 @@
com.microsoft.azure
azure-keyvault
- 1.1.2
+ 1.2.2
com.microsoft.graph
diff --git a/secure-app-model/keyvault/partnerconsent/pom.xml b/secure-app-model/keyvault/partnerconsent/pom.xml
index 4fe94d8..3a2b2b2 100644
--- a/secure-app-model/keyvault/partnerconsent/pom.xml
+++ b/secure-app-model/keyvault/partnerconsent/pom.xml
@@ -15,7 +15,7 @@
com.microsoft.azure
adal4j
- 1.6.2
+ 1.6.4
com.nimbusds
@@ -31,12 +31,12 @@
org.slf4j
slf4j-log4j12
- 1.7.5
+ 1.7.30
com.microsoft.azure
azure-keyvault
- 1.1.2
+ 1.2.2
org.springframework