Updated poms, changelogs, and readmes for jan22 patch (#26453)

* Updated poms, changelogs, and readmes for jan22 patch * Cleaned up some missed conflict tags * Removed leftover merge tag * Add Base Test Compile using Java 8 when JDK is 9 or Above (#26392) Add Base Test Compile using Java 8 when JDK is 9 or Above * Ci fix * Transition Storage SDKs to New Codesnippet Tooling (#25346) Transition Storage SDKs to New Codesnippet Tooling * Fix Rev API Issues Jan 2022 (#26455) * Updated changelog dates Co-authored-by: Alan Zimmer <[email protected]> Co-authored-by: Vinay Gera <[email protected]>
Azure · Jan 14, 2022 · 89a3229 · 89a3229
1 parent 3df426d
commit 89a3229
Show file tree

Hide file tree

Showing 112 changed files with 12,799 additions and 1,602 deletions.
diff --git a/eng/code-quality-reports/src/main/resources/revapi/revapi.json b/eng/code-quality-reports/src/main/resources/revapi/revapi.json
@@ -201,7 +201,37 @@
           "code": "java.method.added",
           "new": "method java.lang.Class<T> com.azure.core.util.serializer.TypeReference<T>::getJavaClass()",
           "justification": "New method added to TypeReference in azure-core."
-        }
+        },
+        {
+           "code": "java.method.added",
+           "new": "method void com.azure.core.util.logging.ClientLogger::<init>(java.lang.Class<?>, java.util.Map<java.lang.String, java.lang.Object>)",
+           "justification": "New method added to ClientLogger in azure-core:1.24.0"
+         },
+         {
+           "code": "java.method.added",
+           "new": "method void com.azure.core.util.logging.ClientLogger::<init>(java.lang.String, java.util.Map<java.lang.String, java.lang.Object>)",
+           "justification": "New method added to ClientLogger in azure-core:1.24.0"
+         },
+         {
+           "code": "java.method.added",
+           "new": "method com.azure.core.util.logging.LoggingEventBuilder com.azure.core.util.logging.ClientLogger::atError()",
+           "justification": "New method added to ClientLogger in azure-core:1.24.0"
+         },
+         {
+           "code": "java.method.added",
+           "new": "method com.azure.core.util.logging.LoggingEventBuilder com.azure.core.util.logging.ClientLogger::atInfo()",
+           "justification": "New method added to ClientLogger in azure-core:1.24.0"
+         },
+         {
+           "code": "java.method.added",
+           "new": "method com.azure.core.util.logging.LoggingEventBuilder com.azure.core.util.logging.ClientLogger::atVerbose()",
+           "justification": "New method added to ClientLogger in azure-core:1.24.0"
+         },
+         {
+           "code": "java.method.added",
+           "new": "method com.azure.core.util.logging.LoggingEventBuilder com.azure.core.util.logging.ClientLogger::atWarning()",
+           "justification": "New method added to ClientLogger in azure-core:1.24.0"
+         }
       ]
     }
   }

diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
@@ -283,17 +283,17 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-common</artifactId>
-      <version>12.15.0-beta.3</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
+      <version>12.14.2</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.15.0-beta.3</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
+      <version>12.14.3</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob-batch</artifactId>
-      <version>12.12.0-beta.3</version> <!-- {x-version-update;com.azure:azure-storage-blob-batch;current} -->
+      <version>12.11.3</version> <!-- {x-version-update;com.azure:azure-storage-blob-batch;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -303,7 +303,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob-cryptography</artifactId>
-      <version>12.15.0-beta.3</version> <!-- {x-version-update;com.azure:azure-storage-blob-cryptography;current} -->
+      <version>12.14.3</version> <!-- {x-version-update;com.azure:azure-storage-blob-cryptography;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -313,22 +313,22 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-file-share</artifactId>
-      <version>12.12.0-beta.3</version> <!-- {x-version-update;com.azure:azure-storage-file-share;current} -->
+      <version>12.11.3</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.8.0-beta.3</version> <!-- {x-version-update;com.azure:azure-storage-file-datalake;current} -->
+      <version>12.7.3</version> <!-- {x-version-update;com.azure:azure-storage-file-datalake;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-internal-avro</artifactId>
-      <version>12.2.0-beta.3</version> <!-- {x-version-update;com.azure:azure-storage-internal-avro;current} -->
+      <version>12.1.3</version> <!-- {x-version-update;com.azure:azure-storage-internal-avro;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-queue</artifactId>
-      <version>12.12.0-beta.3</version> <!-- {x-version-update;com.azure:azure-storage-queue;current} -->
+      <version>12.11.3</version> <!-- {x-version-update;com.azure:azure-storage-queue;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
@@ -126,17 +126,17 @@ com.azure:azure-security-keyvault-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-sdk-template;1.2.1-beta.2;1.2.1-beta.16
 com.azure:azure-spring-data-cosmos;3.16.0;3.17.0-beta.1
 com.azure:azure-spring-data-cosmos-test;3.0.0-beta.1;3.0.0-beta.1
-com.azure:azure-storage-blob;12.14.2;12.15.0-beta.3
-com.azure:azure-storage-blob-batch;12.11.2;12.12.0-beta.3
+com.azure:azure-storage-blob;12.14.2;12.14.3
+com.azure:azure-storage-blob-batch;12.11.2;12.11.3
 com.azure:azure-storage-blob-changefeed;12.0.0-beta.13;12.0.0-beta.14
-com.azure:azure-storage-blob-cryptography;12.14.2;12.15.0-beta.3
+com.azure:azure-storage-blob-cryptography;12.14.2;12.14.3
 com.azure:azure-storage-blob-nio;12.0.0-beta.13;12.0.0-beta.14
-com.azure:azure-storage-common;12.14.1;12.15.0-beta.3
-com.azure:azure-storage-file-share;12.11.2;12.12.0-beta.3
-com.azure:azure-storage-file-datalake;12.7.2;12.8.0-beta.3
-com.azure:azure-storage-internal-avro;12.1.2;12.2.0-beta.3
+com.azure:azure-storage-common;12.14.1;12.14.2
+com.azure:azure-storage-file-share;12.11.2;12.11.3
+com.azure:azure-storage-file-datalake;12.7.2;12.7.3
+com.azure:azure-storage-internal-avro;12.1.2;12.1.3
 com.azure:azure-storage-perf;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-storage-queue;12.11.2;12.12.0-beta.3
+com.azure:azure-storage-queue;12.11.2;12.11.3
 com.azure:azure-template-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-media-videoanalyzer-edge;1.0.0-beta.4;1.0.0-beta.5
 com.azure:azure-verticals-agrifood-farming;1.0.0-beta.2;1.0.0-beta.3

diff --git a/sdk/storage/azure-storage-blob-batch/CHANGELOG.md b/sdk/storage/azure-storage-blob-batch/CHANGELOG.md
@@ -1,14 +1,14 @@
 # Release History
 
-## 12.12.0-beta.3 (Unreleased)
+## 12.11.3 (2022-01-14)
 
-### Features Added
-
-### Breaking Changes
+### Other Changes
 
-### Bugs Fixed
+#### Dependency Updates
 
-### Other Changes
+- Upgraded `azure-core` from `1.22.0` to version `1.24.1`.
+- Upgraded `azure-core-http-netty` from `1.11.2` to version `1.11.6`.
+- Upgraded `azure-storage-blob` from `12.14.2` to version `12.14.3`.
 
 ## 12.12.0-beta.2 (2021-12-07)
 

diff --git a/sdk/storage/azure-storage-blob-batch/README.md b/sdk/storage/azure-storage-blob-batch/README.md
@@ -55,7 +55,7 @@ add the direct dependency to your project as follows.
 <dependency>
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-blob-batch</artifactId>
-  <version>12.11.2</version>
+  <version>12.11.3</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})

diff --git a/sdk/storage/azure-storage-blob-batch/pom.xml b/sdk/storage/azure-storage-blob-batch/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-storage-blob-batch</artifactId>
-  <version>12.12.0-beta.3</version> <!-- {x-version-update;com.azure:azure-storage-blob-batch;current} -->
+  <version>12.11.3</version> <!-- {x-version-update;com.azure:azure-storage-blob-batch;current} -->
 
   <name>Microsoft Azure client library for Blob Storage batching</name>
   <description>This module contains client library for Microsoft Azure Blob Storage batching.</description>
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.15.0-beta.3</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
+      <version>12.14.3</version> <!-- {x-version-update;com.azure:azure-storage-blob;current} -->
     </dependency>
 
     <!-- Added this dependency to include necessary annotations used by reactor core.
@@ -98,7 +98,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-common</artifactId>
-      <version>12.15.0-beta.3</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
+      <version>12.14.2</version> <!-- {x-version-update;com.azure:azure-storage-common;current} -->
       <classifier>tests</classifier>
       <type>test-jar</type>
       <scope>test</scope>

diff --git a/...torage/azure-storage-blob-batch/src/main/java/com/azure/storage/blob/batch/BlobBatch.java b/...torage/azure-storage-blob-batch/src/main/java/com/azure/storage/blob/batch/BlobBatch.java
@@ -45,7 +45,17 @@
  * <p>Azure Storage Blob batches are homogeneous which means a {@link #deleteBlob(String) delete} and {@link
  * #setBlobAccessTier(String, AccessTier) set tier} are not allowed to be in the same batch.</p>
  *
- * {@codesnippet com.azure.storage.blob.batch.BlobBatch.illegalBatchOperation}
+ * <!-- src_embed com.azure.storage.blob.batch.BlobBatch.illegalBatchOperation -->
+ * <pre>
+ * try &#123;
+ *     Response&lt;Void&gt; deleteResponse = batch.deleteBlob&#40;&quot;&#123;url of blob&#125;&quot;&#41;;
+ *     Response&lt;Void&gt; setTierResponse = batch.setBlobAccessTier&#40;&quot;&#123;url of another blob&#125;&quot;, AccessTier.HOT&#41;;
+ * &#125; catch &#40;UnsupportedOperationException ex&#41; &#123;
+ *     System.err.printf&#40;&quot;This will fail as Azure Storage Blob batch operations are homogeneous. Exception: %s%n&quot;,
+ *         ex.getMessage&#40;&#41;&#41;;
+ * &#125;
+ * </pre>
+ * <!-- end com.azure.storage.blob.batch.BlobBatch.illegalBatchOperation -->
  *
  * <p>Please refer to the <a href="https://docs.microsoft.com/rest/api/storageservices/blob-batch">Azure Docs</a>
  * for more information.</p>
@@ -109,7 +119,11 @@ public final class BlobBatch {
      *
      * <p><strong>Code sample</strong></p>
      *
-     * {@codesnippet com.azure.storage.blob.batch.BlobBatch.deleteBlob#String-String}
+     * <!-- src_embed com.azure.storage.blob.batch.BlobBatch.deleteBlob#String-String -->
+     * <pre>
+     * Response&lt;Void&gt; deleteResponse = batch.deleteBlob&#40;&quot;&#123;container name&#125;&quot;, &quot;&#123;blob name&#125;&quot;&#41;;
+     * </pre>
+     * <!-- end com.azure.storage.blob.batch.BlobBatch.deleteBlob#String-String -->
      *
      * @param containerName The container of the blob.
      * @param blobName The name of the blob.
@@ -127,7 +141,14 @@ public Response<Void> deleteBlob(String containerName, String blobName) {
      *
      * <p><strong>Code sample</strong></p>
      *
-     * {@codesnippet com.azure.storage.blob.batch.BlobBatch.deleteBlob#String-String-DeleteSnapshotsOptionType-BlobRequestConditions}
+     * <!-- src_embed com.azure.storage.blob.batch.BlobBatch.deleteBlob#String-String-DeleteSnapshotsOptionType-BlobRequestConditions -->
+     * <pre>
+     * BlobRequestConditions blobRequestConditions = new BlobRequestConditions&#40;&#41;.setLeaseId&#40;&quot;&#123;lease ID&#125;&quot;&#41;;
+     *
+     * Response&lt;Void&gt; deleteResponse = batch.deleteBlob&#40;&quot;&#123;container name&#125;&quot;, &quot;&#123;blob name&#125;&quot;,
+     *     DeleteSnapshotsOptionType.INCLUDE, blobRequestConditions&#41;;
+     * </pre>
+     * <!-- end com.azure.storage.blob.batch.BlobBatch.deleteBlob#String-String-DeleteSnapshotsOptionType-BlobRequestConditions -->
      *
      * @param containerName The container of the blob.
      * @param blobName The name of the blob.
@@ -148,7 +169,11 @@ public Response<Void> deleteBlob(String containerName, String blobName,
      *
      * <p><strong>Code sample</strong></p>
      *
-     * {@codesnippet com.azure.storage.blob.batch.BlobBatch.deleteBlob#String}
+     * <!-- src_embed com.azure.storage.blob.batch.BlobBatch.deleteBlob#String -->
+     * <pre>
+     * Response&lt;Void&gt; deleteResponse = batch.deleteBlob&#40;&quot;&#123;url of blob&#125;&quot;&#41;;
+     * </pre>
+     * <!-- end com.azure.storage.blob.batch.BlobBatch.deleteBlob#String -->
      *
      * @param blobUrl URL of the blob. Blob name must be encoded to UTF-8.
      * @return a {@link Response} that will be used to associate this operation to the response when the batch is
@@ -164,7 +189,14 @@ public Response<Void> deleteBlob(String blobUrl) {
      *
      * <p><strong>Code sample</strong></p>
      *
-     * {@codesnippet com.azure.storage.blob.batch.BlobBatch.deleteBlob#String-DeleteSnapshotsOptionType-BlobRequestConditions}
+     * <!-- src_embed com.azure.storage.blob.batch.BlobBatch.deleteBlob#String-DeleteSnapshotsOptionType-BlobRequestConditions -->
+     * <pre>
+     * BlobRequestConditions blobRequestConditions = new BlobRequestConditions&#40;&#41;.setLeaseId&#40;&quot;&#123;lease ID&#125;&quot;&#41;;
+     *
+     * Response&lt;Void&gt; deleteResponse = batch.deleteBlob&#40;&quot;&#123;url of blob&#125;&quot;, DeleteSnapshotsOptionType.INCLUDE,
+     *     blobRequestConditions&#41;;
+     * </pre>
+     * <!-- end com.azure.storage.blob.batch.BlobBatch.deleteBlob#String-DeleteSnapshotsOptionType-BlobRequestConditions -->
      *
      * @param blobUrl URL of the blob. Blob name must be encoded to UTF-8.
      * @param deleteOptions Delete options for the blob and its snapshots.
@@ -190,7 +222,11 @@ private Response<Void> deleteBlobHelper(String urlPath, DeleteSnapshotsOptionTyp
      *
      * <p><strong>Code sample</strong></p>
      *
-     * {@codesnippet com.azure.storage.blob.batch.BlobBatch.setBlobAccessTier#String-String-AccessTier}
+     * <!-- src_embed com.azure.storage.blob.batch.BlobBatch.setBlobAccessTier#String-String-AccessTier -->
+     * <pre>
+     * Response&lt;Void&gt; setTierResponse = batch.setBlobAccessTier&#40;&quot;&#123;container name&#125;&quot;, &quot;&#123;blob name&#125;&quot;, AccessTier.HOT&#41;;
+     * </pre>
+     * <!-- end com.azure.storage.blob.batch.BlobBatch.setBlobAccessTier#String-String-AccessTier -->
      *
      * @param containerName The container of the blob.
      * @param blobName The name of the blob.
@@ -209,7 +245,12 @@ public Response<Void> setBlobAccessTier(String containerName, String blobName, A
      *
      * <p><strong>Code sample</strong></p>
      *
-     * {@codesnippet com.azure.storage.blob.batch.BlobBatch.setBlobAccessTier#String-String-AccessTier-String}
+     * <!-- src_embed com.azure.storage.blob.batch.BlobBatch.setBlobAccessTier#String-String-AccessTier-String -->
+     * <pre>
+     * Response&lt;Void&gt; setTierResponse = batch.setBlobAccessTier&#40;&quot;&#123;container name&#125;&quot;, &quot;&#123;blob name&#125;&quot;, AccessTier.HOT,
+     *     &quot;&#123;lease ID&#125;&quot;&#41;;
+     * </pre>
+     * <!-- end com.azure.storage.blob.batch.BlobBatch.setBlobAccessTier#String-String-AccessTier-String -->
      *
      * @param containerName The container of the blob.
      * @param blobName The name of the blob.
@@ -230,7 +271,11 @@ public Response<Void> setBlobAccessTier(String containerName, String blobName, A
      *
      * <p><strong>Code sample</strong></p>
      *
-     * {@codesnippet com.azure.storage.blob.batch.BlobBatch.setBlobAccessTier#String-AccessTier}
+     * <!-- src_embed com.azure.storage.blob.batch.BlobBatch.setBlobAccessTier#String-AccessTier -->
+     * <pre>
+     * Response&lt;Void&gt; setTierResponse = batch.setBlobAccessTier&#40;&quot;&#123;url of blob&#125;&quot;, AccessTier.HOT&#41;;
+     * </pre>
+     * <!-- end com.azure.storage.blob.batch.BlobBatch.setBlobAccessTier#String-AccessTier -->
      *
      * @param blobUrl URL of the blob. Blob name must be encoded to UTF-8.
      * @param accessTier The tier to set on the blob.
@@ -247,7 +292,11 @@ public Response<Void> setBlobAccessTier(String blobUrl, AccessTier accessTier) {
      *
      * <p><strong>Code sample</strong></p>
      *
-     * {@codesnippet com.azure.storage.blob.batch.BlobBatch.setBlobAccessTier#String-AccessTier-String}
+     * <!-- src_embed com.azure.storage.blob.batch.BlobBatch.setBlobAccessTier#String-AccessTier-String -->
+     * <pre>
+     * Response&lt;Void&gt; setTierResponse = batch.setBlobAccessTier&#40;&quot;&#123;url of blob&#125;&quot;, AccessTier.HOT, &quot;&#123;lease ID&#125;&quot;&#41;;
+     * </pre>
+     * <!-- end com.azure.storage.blob.batch.BlobBatch.setBlobAccessTier#String-AccessTier-String -->
      *
      * @param blobUrl URL of the blob. Blob name must be encoded to UTF-8.
      * @param accessTier The tier to set on the blob.
@@ -265,7 +314,12 @@ public Response<Void> setBlobAccessTier(String blobUrl, AccessTier accessTier, S
      *
      * <p><strong>Code sample</strong></p>
      *
-     * {@codesnippet com.azure.storage.blob.batch.BlobBatch.setBlobAccessTier#BlobBatchSetBlobAccessTierOptions}
+     * <!-- src_embed com.azure.storage.blob.batch.BlobBatch.setBlobAccessTier#BlobBatchSetBlobAccessTierOptions -->
+     * <pre>
+     * Response&lt;Void&gt; setTierResponse = batch.setBlobAccessTier&#40;
+     *     new BlobBatchSetBlobAccessTierOptions&#40;&quot;&#123;url of blob&#125;&quot;, AccessTier.HOT&#41;.setLeaseId&#40;&quot;&#123;lease ID&#125;&quot;&#41;&#41;;
+     * </pre>
+     * <!-- end com.azure.storage.blob.batch.BlobBatch.setBlobAccessTier#BlobBatchSetBlobAccessTierOptions -->
      *
      * @param options {@link BlobBatchSetBlobAccessTierOptions}
      * @return a {@link Response} that will be used to associate this operation to the response when the batch is