diff --git a/eng/code-quality-reports/src/main/resources/revapi/revapi.json b/eng/code-quality-reports/src/main/resources/revapi/revapi.json index 3763dd400c3a..38cc2e450809 100644 --- a/eng/code-quality-reports/src/main/resources/revapi/revapi.json +++ b/eng/code-quality-reports/src/main/resources/revapi/revapi.json @@ -101,6 +101,10 @@ { "matcher": "java-package", "match": "/org\\.(junit|slf4j|springframework)(\\..*)?/" + }, + { + "matcher": "java-package", + "match": "/com\\.google\\.gson(\\..*)?/" } ] } diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index 4f96b2eb82fe..bd54f6dbd564 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -118,12 +118,12 @@ com.azure azure-core - 1.30.0-beta.1 + 1.30.0 com.azure azure-core-amqp - 2.6.0-beta.1 + 2.6.0 com.azure @@ -143,17 +143,17 @@ com.azure azure-core-http-netty - 1.13.0-beta.1 + 1.12.3 com.azure azure-core-http-okhttp - 1.11.0-beta.1 + 1.11.0 com.azure azure-core-management - 1.7.0-beta.1 + 1.7.0 com.azure @@ -163,12 +163,12 @@ com.azure azure-core-serializer-json-gson - 1.2.0-beta.1 + 1.1.18 com.azure azure-core-serializer-json-jackson - 1.3.0-beta.1 + 1.2.19 com.azure diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 1efdd320cd7a..d0542721a151 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -66,21 +66,21 @@ com.azure:azure-communication-phonenumbers;1.0.12;1.1.0-beta.8 com.azure:azure-communication-networktraversal;1.1.0-beta.2;1.1.0-beta.3 com.azure:azure-containers-containerregistry;1.0.5;1.1.0-beta.2 com.azure:azure-containers-containerregistry-perf;1.0.0-beta.1;1.0.0-beta.1 -com.azure:azure-core;1.29.1;1.30.0-beta.1 -com.azure:azure-core-amqp;2.5.2;2.6.0-beta.1 +com.azure:azure-core;1.29.1;1.30.0 +com.azure:azure-core-amqp;2.5.2;2.6.0 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.29;1.0.0-beta.30 com.azure:azure-core-http-jdk-httpclient;1.0.0-beta.1;1.0.0-beta.1 -com.azure:azure-core-http-netty;1.12.2;1.13.0-beta.1 -com.azure:azure-core-http-okhttp;1.10.1;1.11.0-beta.1 +com.azure:azure-core-http-netty;1.12.2;1.12.3 +com.azure:azure-core-http-okhttp;1.10.1;1.11.0 com.azure:azure-core-http-vertx;1.0.0-beta.1;1.0.0-beta.1 -com.azure:azure-core-management;1.6.2;1.7.0-beta.1 +com.azure:azure-core-management;1.6.2;1.7.0 com.azure:azure-core-perf;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-core-serializer-avro-apache;1.0.0-beta.25;1.0.0-beta.26 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.17;1.2.0-beta.1 -com.azure:azure-core-serializer-json-jackson;1.2.18;1.3.0-beta.1 -com.azure:azure-core-test;1.9.1;1.10.0-beta.1 +com.azure:azure-core-serializer-json-gson;1.1.17;1.1.18 +com.azure:azure-core-serializer-json-jackson;1.2.18;1.2.19 +com.azure:azure-core-test;1.9.1;1.10.0 com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.25;1.0.0-beta.26 com.azure:azure-cosmos;4.32.0;4.33.0-beta.1 com.azure:azure-cosmos-benchmark;4.0.1-beta.1;4.0.1-beta.1 @@ -363,7 +363,7 @@ com.azure.tools:azure-sdk-build-tool;1.0.0-beta.1;1.0.0-beta.2 # 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: # -unreleased_com.azure:azure-core-amqp;2.6.0-beta.1 +unreleased_com.azure:azure-core-amqp;2.6.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 diff --git a/sdk/core/azure-core-amqp-experimental/pom.xml b/sdk/core/azure-core-amqp-experimental/pom.xml index 6fe14483328d..c1867d82ec6d 100644 --- a/sdk/core/azure-core-amqp-experimental/pom.xml +++ b/sdk/core/azure-core-amqp-experimental/pom.xml @@ -58,7 +58,7 @@ com.azure azure-core-amqp - 2.6.0-beta.1 + 2.6.0 diff --git a/sdk/core/azure-core-amqp/CHANGELOG.md b/sdk/core/azure-core-amqp/CHANGELOG.md index 4fd8240bf6fd..887d2c16e8f6 100644 --- a/sdk/core/azure-core-amqp/CHANGELOG.md +++ b/sdk/core/azure-core-amqp/CHANGELOG.md @@ -1,10 +1,10 @@ # Release History -## 2.6.0-beta.1 (Unreleased) +## 2.6.0 (2022-06-30) ### Features Added -### Breaking Changes + - Added `AmqpMessageConstant` `MESSAGE_STATE_ANNOTATION_NAME("x-opt-message-state")`. ### Bugs Fixed @@ -13,6 +13,10 @@ ### Other Changes +#### Dependency Updates + +- Upgraded `azure-core` from `1.29.1` to `1.30.0`. + ## 2.5.2 (2022-06-03) ### Other Changes diff --git a/sdk/core/azure-core-amqp/README.md b/sdk/core/azure-core-amqp/README.md index de9018f54331..28eb57e82120 100644 --- a/sdk/core/azure-core-amqp/README.md +++ b/sdk/core/azure-core-amqp/README.md @@ -48,7 +48,7 @@ add the direct dependency to your project as follows. com.azure azure-core-amqp - 2.5.2 + 2.6.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-amqp/pom.xml b/sdk/core/azure-core-amqp/pom.xml index 3b4f386acab6..7f690c4a971a 100644 --- a/sdk/core/azure-core-amqp/pom.xml +++ b/sdk/core/azure-core-amqp/pom.xml @@ -14,7 +14,7 @@ com.azure azure-core-amqp - 2.6.0-beta.1 + 2.6.0 jar Microsoft Azure Java Core AMQP Library @@ -64,7 +64,7 @@ com.azure azure-core - 1.30.0-beta.1 + 1.30.0 com.microsoft.azure @@ -111,7 +111,7 @@ com.azure azure-core-test - 1.10.0-beta.1 + 1.10.0 test diff --git a/sdk/core/azure-core-experimental/CHANGELOG.md b/sdk/core/azure-core-experimental/CHANGELOG.md index 74c2b267ef58..9175db01e9d7 100644 --- a/sdk/core/azure-core-experimental/CHANGELOG.md +++ b/sdk/core/azure-core-experimental/CHANGELOG.md @@ -1,14 +1,12 @@ # Release History -## 1.0.0-beta.30 (Unreleased) +## 1.0.0-beta.30 (2022-06-30) -### Features Added - -### Breaking Changes +### Other Changes -### Bugs Fixed +#### Dependency Updates -### Other Changes +- Upgraded `azure-core` from `1.29.0` to `1.29.1`. ## 1.0.0-beta.29 (2022-06-03) diff --git a/sdk/core/azure-core-experimental/README.md b/sdk/core/azure-core-experimental/README.md index 2be82270d3ad..72d8406e6525 100644 --- a/sdk/core/azure-core-experimental/README.md +++ b/sdk/core/azure-core-experimental/README.md @@ -17,7 +17,7 @@ Azure Core Experimental contains types that are being evaluated and might eventu com.azure azure-core-experimental - 1.0.0-beta.28 + 1.0.0-beta.30 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-experimental/pom.xml b/sdk/core/azure-core-experimental/pom.xml index 417d70ca96a5..ded0f8f08e0a 100644 --- a/sdk/core/azure-core-experimental/pom.xml +++ b/sdk/core/azure-core-experimental/pom.xml @@ -64,7 +64,7 @@ com.azure azure-core - 1.30.0-beta.1 + 1.30.0 diff --git a/sdk/core/azure-core-http-jdk-httpclient/pom.xml b/sdk/core/azure-core-http-jdk-httpclient/pom.xml index b47269d4cdc1..d0dafef3b385 100644 --- a/sdk/core/azure-core-http-jdk-httpclient/pom.xml +++ b/sdk/core/azure-core-http-jdk-httpclient/pom.xml @@ -68,27 +68,27 @@ com.azure azure-core - 1.30.0-beta.1 + 1.30.0 com.azure azure-core - 1.30.0-beta.1 + 1.30.0 test-jar test com.azure azure-core-test - 1.10.0-beta.1 + 1.10.0 test com.azure azure-core-test - 1.10.0-beta.1 + 1.10.0 test-jar test diff --git a/sdk/core/azure-core-http-netty/CHANGELOG.md b/sdk/core/azure-core-http-netty/CHANGELOG.md index f98e8bf21999..8238468274d9 100644 --- a/sdk/core/azure-core-http-netty/CHANGELOG.md +++ b/sdk/core/azure-core-http-netty/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 1.13.0-beta.1 (Unreleased) +## 1.12.3 (2022-06-30) ### Features Added @@ -14,11 +14,13 @@ httpClient.send(request, context).subscribe(); ``` -### Breaking Changes +### Other Changes -### Bugs Fixed +#### Dependency Updates -### Other Changes +- Upgraded `azure-core` from `1.29.1` to `1.30.0`. +- Upgraded Netty from `4.1.76.Final` to `4.1.86.Final`. +- Upgraded Reactor Netty from `1.0.18` to `1.0.20`. ## 1.12.2 (2022-06-03) diff --git a/sdk/core/azure-core-http-netty/README.md b/sdk/core/azure-core-http-netty/README.md index 83c03d029761..0df4e6039d1d 100644 --- a/sdk/core/azure-core-http-netty/README.md +++ b/sdk/core/azure-core-http-netty/README.md @@ -47,7 +47,7 @@ add the direct dependency to your project as follows. com.azure azure-core-http-netty - 1.12.2 + 1.12.3 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-http-netty/pom.xml b/sdk/core/azure-core-http-netty/pom.xml index c74c64e00d71..3d73269b887a 100644 --- a/sdk/core/azure-core-http-netty/pom.xml +++ b/sdk/core/azure-core-http-netty/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-http-netty jar - 1.13.0-beta.1 + 1.12.3 Microsoft Azure Netty HTTP Client Library This package contains the Netty HTTP client plugin for azure-core. @@ -65,7 +65,7 @@ com.azure azure-core - 1.30.0-beta.1 + 1.30.0 @@ -129,20 +129,20 @@ com.azure azure-core - 1.30.0-beta.1 + 1.30.0 test-jar test com.azure azure-core-test - 1.10.0-beta.1 + 1.10.0 test com.azure azure-core-test - 1.10.0-beta.1 + 1.10.0 test-jar test diff --git a/sdk/core/azure-core-http-okhttp/CHANGELOG.md b/sdk/core/azure-core-http-okhttp/CHANGELOG.md index dcbedb979a9b..1df963c534c9 100644 --- a/sdk/core/azure-core-http-okhttp/CHANGELOG.md +++ b/sdk/core/azure-core-http-okhttp/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 1.11.0-beta.1 (Unreleased) +## 1.11.0 (2022-06-30) ### Features Added @@ -14,13 +14,15 @@ httpClient.send(request, context).subscribe(); ``` -### Breaking Changes - -### Bugs Fixed - ### Other Changes + - Added synchronous implementation of `HttpClient.sendSync`. +#### Dependency Updates + +- Upgraded `azure-core` from `1.29.1` to `1.30.0`. +- Upgraded OkHttp from `4.9.2` to `4.10.0`. + ## 1.10.1 (2022-06-03) ### Other Changes diff --git a/sdk/core/azure-core-http-okhttp/README.md b/sdk/core/azure-core-http-okhttp/README.md index 3f7fa04415dc..4d40b90496bf 100644 --- a/sdk/core/azure-core-http-okhttp/README.md +++ b/sdk/core/azure-core-http-okhttp/README.md @@ -47,7 +47,7 @@ add the direct dependency to your project as follows. com.azure azure-core-http-okhttp - 1.10.1 + 1.11.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-http-okhttp/pom.xml b/sdk/core/azure-core-http-okhttp/pom.xml index 223eb55c96b3..469967420d8a 100644 --- a/sdk/core/azure-core-http-okhttp/pom.xml +++ b/sdk/core/azure-core-http-okhttp/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-http-okhttp jar - 1.11.0-beta.1 + 1.11.0 Microsoft Azure OkHttp HTTP Client Library This package contains the OkHttp HTTP client plugin for azure-core. @@ -64,7 +64,7 @@ com.azure azure-core - 1.30.0-beta.1 + 1.30.0 @@ -77,20 +77,20 @@ com.azure azure-core - 1.30.0-beta.1 + 1.30.0 test-jar test com.azure azure-core-test - 1.10.0-beta.1 + 1.10.0 test com.azure azure-core-test - 1.10.0-beta.1 + 1.10.0 test-jar test diff --git a/sdk/core/azure-core-http-vertx/CHANGELOG.md b/sdk/core/azure-core-http-vertx/CHANGELOG.md index 13dd08af78ab..cc095d35d696 100644 --- a/sdk/core/azure-core-http-vertx/CHANGELOG.md +++ b/sdk/core/azure-core-http-vertx/CHANGELOG.md @@ -1,11 +1,7 @@ # Release History -## 1.0.0-beta.1 (Unreleased) +## 1.0.0-beta.1 (2022-06-30) ### Features Added -### Breaking Changes - -### Bugs Fixed - -### Other Changes +- Initial release. Please see the README and wiki for information on the new design. diff --git a/sdk/core/azure-core-http-vertx/pom.xml b/sdk/core/azure-core-http-vertx/pom.xml index e97225bf964f..7f8202ded1bb 100644 --- a/sdk/core/azure-core-http-vertx/pom.xml +++ b/sdk/core/azure-core-http-vertx/pom.xml @@ -64,7 +64,7 @@ com.azure azure-core - 1.30.0-beta.1 + 1.30.0 @@ -85,20 +85,20 @@ com.azure azure-core - 1.30.0-beta.1 + 1.30.0 test-jar test com.azure azure-core-test - 1.10.0-beta.1 + 1.10.0 test com.azure azure-core-test - 1.10.0-beta.1 + 1.10.0 test-jar test diff --git a/sdk/core/azure-core-jackson-tests/pom.xml b/sdk/core/azure-core-jackson-tests/pom.xml index db6c2f9890d5..4e7c3b79344a 100644 --- a/sdk/core/azure-core-jackson-tests/pom.xml +++ b/sdk/core/azure-core-jackson-tests/pom.xml @@ -51,14 +51,14 @@ com.azure azure-core - 1.30.0-beta.1 + 1.30.0 test com.azure azure-core - 1.30.0-beta.1 + 1.30.0 tests test-jar test diff --git a/sdk/core/azure-core-management/CHANGELOG.md b/sdk/core/azure-core-management/CHANGELOG.md index 060b96a71fda..6f77ad7e1458 100644 --- a/sdk/core/azure-core-management/CHANGELOG.md +++ b/sdk/core/azure-core-management/CHANGELOG.md @@ -1,14 +1,12 @@ # Release History -## 1.7.0-beta.1 (Unreleased) +## 1.7.0 (2022-06-30) -### Features Added - -### Breaking Changes +### Other Changes -### Bugs Fixed +#### Dependency Updates -### Other Changes +- Upgraded `azure-core` from `1.29.1` to `1.30.0`. ## 1.6.2 (2022-06-03) diff --git a/sdk/core/azure-core-management/README.md b/sdk/core/azure-core-management/README.md index 4d3831fd5125..39daa578f1ba 100644 --- a/sdk/core/azure-core-management/README.md +++ b/sdk/core/azure-core-management/README.md @@ -15,7 +15,7 @@ Azure Core Management library is a collection of classes common to the [Azure Re com.azure azure-core-management - 1.6.2 + 1.7.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-management/pom.xml b/sdk/core/azure-core-management/pom.xml index 6b1a672a97cc..b30df8edacb5 100644 --- a/sdk/core/azure-core-management/pom.xml +++ b/sdk/core/azure-core-management/pom.xml @@ -13,7 +13,7 @@ com.azure azure-core-management - 1.7.0-beta.1 + 1.7.0 jar Microsoft Azure Management Java Core Library @@ -62,7 +62,7 @@ com.azure azure-core - 1.30.0-beta.1 + 1.30.0 @@ -86,7 +86,7 @@ com.azure azure-core-http-netty - 1.13.0-beta.1 + 1.12.3 test diff --git a/sdk/core/azure-core-management/src/main/java/com/azure/core/management/http/policy/ArmChallengeAuthenticationPolicy.java b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/http/policy/ArmChallengeAuthenticationPolicy.java index e556bdd3ebdb..b28afc759246 100644 --- a/sdk/core/azure-core-management/src/main/java/com/azure/core/management/http/policy/ArmChallengeAuthenticationPolicy.java +++ b/sdk/core/azure-core-management/src/main/java/com/azure/core/management/http/policy/ArmChallengeAuthenticationPolicy.java @@ -23,8 +23,8 @@ import java.util.regex.Pattern; /** - * The pipeline policy that applies a token credential to an HTTP request - * with "Bearer" scheme in ARM challenge based authentication scenarios. + * The pipeline policy that applies a token credential to an HTTP request with "Bearer" scheme in ARM challenge based + * authentication scenarios. */ public class ArmChallengeAuthenticationPolicy extends BearerTokenAuthenticationPolicy { private static final Pattern AUTHENTICATION_CHALLENGE_PATTERN = @@ -62,6 +62,17 @@ public Mono authorizeRequest(HttpPipelineCallContext context) { }); } + @Override + public void authorizeRequestSync(HttpPipelineCallContext context) { + String[] scopes = this.scopes; + scopes = getScopes(context, scopes); + + if (scopes != null) { + context.setData(ARM_SCOPES_KEY, scopes); + setAuthorizationHeaderSync(context, new TokenRequestContext().addScopes(scopes)); + } + } + @Override public Mono authorizeRequestOnChallenge(HttpPipelineCallContext context, HttpResponse response) { return Mono.defer(() -> { @@ -90,7 +101,7 @@ public Mono authorizeRequestOnChallenge(HttpPipelineCallContext context return setAuthorizationHeader(context, new TokenRequestContext() .addScopes(scopes).setClaims(claims)) - .flatMap(b -> Mono.just(true)); + .flatMap(b -> Mono.just(true)); } } } @@ -98,6 +109,39 @@ public Mono authorizeRequestOnChallenge(HttpPipelineCallContext context }); } + @Override + public boolean authorizeRequestOnChallengeSync(HttpPipelineCallContext context, HttpResponse response) { + String authHeader = response.getHeaderValue(WWW_AUTHENTICATE); + if (response.getStatusCode() == 401 && authHeader != null) { + List challenges = parseChallenges(authHeader); + for (AuthenticationChallenge authenticationChallenge : challenges) { + Map extractedChallengeParams = + parseChallengeParams(authenticationChallenge.getChallengeParameters()); + if (extractedChallengeParams.containsKey(CLAIMS_PARAMETER)) { + String claims = new String(Base64.getUrlDecoder() + .decode(extractedChallengeParams.get(CLAIMS_PARAMETER)), StandardCharsets.UTF_8); + + String[] scopes; + // We should've retrieved and configured the scopes in on Before logic, + // re-use it here as an optimization. + try { + scopes = (String[]) context.getData(ARM_SCOPES_KEY).get(); + } catch (NoSuchElementException e) { + scopes = this.scopes; + } + + // If scopes wasn't configured in On Before logic or at constructor level, + // then this method will retrieve it again. + scopes = getScopes(context, scopes); + setAuthorizationHeaderSync(context, new TokenRequestContext().addScopes(scopes).setClaims(claims)); + return true; + } + } + } + + return false; + } + /** * Gets the scopes for the specific request. * diff --git a/sdk/core/azure-core-perf/pom.xml b/sdk/core/azure-core-perf/pom.xml index 52ff9ba47021..0906baebb443 100644 --- a/sdk/core/azure-core-perf/pom.xml +++ b/sdk/core/azure-core-perf/pom.xml @@ -21,17 +21,17 @@ com.azure azure-core - 1.30.0-beta.1 + 1.30.0 com.azure azure-core-http-netty - 1.13.0-beta.1 + 1.12.3 com.azure azure-core-http-okhttp - 1.11.0-beta.1 + 1.11.0 com.azure diff --git a/sdk/core/azure-core-serializer-avro-apache/CHANGELOG.md b/sdk/core/azure-core-serializer-avro-apache/CHANGELOG.md index eba0134cc7dc..4da9da71d6bf 100644 --- a/sdk/core/azure-core-serializer-avro-apache/CHANGELOG.md +++ b/sdk/core/azure-core-serializer-avro-apache/CHANGELOG.md @@ -1,14 +1,12 @@ # Release History -## 1.0.0-beta.26 (Unreleased) +## 1.0.0-beta.26 (2022-06-30) -### Features Added - -### Breaking Changes +### Other Changes -### Bugs Fixed +#### Dependency Updates -### Other Changes +- Upgraded `azure-core` from `1.29.1` to `1.30.0`. ## 1.0.0-beta.25 (2022-06-03) diff --git a/sdk/core/azure-core-serializer-avro-apache/README.md b/sdk/core/azure-core-serializer-avro-apache/README.md index 863ad2552a16..0487985a0cf7 100644 --- a/sdk/core/azure-core-serializer-avro-apache/README.md +++ b/sdk/core/azure-core-serializer-avro-apache/README.md @@ -15,7 +15,7 @@ Azure Core Apache Avro Serializer is a plugin for the `azure-core` `AvroSerializ com.azure azure-core-serializer-avro-apache - 1.0.0-beta.25 + 1.0.0-beta.26 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-serializer-avro-apache/pom.xml b/sdk/core/azure-core-serializer-avro-apache/pom.xml index 29a01ac1e156..3c83b206041c 100644 --- a/sdk/core/azure-core-serializer-avro-apache/pom.xml +++ b/sdk/core/azure-core-serializer-avro-apache/pom.xml @@ -63,7 +63,7 @@ com.azure azure-core - 1.30.0-beta.1 + 1.30.0 com.azure diff --git a/sdk/core/azure-core-serializer-avro-jackson/pom.xml b/sdk/core/azure-core-serializer-avro-jackson/pom.xml index cef2404eb0de..323991b0b8ad 100644 --- a/sdk/core/azure-core-serializer-avro-jackson/pom.xml +++ b/sdk/core/azure-core-serializer-avro-jackson/pom.xml @@ -63,7 +63,7 @@ com.azure azure-core - 1.30.0-beta.1 + 1.30.0 com.azure diff --git a/sdk/core/azure-core-serializer-json-gson/CHANGELOG.md b/sdk/core/azure-core-serializer-json-gson/CHANGELOG.md index dd9268ddab72..f84ff4441513 100644 --- a/sdk/core/azure-core-serializer-json-gson/CHANGELOG.md +++ b/sdk/core/azure-core-serializer-json-gson/CHANGELOG.md @@ -1,14 +1,13 @@ # Release History -## 1.2.0-beta.1 (Unreleased) +## 1.1.18 (2022-06-30) -### Features Added - -### Breaking Changes +### Other Changes -### Bugs Fixed +#### Dependency Updates -### Other Changes +- Upgraded `azure-core` from `1.29.1` to `1.30.0`. +- Upgraded GSON from `2.8.9` to `2.9.0`. ## 1.1.17 (2022-06-03) diff --git a/sdk/core/azure-core-serializer-json-gson/README.md b/sdk/core/azure-core-serializer-json-gson/README.md index c912b3caf64f..ef70716c3fee 100644 --- a/sdk/core/azure-core-serializer-json-gson/README.md +++ b/sdk/core/azure-core-serializer-json-gson/README.md @@ -47,7 +47,7 @@ add the direct dependency to your project as follows. com.azure azure-core-serializer-json-gson - 1.1.17 + 1.1.18 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-serializer-json-gson/pom.xml b/sdk/core/azure-core-serializer-json-gson/pom.xml index 40d295fb6521..084d308eb35e 100644 --- a/sdk/core/azure-core-serializer-json-gson/pom.xml +++ b/sdk/core/azure-core-serializer-json-gson/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-serializer-json-gson jar - 1.2.0-beta.1 + 1.1.18 Microsoft Azure Gson JSON Serializer Library This package contains the Gson JSON serializer client plugin for azure-core. @@ -62,7 +62,7 @@ com.azure azure-core - 1.30.0-beta.1 + 1.30.0 diff --git a/sdk/core/azure-core-serializer-json-jackson/CHANGELOG.md b/sdk/core/azure-core-serializer-json-jackson/CHANGELOG.md index 49c65d0615ab..2a4e4e3a26ca 100644 --- a/sdk/core/azure-core-serializer-json-jackson/CHANGELOG.md +++ b/sdk/core/azure-core-serializer-json-jackson/CHANGELOG.md @@ -1,14 +1,13 @@ # Release History -## 1.3.0-beta.1 (Unreleased) +## 1.2.19 (2022-06-30) -### Features Added - -### Breaking Changes +### Other Changes -### Bugs Fixed +#### Dependency Updates -### Other Changes +- Upgraded `azure-core` from `1.29.1` to `1.30.0`. +- Upgraded Jackson from `2.13.2` to `2.13.3`. ## 1.2.18 (2022-06-03) diff --git a/sdk/core/azure-core-serializer-json-jackson/README.md b/sdk/core/azure-core-serializer-json-jackson/README.md index 3e9d24be2dcd..c2207be6e3d3 100644 --- a/sdk/core/azure-core-serializer-json-jackson/README.md +++ b/sdk/core/azure-core-serializer-json-jackson/README.md @@ -47,7 +47,7 @@ add the direct dependency to your project as follows. com.azure azure-core-serializer-json-jackson - 1.2.18 + 1.2.19 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-serializer-json-jackson/pom.xml b/sdk/core/azure-core-serializer-json-jackson/pom.xml index d5e52429a556..def2f845b277 100644 --- a/sdk/core/azure-core-serializer-json-jackson/pom.xml +++ b/sdk/core/azure-core-serializer-json-jackson/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core-serializer-json-jackson jar - 1.3.0-beta.1 + 1.2.19 Microsoft Azure Jackson JSON Serializer Library This package contains the Jackson JSON serializer client plugin for azure-core. @@ -63,7 +63,7 @@ com.azure azure-core - 1.30.0-beta.1 + 1.30.0 diff --git a/sdk/core/azure-core-test/CHANGELOG.md b/sdk/core/azure-core-test/CHANGELOG.md index cf800db77b29..51c7662be244 100644 --- a/sdk/core/azure-core-test/CHANGELOG.md +++ b/sdk/core/azure-core-test/CHANGELOG.md @@ -1,15 +1,17 @@ # Release History -## 1.10.0-beta.1 (Unreleased) +## 1.10.0 (2022-06-30) ### Features Added -### Breaking Changes - -### Bugs Fixed +- Added `ThreadDumper` which will dump thread data if testing is assumed to be deadlocked. ### Other Changes +#### Dependency Updates + +- Upgraded `azure-core` from `1.29.1` to `1.30.0`. + ## 1.9.1 (2022-06-03) ### Other Changes diff --git a/sdk/core/azure-core-test/README.md b/sdk/core/azure-core-test/README.md index c62eb9d5d6cd..36cbc35b1617 100644 --- a/sdk/core/azure-core-test/README.md +++ b/sdk/core/azure-core-test/README.md @@ -18,7 +18,7 @@ To use this package, add the following to your _pom.xml_. com.azure azure-core-test - 1.9.1 + 1.10.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-test/pom.xml b/sdk/core/azure-core-test/pom.xml index a27bd1431ce8..aea2d04cdef2 100644 --- a/sdk/core/azure-core-test/pom.xml +++ b/sdk/core/azure-core-test/pom.xml @@ -13,7 +13,7 @@ com.azure azure-core-test jar - 1.10.0-beta.1 + 1.10.0 Microsoft Azure Java Core Test Library This package contains core test types for Azure Java clients. @@ -50,7 +50,7 @@ com.azure azure-core - 1.30.0-beta.1 + 1.30.0 diff --git a/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md b/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md index 23281c23db45..317c9d940a58 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md +++ b/sdk/core/azure-core-tracing-opentelemetry/CHANGELOG.md @@ -1,14 +1,12 @@ # Release History -## 1.0.0-beta.26 (Unreleased) +## 1.0.0-beta.26 (2022-06-30) -### Features Added - -### Breaking Changes +### Other Changes -### Bugs Fixed +#### Dependency Updates -### Other Changes +- Upgraded `azure-core` from `1.29.1` to `1.30.0`. ## 1.0.0-beta.25 (2022-06-03) diff --git a/sdk/core/azure-core-tracing-opentelemetry/README.md b/sdk/core/azure-core-tracing-opentelemetry/README.md index 2aae0b3b0924..3df61b96b248 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/README.md +++ b/sdk/core/azure-core-tracing-opentelemetry/README.md @@ -51,7 +51,7 @@ To enable Azure SDK tracing, add the latest `com.azure:azure-core-tracing-opente com.azure azure-core-tracing-opentelemetry - 1.0.0-beta.25 + 1.0.0-beta.26 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core-tracing-opentelemetry/pom.xml b/sdk/core/azure-core-tracing-opentelemetry/pom.xml index 1fc627b24b45..051ca00010dc 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/pom.xml +++ b/sdk/core/azure-core-tracing-opentelemetry/pom.xml @@ -47,7 +47,7 @@ com.azure azure-core - 1.30.0-beta.1 + 1.30.0 com.google.code.findbugs @@ -66,13 +66,13 @@ com.azure azure-core-test - 1.10.0-beta.1 + 1.10.0 test com.azure azure-core-http-netty - 1.13.0-beta.1 + 1.12.3 test diff --git a/sdk/core/azure-core/CHANGELOG.md b/sdk/core/azure-core/CHANGELOG.md index 8b9229707557..72be0ee5b691 100644 --- a/sdk/core/azure-core/CHANGELOG.md +++ b/sdk/core/azure-core/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 1.30.0-beta.1 (Unreleased) +## 1.30.0 (2022-06-30) ### Features Added @@ -17,8 +17,6 @@ - Added ability to get and set `ProgressReporter` on `Context`. - Added `HttpPipelineCallContext.getContext()`. -### Breaking Changes - ### Bugs Fixed - Fixed bug where `BinaryData.fromFile(path).toFluxByteBuffer()` and `BinaryData.fromFile(path).toBytes()` @@ -27,6 +25,11 @@ ### Other Changes +#### Dependency Updates + +- Upgraded Reactor from `3.4.17` to `3.4.19`. +- Upgraded Jackson from `2.13.2.2` to `2.13.3`. + ## 1.29.1 (2022-06-03) ### Other changes diff --git a/sdk/core/azure-core/README.md b/sdk/core/azure-core/README.md index bf2b0ae88156..1ecefca8aa47 100644 --- a/sdk/core/azure-core/README.md +++ b/sdk/core/azure-core/README.md @@ -58,7 +58,7 @@ add the direct dependency to your project as follows. com.azure azure-core - 1.29.1 + 1.30.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/core/azure-core/pom.xml b/sdk/core/azure-core/pom.xml index 937e90799798..61267a484d79 100644 --- a/sdk/core/azure-core/pom.xml +++ b/sdk/core/azure-core/pom.xml @@ -15,7 +15,7 @@ com.azure azure-core jar - 1.30.0-beta.1 + 1.30.0 Microsoft Azure Java Core Library This package contains core types for Azure Java clients. diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/BearerTokenAuthenticationPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/BearerTokenAuthenticationPolicy.java index 2bfb6a811f7d..7daeca761f60 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/BearerTokenAuthenticationPolicy.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/BearerTokenAuthenticationPolicy.java @@ -19,8 +19,7 @@ import static com.azure.core.util.AuthorizationChallengeHandler.WWW_AUTHENTICATE; /** - * The pipeline policy that applies a token credential to an HTTP request - * with "Bearer" scheme. + * The pipeline policy that applies a token credential to an HTTP request with "Bearer" scheme. */ public class BearerTokenAuthenticationPolicy implements HttpPipelinePolicy { private static final ClientLogger LOGGER = new ClientLogger(BearerTokenAuthenticationPolicy.class); @@ -61,13 +60,13 @@ public Mono authorizeRequest(HttpPipelineCallContext context) { * @param context The request context. */ public void authorizeRequestSync(HttpPipelineCallContext context) { - setAuthorizationHeaderSync(context, new TokenRequestContext().addScopes(scopes), false); + setAuthorizationHeaderHelperSync(context, new TokenRequestContext().addScopes(scopes), false); } /** - * Handles the authentication challenge in the event a 401 response with a WWW-Authenticate authentication - * challenge header is received after the initial request and returns appropriate {@link TokenRequestContext} to - * be used for re-authentication. + * Handles the authentication challenge in the event a 401 response with a WWW-Authenticate authentication challenge + * header is received after the initial request and returns appropriate {@link TokenRequestContext} to be used for + * re-authentication. * * @param context The request context. * @param response The Http Response containing the authentication challenge header. @@ -78,9 +77,9 @@ public Mono authorizeRequestOnChallenge(HttpPipelineCallContext context } /** - * Handles the authentication challenge in the event a 401 response with a WWW-Authenticate authentication - * challenge header is received after the initial request and returns appropriate {@link TokenRequestContext} to - * be used for re-authentication. + * Handles the authentication challenge in the event a 401 response with a WWW-Authenticate authentication challenge + * header is received after the initial request and returns appropriate {@link TokenRequestContext} to be used for + * re-authentication. * * @param context The request context. * @param response The Http Response containing the authentication challenge header. @@ -161,9 +160,18 @@ public Mono setAuthorizationHeader(HttpPipelineCallContext context, TokenR return setAuthorizationHeaderHelper(context, tokenRequestContext, true); } + /** + * Authorizes the request with the bearer token acquired using the specified {@code tokenRequestContext} + * + * @param context the HTTP pipeline context. + * @param tokenRequestContext the token request context to be used for token acquisition. + */ + public void setAuthorizationHeaderSync(HttpPipelineCallContext context, TokenRequestContext tokenRequestContext) { + setAuthorizationHeaderHelperSync(context, tokenRequestContext, true); + } + private Mono setAuthorizationHeaderHelper(HttpPipelineCallContext context, - TokenRequestContext tokenRequestContext, - boolean checkToForceFetchToken) { + TokenRequestContext tokenRequestContext, boolean checkToForceFetchToken) { return cache.getToken(tokenRequestContext, checkToForceFetchToken) .flatMap(token -> { context.getHttpRequest().getHeaders().set(AUTHORIZATION_HEADER, BEARER + " " + token.getToken()); @@ -171,8 +179,8 @@ private Mono setAuthorizationHeaderHelper(HttpPipelineCallContext context, }); } - private void setAuthorizationHeaderSync(HttpPipelineCallContext context, - TokenRequestContext tokenRequestContext, boolean checkToForceFetchToken) { + private void setAuthorizationHeaderHelperSync(HttpPipelineCallContext context, + TokenRequestContext tokenRequestContext, boolean checkToForceFetchToken) { AccessToken token = cache.getTokenSync(tokenRequestContext, checkToForceFetchToken); context.getHttpRequest().getHeaders().set(AUTHORIZATION_HEADER, BEARER + " " + token.getToken()); } diff --git a/sdk/e2e/pom.xml b/sdk/e2e/pom.xml index eea1126022c5..775f696bb471 100644 --- a/sdk/e2e/pom.xml +++ b/sdk/e2e/pom.xml @@ -29,12 +29,12 @@ com.azure azure-core - 1.30.0-beta.1 + 1.30.0 com.azure azure-core-http-netty - 1.13.0-beta.1 + 1.12.3 com.azure @@ -70,7 +70,7 @@ com.azure azure-core-test - 1.10.0-beta.1 + 1.10.0 test diff --git a/sdk/servicebus/azure-messaging-servicebus/pom.xml b/sdk/servicebus/azure-messaging-servicebus/pom.xml index cc71181926e5..25aea84e35cd 100644 --- a/sdk/servicebus/azure-messaging-servicebus/pom.xml +++ b/sdk/servicebus/azure-messaging-servicebus/pom.xml @@ -53,7 +53,7 @@ com.azure azure-core-amqp - 2.6.0-beta.1 + 2.6.0 com.azure