Skip to content

Commit

Permalink
resolved conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@mssfang
mssfang committed Dec 6, 2019
2 parents 9814afc + 2b24156 commit 6940c63
Show file tree
Hide file tree
Showing 25 changed files with 90 additions and 90 deletions.
36 changes: 18 additions & 18 deletions eng/jacoco-test-coverage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-amqp</artifactId>
<version>1.0.0-beta.8</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
<version>1.0.0-beta.9</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -70,22 +70,22 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-tracing-opencensus</artifactId>
<version>1.0.0-beta.5</version> <!-- {x-version-update;com.azure:azure-core-tracing-opencensus;current} -->
<version>1.0.0-beta.6</version> <!-- {x-version-update;com.azure:azure-core-tracing-opencensus;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-data-appconfiguration</artifactId>
<version>1.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-data-appconfiguration;current} -->
<version>1.0.0-beta.8</version> <!-- {x-version-update;com.azure:azure-data-appconfiguration;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.0.1</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
<version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-certificates</artifactId>
<version>4.0.0-beta.6</version> <!-- {x-version-update;com.azure:azure-security-keyvault-certificates;current} -->
<version>4.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-security-keyvault-certificates;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -95,57 +95,57 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-secrets</artifactId>
<version>4.0.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;current} -->
<version>4.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs</artifactId>
<version>5.0.0-beta.6</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
<version>5.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
<version>1.0.0-beta.4</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;current} -->
<version>1.0.0-beta.5</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-common</artifactId>
<version>12.1.0</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
<version>12.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.1.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
<version>12.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob-batch</artifactId>
<version>12.1.0</version> <!-- {x-version-update;com.azure:azure-storage-blob-batch;current} -->
<version>12.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob-batch;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob-cryptography</artifactId>
<version>12.1.0</version> <!-- {x-version-update;com.azure:azure-storage-blob-cryptography;current} -->
<version>12.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob-cryptography;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-file-share</artifactId>
<version>12.0.0</version> <!-- {x-version-update;com.azure:azure-storage-file-share;current} -->
<version>12.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-file-share;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-file-datalake</artifactId>
<version>12.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-storage-file-datalake;current} -->
<version>12.0.0-beta.8</version> <!-- {x-version-update;com.azure:azure-storage-file-datalake;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-queue</artifactId>
<version>12.1.0</version> <!-- {x-version-update;com.azure:azure-storage-queue;current} -->
<version>12.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-queue-cryptography</artifactId>
<version>12.0.0-beta.6</version> <!-- {x-version-update;com.azure:azure-storage-queue-cryptography;current} -->
<version>12.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-storage-queue-cryptography;current} -->
</dependency>
</dependencies>

