Skip to content
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.

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

Chrwhit/merge master four #22151

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ad75273
Exposes management node in azure-core-amqp (#22095)
conniey Jun 7, 2021
940c22d
Annotate HttpRange with Immutable (#22119)
alzimmermsft Jun 7, 2021
779a485
Cosmos Spark: Changing inferSchema.forceNullableProperties default to…
ealsur Jun 7, 2021
e80d82e
Make getScopes in the ARM Authentication Policy Public (#22120)
alzimmermsft Jun 7, 2021
513f071
[Communication]: Update version, changelog, and dependency for June r…
JianpingChen Jun 8, 2021
2878f5d
Increment version for videoanalyzer releases (#21814)
azure-sdk Jun 8, 2021
26f9c7d
Add module-info to jca and jca test module and change package name of…
michaelqi793 Jun 8, 2021
a30e938
Fix error in aad-starter-sample (#22109)
Jun 8, 2021
52f11be
EventGrid Add 4.4.0 new system events. (#22126)
YijunXieMS Jun 8, 2021
81e47a4
Updates to monitor query based on API review feedback (#22114)
srnagar Jun 8, 2021
e2afc2c
Fix Management Bug (#22122)
conniey Jun 8, 2021
0cebceb
mgmt, upgrade aks (#22136)
weidongxu-microsoft Jun 8, 2021
2b7514b
Add domain_hint in aad-stater. (#22134)
han-gao Jun 8, 2021
bee0474
Increment version for core releases (#22124)
azure-sdk Jun 8, 2021
477dd76
Update datafeed tests to remove error code asserts (#22121)
samvaity Jun 8, 2021
fa289ae
Made Tables service interfaces public (#22130)
vcolin7 Jun 8, 2021
126cf34
Adding lmolkova as owner for core, opentelemetry, and azure monitor e…
lmolkova Jun 8, 2021
c44cbf4
Re-generate EventGrid 4.4.0 events without FarmsBeat events (#22148)
YijunXieMS Jun 8, 2021
cd2363d
Client throughput control: Deferring store invocation (#22144)
FabianMeiswinkel Jun 8, 2021
5d276f1
Sync eng/common directory with azure-sdk-tools for PR 1633 (#22145)
azure-sdk Jun 8, 2021
b2e672c
Merge branch 'master' into chrwhit/merge-master-four
chrwhit Jun 8, 2021
b54359b
fix(*): update server calling pom
chrwhit Jun 8, 2021
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
6 changes: 3 additions & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
/sdk/containerregistry/ @pallavit @alzimmermsft @jianghaolu

# PRLabel: %Azure.Core
/sdk/core/ @alzimmermsft @jianghaolu @srnagar @hemanttanwar @anuchandy
/sdk/core/ @alzimmermsft @jianghaolu @srnagar @hemanttanwar @anuchandy @lmolkova

# PRLabel: %Azure.Core
/sdk/core/azure-core-tracing-opentelemetry/ @samvaity @alzimmermsft @trask
/sdk/core/azure-core-tracing-opentelemetry/ @samvaity @alzimmermsft @trask @lmolkova

# PRLabel: %Cosmos
/sdk/cosmos/ @moderakh @kushagraThapar @FabianMeiswinkel @kirankumarkolli @mbhaskar @simplynaveen20 @xinlian12 @milismsft @aayush3011
Expand Down Expand Up @@ -73,7 +73,7 @@

/sdk/loganalytics/microsoft-azure-loganalytics/ @divya-jay @geneh @alongafni

/sdk/monitor/azure-monitor-opentelemetry-exporter @trask @joshfree @srnagar
/sdk/monitor/azure-monitor-opentelemetry-exporter @trask @joshfree @srnagar @lmolkova

# PRLabel: %Mixed Reality Authentication
/sdk/mixedreality/azure-mixedreality-authentication @craigktreasure
Expand Down
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.16.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.17.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.9.2</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.10.0</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.10</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;dependency} -->
<version>1.0.0-beta.11</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.6.2</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
<version>1.7.0</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
</dependency>

<dependency>
Expand Down
29 changes: 27 additions & 2 deletions eng/common/scripts/ChangeLog-Operations.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,32 @@ function Get-ChangeLogEntriesFromContent {
$changeLogEntries = [Ordered]@{}
try {
# walk the document, finding where the version specifiers are and creating lists
$changeLogEntry = $null
foreach ($line in $changeLogContent) {
if ($line -match $RELEASE_TITLE_REGEX) {
$changeLogEntry = [pscustomobject]@{
ReleaseVersion = $matches["version"]
ReleaseStatus = $matches["releaseStatus"]
ReleaseTitle = "## {0} {1}" -f $matches["version"], $matches["releaseStatus"]
ReleaseContent = @()
Sections = @{}
}
$changeLogEntries[$changeLogEntry.ReleaseVersion] = $changeLogEntry
}
else {
if ($changeLogEntry) {
if ($line.Trim() -match "^###\s(?<sectionName>.*)")
{
$sectionName = $matches["sectionName"].Trim()
$changeLogEntry.Sections[$sectionName] = @()
$changeLogEntry.ReleaseContent += $line
continue
}

if ($sectionName)
{
$changeLogEntry.Sections[$sectionName] += $line
}

$changeLogEntry.ReleaseContent += $line
}
}
Expand Down Expand Up @@ -195,7 +208,19 @@ function New-ChangeLogEntry {
return $null
}

if (!$Content) { $Content = @() }
if (!$Content) {
$Content = @()
$Content += ""
$Content += "### Features Added"
$Content += ""
$Content += "### Breaking Changes"
$Content += ""
$Content += "### Key Bugs Fixed"
$Content += ""
$Content += "### Fixed"
$Content += ""
$Content += ""
}

$newChangeLogEntry = [pscustomobject]@{
ReleaseVersion = $Version
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 @@ -104,7 +104,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.17.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.18.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -119,7 +119,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-experimental</artifactId>
<version>1.0.0-beta.14</version> <!-- {x-version-update;com.azure:azure-core-experimental;current} -->
<version>1.0.0-beta.15</version> <!-- {x-version-update;com.azure:azure-core-experimental;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -129,37 +129,37 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.10.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->
<version>1.11.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.0</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.3.0</version> <!-- {x-version-update;com.azure:azure-core-management;current} -->
<version>1.4.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.11</version> <!-- {x-version-update;com.azure:azure-core-serializer-avro-apache;current} -->
<version>1.0.0-beta.12</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.3</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.4</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.11</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;current} -->
<version>1.0.0-beta.12</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
26 changes: 12 additions & 14 deletions eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# <groupId>:<artifactId>;dependency-version;current-version
#
# The dependency-version is used by other Azure SDKs outside of the release group when listing the library as a Maven
# dependency in its POM. The current-version is used by the library to denote its version and as the Maven dependency
# version for other Azure SDKs inside the same release group.
# dependency in its POM. The current-version is used by the library to denote its in-development version and as the
# Maven dependency version for other Azure SDKs inside the same release group.
#
# Given com.azure:azure-example;1.1.0;1.2.0-beta.1 in the release group /sdk/example
# - com.azure:azure-example2 in release group /sdk/example will use the current-version (1.2.0-beta.1) when using
Expand Down Expand Up @@ -58,20 +58,20 @@ com.azure:azure-communication-sms;1.0.1;1.0.3
com.azure:azure-communication-identity;1.1.0;1.1.1
com.azure:azure-communication-phonenumbers;1.0.1;1.0.3
com.azure:azure-containers-containerregistry;1.0.0-beta.2;1.0.0-beta.3
com.azure:azure-core;1.16.0;1.17.0
com.azure:azure-core;1.17.0;1.18.0-beta.1
com.azure:azure-core-amqp;2.0.6;2.1.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.13;1.0.0-beta.14
com.azure:azure-core-experimental;1.0.0-beta.14;1.0.0-beta.15
com.azure:azure-core-http-jdk-httpclient;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-core-http-netty;1.9.2;1.10.0
com.azure:azure-core-http-okhttp;1.6.2;1.7.0
com.azure:azure-core-management;1.2.2;1.3.0
com.azure:azure-core-serializer-avro-apache;1.0.0-beta.10;1.0.0-beta.11
com.azure:azure-core-http-netty;1.10.0;1.11.0-beta.1
com.azure:azure-core-http-okhttp;1.7.0;1.8.0-beta.1
com.azure:azure-core-management;1.3.0;1.4.0-beta.1
com.azure:azure-core-serializer-avro-apache;1.0.0-beta.11;1.0.0-beta.12
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.2;1.1.3
com.azure:azure-core-serializer-json-jackson;1.2.3;1.2.4
com.azure:azure-core-test;1.6.2;1.6.3
com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.10;1.0.0-beta.11
com.azure:azure-core-serializer-json-gson;1.1.3;1.2.0-beta.1
com.azure:azure-core-serializer-json-jackson;1.2.4;1.3.0-beta.1
com.azure:azure-core-test;1.6.3;1.7.0-beta.1
com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.11;1.0.0-beta.12
com.azure:azure-cosmos;4.15.0;4.16.0-beta.2
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 @@ -307,9 +307,7 @@ com.azure.resourcemanager:azure-resourcemanager-deviceprovisioningservices;1.0.0
# 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.17.0
unreleased_com.azure:azure-core-amqp;2.1.0-beta.1
unreleased_com.azure:azure-core-management;1.3.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.16.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.17.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.2.2</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
<version>1.3.0</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
</dependency>
</dependencies>
<build>
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.16.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.17.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.9.2</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.10.0</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.6.2</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<version>1.6.3</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.16.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.17.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.2.2</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
<version>1.3.0</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 @@ -36,25 +36,25 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.16.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.17.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.9.2</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.10.0</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.6.2</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<version>1.6.3</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.6.2</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
<version>1.7.0</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.16.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.17.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.2.2</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
<version>1.3.0</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 @@ -62,7 +62,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.16.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.17.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.9.2</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.10.0</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.16.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.17.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.9.2</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.10.0</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.16.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.17.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.2.2</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
<version>1.3.0</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.16.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.17.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.2.2</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
<version>1.3.0</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
</dependency>
</dependencies>
<build>
Expand Down
Loading