Skip to content

Commit

Permalink
Merge branch 'main' into java-17
Browse files Browse the repository at this point in the history
  • Loading branch information
mikeharder committed Oct 4, 2021
2 parents b4e2bfd + edfedd9 commit 534b359
Show file tree
Hide file tree
Showing 285 changed files with 2,852 additions and 830 deletions.
2 changes: 1 addition & 1 deletion common/perf-test-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.11.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.11.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
</dependency>
</dependencies>
</project>
8 changes: 4 additions & 4 deletions common/smoke-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,25 +88,25 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.20.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.21.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.11.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.11.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-tracing-opentelemetry</artifactId>
<version>1.0.0-beta.14</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;dependency} -->
<version>1.0.0-beta.15</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-okhttp</artifactId>
<version>1.7.3</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
<version>1.7.4</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
</dependency>

<dependency>
Expand Down
18 changes: 9 additions & 9 deletions eng/jacoco-test-coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.21.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.22.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -129,7 +129,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-experimental</artifactId>
<version>1.0.0-beta.19</version> <!-- {x-version-update;com.azure:azure-core-experimental;current} -->
<version>1.0.0-beta.20</version> <!-- {x-version-update;com.azure:azure-core-experimental;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -139,37 +139,37 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.11.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->
<version>1.12.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-okhttp</artifactId>
<version>1.7.4</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;current} -->
<version>1.8.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.4.2</version> <!-- {x-version-update;com.azure:azure-core-management;current} -->
<version>1.5.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-management;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-serializer-avro-apache</artifactId>
<version>1.0.0-beta.15</version> <!-- {x-version-update;com.azure:azure-core-serializer-avro-apache;current} -->
<version>1.0.0-beta.16</version> <!-- {x-version-update;com.azure:azure-core-serializer-avro-apache;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-serializer-json-gson</artifactId>
<version>1.1.7</version> <!-- {x-version-update;com.azure:azure-core-serializer-json-gson;current} -->
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-serializer-json-gson;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-serializer-json-jackson</artifactId>
<version>1.2.8</version> <!-- {x-version-update;com.azure:azure-core-serializer-json-jackson;current} -->
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-serializer-json-jackson;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-tracing-opentelemetry</artifactId>
<version>1.0.0-beta.15</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;current} -->
<version>1.0.0-beta.16</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
21 changes: 10 additions & 11 deletions eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,20 +60,20 @@ com.azure:azure-communication-phonenumbers;1.0.4;1.1.0-beta.1
com.azure:azure-communication-networktraversal;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-containers-containerregistry;1.0.0-beta.4;1.0.0-beta.5
com.azure:azure-containers-containerregistry-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-core;1.20.0;1.21.0
com.azure:azure-core;1.21.0;1.22.0-beta.1
com.azure:azure-core-amqp;2.3.2;2.4.0-beta.1
com.azure:azure-core-amqp-experimental;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-core-experimental;1.0.0-beta.18;1.0.0-beta.19
com.azure:azure-core-experimental;1.0.0-beta.19;1.0.0-beta.20
com.azure:azure-core-http-jdk-httpclient;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-core-http-netty;1.11.0;1.11.1
com.azure:azure-core-http-okhttp;1.7.3;1.7.4
com.azure:azure-core-management;1.4.1;1.4.2
com.azure:azure-core-serializer-avro-apache;1.0.0-beta.14;1.0.0-beta.15
com.azure:azure-core-http-netty;1.11.1;1.12.0-beta.1
com.azure:azure-core-http-okhttp;1.7.4;1.8.0-beta.1
com.azure:azure-core-management;1.4.2;1.5.0-beta.1
com.azure:azure-core-serializer-avro-apache;1.0.0-beta.15;1.0.0-beta.16
com.azure:azure-core-serializer-avro-jackson;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-core-serializer-json-gson;1.1.6;1.1.7
com.azure:azure-core-serializer-json-jackson;1.2.7;1.2.8
com.azure:azure-core-test;1.7.1;1.7.2
com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.14;1.0.0-beta.15
com.azure:azure-core-serializer-json-gson;1.1.7;1.2.0-beta.1
com.azure:azure-core-serializer-json-jackson;1.2.8;1.3.0-beta.1
com.azure:azure-core-test;1.7.2;1.8.0-beta.1
com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.15;1.0.0-beta.16
com.azure:azure-cosmos;4.19.0;4.19.1
com.azure:azure-cosmos-benchmark;4.0.1-beta.1;4.0.1-beta.1
com.azure:azure-cosmos-dotnet-benchmark;4.0.1-beta.1;4.0.1-beta.1
Expand Down Expand Up @@ -326,7 +326,6 @@ com.azure.resourcemanager:azure-resourcemanager-extendedlocation;1.0.0-beta.1;1.
# note: The unreleased dependencies will not be manipulated with the automatic PR creation code.
# In the pom, the version update tag after the version should name the unreleased package and the dependency version:
# <!-- {x-version-update;unreleased_com.azure:azure-core;dependency} -->
unreleased_com.azure:azure-core;1.21.0

