Updating the version for a number of dependencies (#24)
This commit is contained in:
Родитель
0dae25a0a9
Коммит
56e90b816b
|
@ -1,12 +1,16 @@
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
linux:
|
Linux:
|
||||||
imageName: 'ubuntu-latest'
|
imageName: 'ubuntu-latest'
|
||||||
mac:
|
macOS:
|
||||||
imageName: 'macOS-latest'
|
imageName: 'macOS-latest'
|
||||||
windows:
|
Windows:
|
||||||
imageName: 'windows-latest'
|
imageName: 'windows-latest'
|
||||||
|
|
||||||
|
trigger:
|
||||||
|
- master
|
||||||
|
|
||||||
pool:
|
pool:
|
||||||
vmImage: $(imageName)
|
vmImage: $(imageName)
|
||||||
|
|
||||||
|
@ -57,4 +61,6 @@ steps:
|
||||||
publishJUnitResults: true
|
publishJUnitResults: true
|
||||||
testResultsFiles: '**/surefire-reports/TEST-*.xml'
|
testResultsFiles: '**/surefire-reports/TEST-*.xml'
|
||||||
findBugsRunAnalysis: true
|
findBugsRunAnalysis: true
|
||||||
|
|
||||||
|
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
|
||||||
|
displayName: 'Component Detection'
|
|
@ -3,7 +3,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>com.microsoft.store</groupId>
|
<groupId>com.microsoft.store</groupId>
|
||||||
<artifactId>partnercenter-samples</artifactId>
|
<artifactId>partnercenter-samples</artifactId>
|
||||||
<version>1.14.1</version>
|
<version>1.15.2</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<name>Samples</name>
|
<name>Samples</name>
|
||||||
<url>http://maven.apache.org</url>
|
<url>http://maven.apache.org</url>
|
||||||
|
@ -14,7 +14,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.microsoft.store</groupId>
|
<groupId>com.microsoft.store</groupId>
|
||||||
<artifactId>partnercenter</artifactId>
|
<artifactId>partnercenter</artifactId>
|
||||||
<version>1.14.1</version>
|
<version>1.15.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<build>
|
<build>
|
||||||
|
|
|
@ -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.ratecards.GetAzureSharedRateCard;
|
||||||
import com.microsoft.store.partnercenter.samples.ratedusage.GetCustomerSubscriptionsUsage;
|
import com.microsoft.store.partnercenter.samples.ratedusage.GetCustomerSubscriptionsUsage;
|
||||||
import com.microsoft.store.partnercenter.samples.ratedusage.GetCustomerUsageSummary;
|
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.GetSubscriptionUsageRecords;
|
||||||
import com.microsoft.store.partnercenter.samples.ratedusage.GetSubscriptionUsageSummary;
|
import com.microsoft.store.partnercenter.samples.ratedusage.GetSubscriptionUsageSummary;
|
||||||
import com.microsoft.store.partnercenter.samples.serviceincidents.GetServiceIncidents;
|
import com.microsoft.store.partnercenter.samples.serviceincidents.GetServiceIncidents;
|
||||||
|
@ -295,7 +294,6 @@ public class Program
|
||||||
|
|
||||||
ratedUsageScenarios.add( new GetCustomerUsageSummary( context ) );
|
ratedUsageScenarios.add( new GetCustomerUsageSummary( context ) );
|
||||||
ratedUsageScenarios.add( new GetCustomerSubscriptionsUsage( context ) );
|
ratedUsageScenarios.add( new GetCustomerSubscriptionsUsage( context ) );
|
||||||
ratedUsageScenarios.add( new GetSubscriptionResourceUsage( context ) );
|
|
||||||
ratedUsageScenarios.add( new GetSubscriptionUsageRecords( context ) );
|
ratedUsageScenarios.add( new GetSubscriptionUsageRecords( context ) );
|
||||||
ratedUsageScenarios.add( new GetSubscriptionUsageSummary( context ) );
|
ratedUsageScenarios.add( new GetSubscriptionUsageSummary( context ) );
|
||||||
|
|
||||||
|
|
|
@ -1,59 +0,0 @@
|
||||||
//-----------------------------------------------------------------------
|
|
||||||
//<copyright file="GetSubscriptionResourceUsage.java" company="Microsoft">
|
|
||||||
// Copyright (c) Microsoft Corporation. All rights reserved.
|
|
||||||
//</copyright>
|
|
||||||
//-----------------------------------------------------------------------
|
|
||||||
|
|
||||||
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<AzureResourceMonthlyUsageRecord> 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() );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -24,7 +24,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.microsoft.azure</groupId>
|
<groupId>com.microsoft.azure</groupId>
|
||||||
<artifactId>azure-keyvault</artifactId>
|
<artifactId>azure-keyvault</artifactId>
|
||||||
<version>1.1.2</version>
|
<version>1.2.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.microsoft.graph</groupId>
|
<groupId>com.microsoft.graph</groupId>
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.microsoft.azure</groupId>
|
<groupId>com.microsoft.azure</groupId>
|
||||||
<artifactId>azure-keyvault</artifactId>
|
<artifactId>azure-keyvault</artifactId>
|
||||||
<version>1.1.2</version>
|
<version>1.2.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.microsoft.graph</groupId>
|
<groupId>com.microsoft.graph</groupId>
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.microsoft.azure</groupId>
|
<groupId>com.microsoft.azure</groupId>
|
||||||
<artifactId>adal4j</artifactId>
|
<artifactId>adal4j</artifactId>
|
||||||
<version>1.6.2</version>
|
<version>1.6.4</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.nimbusds</groupId>
|
<groupId>com.nimbusds</groupId>
|
||||||
|
@ -31,12 +31,12 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<artifactId>slf4j-log4j12</artifactId>
|
<artifactId>slf4j-log4j12</artifactId>
|
||||||
<version>1.7.5</version>
|
<version>1.7.30</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.microsoft.azure</groupId>
|
<groupId>com.microsoft.azure</groupId>
|
||||||
<artifactId>azure-keyvault</artifactId>
|
<artifactId>azure-keyvault</artifactId>
|
||||||
<version>1.1.2</version>
|
<version>1.2.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework</groupId>
|
<groupId>org.springframework</groupId>
|
||||||
|
|
Загрузка…
Ссылка в новой задаче