Expand Down
36 changes: 18 additions & 18 deletions eng/spotbugs-aggregate-report/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,22 +139,22 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-data-appconfiguration</artifactId>
<version>1.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-data-appconfiguration;current} -->
<version>1.0.0-beta.8</version> <!-- {x-version-update;com.azure:azure-data-appconfiguration;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-amqp</artifactId>
<version>1.0.0-beta.8</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
<version>1.0.0-beta.9</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -174,27 +174,27 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-tracing-opencensus</artifactId>
<version>1.0.0-beta.5</version> <!-- {x-version-update;com.azure:azure-core-tracing-opencensus;current} -->
<version>1.0.0-beta.6</version> <!-- {x-version-update;com.azure:azure-core-tracing-opencensus;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs</artifactId>
<version>5.0.0-beta.6</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
<version>5.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
<version>1.0.0-beta.4</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;current} -->
<version>1.0.0-beta.5</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.0.1</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
<version>1.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-certificates</artifactId>
<version>4.0.0-beta.6</version> <!-- {x-version-update;com.azure:azure-security-keyvault-certificates;current} -->
<version>4.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-security-keyvault-certificates;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -204,47 +204,47 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-secrets</artifactId>
<version>4.0.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;current} -->
<version>4.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-common</artifactId>
<version>12.1.0</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
<version>12.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.1.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
<version>12.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob-batch</artifactId>
<version>12.1.0</version> <!-- {x-version-update;com.azure:azure-storage-blob-batch;current} -->
<version>12.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob-batch;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob-cryptography</artifactId>
<version>12.1.0</version> <!-- {x-version-update;com.azure:azure-storage-blob-cryptography;current} -->
<version>12.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-blob-cryptography;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-file-share</artifactId>
<version>12.0.0</version> <!-- {x-version-update;com.azure:azure-storage-file-share;current} -->
<version>12.1.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-file-share;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-file-datalake</artifactId>
<version>12.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-storage-file-datalake;current} -->
<version>12.0.0-beta.8</version> <!-- {x-version-update;com.azure:azure-storage-file-datalake;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-queue</artifactId>
<version>12.1.0</version> <!-- {x-version-update;com.azure:azure-storage-queue;current} -->
<version>12.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-storage-queue;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-queue-cryptography</artifactId>
<version>12.0.0-beta.6</version> <!-- {x-version-update;com.azure:azure-storage-queue-cryptography;current} -->
<version>12.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-storage-queue-cryptography;current} -->
</dependency>
<!-- Added this dependency to include necessary annotations used by reactor core.
Without this dependency, javadoc throws a warning as it cannot find enum When.MAYBE
Expand Down
38 changes: 19 additions & 19 deletions eng/versioning/version_client.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
com.azure:azure-sdk-all;1.0.0;1.0.0
com.azure:azure-sdk-parent;1.6.0;1.6.0
com.azure:azure-client-sdk-parent;1.7.0;1.7.0
com.azure:azure-core;1.1.0;1.1.0
com.azure:azure-core-amqp;1.0.0-beta.8;1.0.0-beta.8
com.azure:azure-core-http-netty;1.1.0;1.1.0
com.azure:azure-core;1.1.0;1.2.0-beta.1
com.azure:azure-core-amqp;1.0.0-beta.8;1.0.0-beta.9
com.azure:azure-core-http-netty;1.1.0;1.2.0-beta.1
com.azure:azure-core-http-okhttp;1.1.0-beta.1;1.1.0-beta.1
com.azure:azure-core-management;1.0.0-beta.8;1.0.0-beta.8
com.azure:azure-core-test;1.1.0-beta.1;1.1.0-beta.1
com.azure:azure-data-appconfiguration;1.0.0-beta.7;1.0.0-beta.7
com.azure:azure-identity;1.0.1;1.0.1
com.azure:azure-security-keyvault-certificates;4.0.0-beta.6;4.0.0-beta.6
com.azure:azure-data-appconfiguration;1.0.0-beta.7;1.0.0-beta.8
com.azure:azure-identity;1.0.1;1.1.0-beta.1
com.azure:azure-security-keyvault-certificates;4.0.0-beta.6;4.0.0-beta.7
com.azure:azure-security-keyvault-keys;4.0.1;4.0.1
com.azure:azure-security-keyvault-secrets;4.0.1;4.0.1
com.azure:azure-messaging-eventhubs;5.0.0-beta.6;5.0.0-beta.6
com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.0.0-beta.4;1.0.0-beta.4
com.azure:azure-security-keyvault-secrets;4.0.1;4.1.0-beta.1
com.azure:azure-messaging-eventhubs;5.0.0-beta.6;5.0.0-beta.7
com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.0.0-beta.4;1.0.0-beta.5
com.azure:azure-sdk-template;1.0.4-beta.2;1.0.4-beta.2
com.azure:azure-storage-blob;12.1.0;12.1.0
com.azure:azure-storage-blob-batch;12.1.0;12.1.0
com.azure:azure-storage-blob-cryptography;12.1.0;12.1.0
com.azure:azure-storage-common;12.1.0;12.1.0
com.azure:azure-storage-file-share;12.0.0;12.0.0
com.azure:azure-storage-file-datalake;12.0.0-beta.7;12.0.0-beta.7
com.azure:azure-storage-queue;12.1.0;12.1.0
com.azure:azure-storage-queue-cryptography;12.0.0-beta.6;12.0.0-beta.6
com.azure:azure-core-tracing-opencensus;1.0.0-beta.5;1.0.0-beta.5
com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-storage-blob;12.1.0;12.2.0-beta.1
com.azure:azure-storage-blob-batch;12.1.0;12.2.0-beta.1
com.azure:azure-storage-blob-cryptography;12.1.0;12.2.0-beta.1
com.azure:azure-storage-common;12.1.0;12.2.0-beta.1
com.azure:azure-storage-file-share;12.0.0;12.1.0-beta.1
com.azure:azure-storage-file-datalake;12.0.0-beta.7;12.0.0-beta.8
com.azure:azure-storage-queue;12.1.0;12.2.0-beta.1
com.azure:azure-storage-queue-cryptography;12.0.0-beta.6;12.0.0-beta.7
com.azure:azure-core-tracing-opencensus;1.0.0-beta.5;1.0.0-beta.6
com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-cognitiveservices-textanalytics;1.0.0-beta.1;1.0.0-beta.1
2 changes: 1 addition & 1 deletion sdk/appconfiguration/azure-data-appconfiguration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<groupId>com.azure</groupId>
<artifactId>azure-data-appconfiguration</artifactId>
<version>1.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-data-appconfiguration;current} -->
<version>1.0.0-beta.8</version> <!-- {x-version-update;com.azure:azure-data-appconfiguration;current} -->

<name>Microsoft Azure client library for App Configuration</name>
<description>This package contains the Microsoft Azure App Configuration client library.</description>
Expand Down
4 changes: 2 additions & 2 deletions sdk/core/azure-core-amqp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<groupId>com.azure</groupId>
<artifactId>azure-core-amqp</artifactId>
<version>1.0.0-beta.8</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
<version>1.0.0-beta.9</version> <!-- {x-version-update;com.azure:azure-core-amqp;current} -->
<packaging>jar</packaging>

<name>Microsoft Azure Java Core AMQP Library</name>
Expand Down Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...ore/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ClientConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public final class ClientConstants {
public static final String NOT_APPLICABLE = "n/a";
public static final String PRODUCT_NAME = "azsdk-java-eventhubs";
// {x-version-update-start;com.azure:azure-messaging-eventhubs;current}
public static final String CURRENT_JAVA_CLIENT_VERSION = "5.0.0-beta.6";
public static final String CURRENT_JAVA_CLIENT_VERSION = "5.0.0-beta.7";
// {x-version-update-end}
public static final String PLATFORM_INFO = getOSInformation();
public static final String FRAMEWORK_INFO = getFrameworkInfo();
Expand Down
6 changes: 3 additions & 3 deletions sdk/core/azure-core-http-netty/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<packaging>jar</packaging>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->

<name>Microsoft Azure Netty HTTP Client Library</name>
<description>This package contains the Netty HTTP client plugin for azure-core.</description>
Expand Down Expand Up @@ -58,7 +58,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>

<dependency>
Expand Down Expand Up @@ -109,7 +109,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions sdk/core/azure-core-http-okhttp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>

<dependency>
Expand All @@ -72,7 +72,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
Loading

0 comments on commit 6940c63

Please sign in to comment.