Skip to content

mgmt update on depencencies #11714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weidongxu-microsoft merged 1 commit into from
Jun 3, 2020
Merged

mgmt update on depencencies #11714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions sdk/keyvault/mgmt/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@
<artifactId>azure-mgmt-graph-rbac</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-certificates</artifactId>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-keys</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion sdk/management/docs/AUTH.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ The value of `AZURE_AUTHORITY_HOST` can be set via [`KnownAuthorityHosts`](https
Sample code to create a `AzureProfile`:

```java
//AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE, true);
//AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
AzureProfile profile = new AzureProfile("<YOUR_TENANT_ID>", "<YOUR_SUBSCRIPTION_ID>", AzureEnvironment.AZURE);
```

Expand Down
10 changes: 5 additions & 5 deletions sdk/management/gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ function codegen(project, cb) {
const readmeFile = specRoot + '/' + mappings[project].source;

console.log('Generating "' + project + '" from spec file ' + readmeFile);
var generator = '--fluent=true';
var generator = '--fluent';
if (mappings[project].fluent !== null && mappings[project].fluent === false) {
generator = '';
}
Expand All @@ -120,13 +120,13 @@ function codegen(project, cb) {
? `--use=${path.resolve(args['autorest-java'])} `
: '';

const regenManager = args['regenerate-manager'] ? ' --regenerate-manager=true ' : '';
const regenManager = args['regenerate-manager'] ? ' --regenerate-manager ' : '';

const outDir = path.resolve(mappings[project].dir);
cmd = autoRestExe + ' ' + readmeFile +
' --java ' +
' --azure-arm=true ' +
' --track1-naming=true --generate-client-as-impl=true --implementation-subpackage=models --sync-methods=all --required-parameter-client-methods=true --add-context-parameter=true --context-client-method-parameter=true --client-side-validations=true --client-logger=true ' +
' --azure-arm ' +
' --track1-naming --generate-client-as-impl --implementation-subpackage=models --sync-methods=all --required-parameter-client-methods --add-context-parameter --context-client-method-parameter --client-side-validations --client-logger ' +
generator +
` --java.namespace=${mappings[project].package} ` +
` --java.output-folder=${outDir} ` +
Expand Down Expand Up @@ -165,7 +165,7 @@ function deleteFolderRecursive(path) {
};

async function prepareBuild() {
return shell.task('mvn package javadoc:aggregate -DskipTests=true -q');
return shell.task('mvn package javadoc:aggregate -DskipTests -q');
}

async function prepareStage() {
Expand Down
7 changes: 1 addition & 6 deletions sdk/management/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,6 @@
<artifactId>azure-core-management</artifactId>
<version>1.0.0-beta.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-certificates</artifactId>
<version>4.1.0-beta.2</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-keys</artifactId>
Expand All @@ -84,7 +79,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.6.0</version>
<version>12.6.1</version>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
Expand Down
2 changes: 1 addition & 1 deletion sdk/management/samples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<version>4.0.1-beta.1</version>
<version>4.0.1-beta.3</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
Expand Down
3 changes: 1 addition & 2 deletions ...s/src/main/java/com/azure/management/compute/samples/CreateVirtualMachinesInParallel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@
import com.azure.management.resources.fluentcore.model.CreatedResources;
import com.azure.management.resources.fluentcore.profile.AzureProfile;
import com.azure.management.storage.StorageAccount;
import org.apache.commons.lang.time.StopWatch;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.apache.commons.lang3.time.StopWatch;

/**
* Azure compute sample for creating multiple virtual machines in parallel.
*/
Expand Down
2 changes: 1 addition & 1 deletion ...s/src/main/java/com/azure/management/compute/samples/ManageVirtualMachinesInParallel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.Collection;
import java.util.List;

import org.apache.commons.lang3.time.StopWatch;
import org.apache.commons.lang.time.StopWatch;

/**
* Azure Compute sample for managing virtual machines -
Expand Down
12 changes: 6 additions & 6 deletions ...ain/java/com/azure/management/cosmosdb/samples/CreateCosmosDBWithEventualConsistency.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
import com.azure.core.http.policy.HttpLogDetailLevel;
import com.azure.core.management.AzureEnvironment;
import com.azure.core.management.exception.ManagementException;
import com.azure.cosmos.ConnectionPolicy;
import com.azure.cosmos.ConsistencyLevel;
import com.azure.cosmos.CosmosClient;
import com.azure.cosmos.CosmosClientBuilder;
import com.azure.cosmos.CosmosClientException;
import com.azure.cosmos.CosmosDatabase;
import com.azure.cosmos.DirectConnectionConfig;
import com.azure.identity.DefaultAzureCredentialBuilder;
import com.azure.management.Azure;
import com.azure.management.cosmosdb.CosmosDBAccount;
Expand Down Expand Up @@ -105,11 +105,11 @@ public static boolean runSample(Azure azure) {
private static void createDBAndAddCollection(String masterKey, String endPoint) throws CosmosClientException {
try {
CosmosClient cosmosClient = new CosmosClientBuilder()
.setEndpoint(endPoint)
.setKey(masterKey)
.setConnectionPolicy(ConnectionPolicy.getDefaultPolicy())
.setConsistencyLevel(ConsistencyLevel.SESSION)
.buildClient();
.endpoint(endPoint)
.key(masterKey)
.directMode(DirectConnectionConfig.getDefaultConfig())
.consistencyLevel(ConsistencyLevel.SESSION)
.buildClient();

// Define a new database using the id above.
CosmosDatabase myDatabase = cosmosClient.createDatabase(DATABASE_ID, 400).getDatabase();
Expand Down
12 changes: 6 additions & 6 deletions ...agement/samples/src/main/java/com/azure/management/cosmosdb/samples/ManageHACosmosDB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
import com.azure.core.http.policy.HttpLogDetailLevel;
import com.azure.core.management.AzureEnvironment;
import com.azure.core.management.exception.ManagementException;
import com.azure.cosmos.ConnectionPolicy;
import com.azure.cosmos.ConsistencyLevel;
import com.azure.cosmos.CosmosClient;
import com.azure.cosmos.CosmosClientBuilder;
import com.azure.cosmos.CosmosClientException;
import com.azure.cosmos.CosmosDatabase;
import com.azure.cosmos.DirectConnectionConfig;
import com.azure.identity.DefaultAzureCredentialBuilder;
import com.azure.management.Azure;
import com.azure.management.cosmosdb.CosmosDBAccount;
Expand Down Expand Up @@ -119,11 +119,11 @@ public static boolean runSample(Azure azure) {
private static void createDBAndAddCollection(String masterKey, String endPoint) throws CosmosClientException {
try {
CosmosClient cosmosClient = new CosmosClientBuilder()
.setEndpoint(endPoint)
.setKey(masterKey)
.setConnectionPolicy(ConnectionPolicy.getDefaultPolicy())
.setConsistencyLevel(ConsistencyLevel.SESSION)
.buildClient();
.endpoint(endPoint)
.key(masterKey)
.directMode(DirectConnectionConfig.getDefaultConfig())
.consistencyLevel(ConsistencyLevel.SESSION)
.buildClient();

// Define a new database using the id above.
CosmosDatabase myDatabase = cosmosClient.createDatabase(DATABASE_ID, 400).getDatabase();
Expand Down