# Released Beta dependencies: Copy the entry from above, prepend "beta_", remove the current
# version and set the version to the released beta. Released beta dependencies are only valid
Expand Down
4 changes: 2 additions & 2 deletions sdk/advisor/azure-resourcemanager-advisor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.20.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.21.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.4.1</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
<version>1.4.2</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
</dependency>
</dependencies>
<build>
Expand Down
10 changes: 5 additions & 5 deletions sdk/agrifood/azure-verticals-agrifood-farming/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.20.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.21.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-experimental</artifactId>
<version>1.0.0-beta.18</version> <!-- {x-version-update;com.azure:azure-core-experimental;dependency} -->
<version>1.0.0-beta.19</version> <!-- {x-version-update;com.azure:azure-core-experimental;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.11.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.11.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
</dependency>

<!-- Test dependencies -->
Expand All @@ -76,7 +76,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<version>1.7.1</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<version>1.7.2</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -100,7 +100,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-serializer-json-jackson</artifactId>
<version>1.2.7</version> <!-- {x-version-update;com.azure:azure-core-serializer-json-jackson;dependency} -->
<version>1.2.8</version> <!-- {x-version-update;com.azure:azure-core-serializer-json-jackson;dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions sdk/anomalydetector/azure-ai-anomalydetector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.20.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.21.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.11.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.11.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
</dependency>

<!-- Test dependencies -->
Expand All @@ -68,7 +68,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<version>1.7.1</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<version>1.7.2</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions sdk/apimanagement/azure-resourcemanager-apimanagement/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.20.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.21.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.4.1</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
<version>1.4.2</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
</dependency>
</dependencies>
<build>
Expand Down
8 changes: 4 additions & 4 deletions sdk/appconfiguration/azure-data-appconfiguration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,25 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.20.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.21.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.11.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.11.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<version>1.7.1</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<version>1.7.2</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-okhttp</artifactId>
<version>1.7.3</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
<version>1.7.4</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.20.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.21.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.4.1</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
<version>1.4.2</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
</dependency>
</dependencies>
<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.20.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.21.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -77,7 +77,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.11.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.11.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
</dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.20.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.21.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -82,7 +82,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.11.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.11.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.20.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.21.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.4.1</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
<version>1.4.2</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
</dependency>
</dependencies>
<build>
Expand Down
4 changes: 2 additions & 2 deletions sdk/attestation/azure-resourcemanager-attestation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.20.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.21.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.4.1</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
<version>1.4.2</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
</dependency>
</dependencies>
<build>
Expand Down
6 changes: 3 additions & 3 deletions sdk/attestation/azure-security-attestation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.20.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.21.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
Expand All @@ -57,7 +57,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<version>1.7.1</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<version>1.7.2</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -81,7 +81,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-okhttp</artifactId>
<version>1.7.3</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
<version>1.7.4</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions sdk/automation/azure-resourcemanager-automation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.20.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.21.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.4.1</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
<version>1.4.2</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
</dependency>
</dependencies>
<build>
Expand Down
Loading

0 comments on commit 534b359

Please sign in to comment.