Merge remote-tracking branch 'origin/endgame-202309' into endgame-202…

…309.2021.3
microsoft · Oct 8, 2023 · 357b8dd · 357b8dd
2 parents c6bd233 + 16ec9ff
commit 357b8dd
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -103,6 +103,10 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
   - [3.0.7](#307)
   - [3.0.6](#306)
 
+## 3.81.1
+### Fixed
+- [#7897](https://github.com/microsoft/azure-tools-for-java/issues/7897): Uncaught Exception: Error was received while reading the incoming data. The connection will be closed.
+
 ## 3.81.0
 ### Added
 - Bring all new feature to IntelliJ IDEA 2021.3

diff --git a/...lkit-for-intellij/azure-intellij-plugin-lib-java/src/main/resources/whatsnew.md b/...lkit-for-intellij/azure-intellij-plugin-lib-java/src/main/resources/whatsnew.md
@@ -1,6 +1,10 @@
 <!-- Version: 3.80.0 -->
 # What's new in Azure Toolkit for IntelliJ
 
+## 3.81.1
+### Fixed
+- [#7897](https://github.com/microsoft/azure-tools-for-java/issues/7897): Uncaught Exception: Error was received while reading the incoming data. The connection will be closed.
+
 ## 3.81.0
 ### Added
 - Bring all new feature to IntelliJ IDEA 2021.3

diff --git a/...n/java/com/microsoft/azure/toolkit/intellij/azuresdk/service/WorkspaceTaggingService.java b/...n/java/com/microsoft/azure/toolkit/intellij/azuresdk/service/WorkspaceTaggingService.java
@@ -33,7 +33,7 @@ public static String getWorkspaceTag(@Nonnull String groupId, @Nonnull final Str
         if (StringUtils.isAnyEmpty(groupId, artifactId)) {
             return null;
         }
-        return ObjectUtils.firstNonNull(getAzureDependencyTag(groupId, artifactId), getExternalDependencyTag(groupId, artifactId));
+        return ObjectUtils.firstNonNull(getExternalDependencyTag(groupId, artifactId), getAzureDependencyTag(groupId, artifactId));
     }
 
     private static String getAzureDependencyTag(final String groupId, final String artifactId) {

diff --git a/.../azure-toolkit-for-intellij/azure-sdk-reference-book/src/main/resources/workspaceTag.json b/.../azure-toolkit-for-intellij/azure-sdk-reference-book/src/main/resources/workspaceTag.json
@@ -27,5 +27,47 @@
 	// unit test
 	{ "groupId": "org.junit.jupiter", "artifactId": "junit-jupiter-api", "tag": "unitTest" },
 	{ "groupId": "junit", "artifactId": "junit", "tag": "unitTest" },
-	{ "groupId": "org.testng", "artifactId": "testng", "tag": "unitTest" }
+	{ "groupId": "org.testng", "artifactId": "testng", "tag": "unitTest" },
+	// cosmos
+	{ "groupId": "com.azure.spring", "artifactId": "spring-cloud-azure-starter-data-cosmos", "tag": "cosmos" },
+	{ "groupId": "com.azure", "artifactId": "azure-cosmos", "tag": "cosmos" },
+	{ "groupId": "com.azure.spring", "artifactId": "spring-cloud-azure-starter-cosmos", "tag": "cosmos" },
+	{ "groupId": "com.azure", "artifactId": "zure-cosmos-test", "tag": "cosmos" },
+	{ "groupId": "com.azure", "artifactId": "azure-spring-data-cosmos-core", "tag": "cosmos" },
+	// storage account
+	{ "groupId": "com.azure.spring", "artifactId": "spring-cloud-azure-starter-storage", "tag": "azure_storage" },
+	{ "groupId": "com.azure", "artifactId": "azure-storage-blob", "tag": "azure_storage" },
+	{ "groupId": "com.azure", "artifactId": "azure-storage-file-share", "tag": "azure_storage" },
+	{ "groupId": "com.azure", "artifactId": "azure-storage-queue", "tag": "azure_storage" },
+	{ "groupId": "com.azure", "artifactId": "azure-storage-blob-batch", "tag": "azure_storage" },
+	{ "groupId": "com.azure", "artifactId": "azure-storage-blob-changefeed", "tag": "azure_storage" },
+	{ "groupId": "com.azure", "artifactId": "azure-storage-blob-cryptography", "tag": "azure_storage" },
+	{ "groupId": "com.azure", "artifactId": "azure-storage-blob-nio", "tag": "azure_storage" },
+	{ "groupId": "com.azure", "artifactId": "azure-storage-file-datalake", "tag": "azure_storage" },
+	{ "groupId": "com.azure", "artifactId": "azure-storage-internal-avro", "tag": "azure_storage" },
+	{ "groupId": "com.azure.spring", "artifactId": "spring-cloud-azure-starter-storage-blob", "tag": "azure_storage" },
+	{ "groupId": "com.azure.spring", "artifactId": "spring-cloud-azure-starter-storage-file-share", "tag": "azure_storage" },
+	{ "groupId": "com.azure.spring", "artifactId": "spring-cloud-azure-starter-storage-queue", "tag": "azure_storage" },
+	{ "groupId": "com.azure.spring", "artifactId": "spring-cloud-azure-starter-integration-storage-queue", "tag": "azure_storage" },
+	{ "groupId": "com.azure.spring", "artifactId": "spring-integration-azure-storage-queue", "tag": "azure_storage" },
+	// service bus
+	{ "groupId": "com.azure", "artifactId": "azure-messaging-servicebus", "tag": "servicebus" },
+	{ "groupId": "com.azure.spring", "artifactId": "spring-cloud-azure-starter-servicebus", "tag": "servicebus" },
+	{ "groupId": "com.azure.spring", "artifactId": "spring-cloud-azure-starter-integration-servicebus", "tag": "servicebus" },
+	{ "groupId": "com.azure.spring", "artifactId": "spring-integration-azure-servicebus", "tag": "servicebus" },
+	{ "groupId": "com.azure.spring", "artifactId": "spring-cloud-azure-stream-binder-servicebus", "tag": "servicebus" },
+	{ "groupId": "com.azure.spring", "artifactId": "spring-cloud-azure-starter-servicebus-jms", "tag": "servicebus" },
+	// event hubs
+	{ "groupId": "com.azure", "artifactId": "azure-messaging-eventhubs", "tag": "eventhubs" },
+	{ "groupId": "com.azure", "artifactId": "azure-messaging-eventhubs-parent", "tag": "eventhubs" },
+	{ "groupId": "com.azure.spring", "artifactId": "spring-cloud-azure-starter-eventhubs", "tag": "eventhubs" },
+	{ "groupId": "com.azure.spring", "artifactId": "spring-cloud-azure-starter-integration-eventhubs", "tag": "eventhubs" },
+	{ "groupId": "com.azure.spring", "artifactId": "spring-integration-azure-eventhubs", "tag": "eventhubs" },
+	{ "groupId": "com.azure.spring", "artifactId": "spring-cloud-azure-stream-binder-eventhubs", "tag": "eventhubs" },
+	// open ai
+	{ "groupId": "com.theokanning.openai-gpt3-java", "artifactId": "api", "tag": "openai" },
+	{ "groupId": "com.theokanning.openai-gpt3-java", "artifactId": "client", "tag": "openai" },
+	{ "groupId": "com.theokanning.openai-gpt3-java", "artifactId": "service", "tag": "openai" },
+	// azure open ai
+	{ "groupId": "com.azure", "artifactId": "azure-ai-openai", "tag": "azure_openai" }
 ]
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle b/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle
@@ -116,6 +116,9 @@ allprojects {
         implementation.exclude module: 'groovy-xml'
         implementation.exclude module: 'groovy-templates'
         implementation.exclude module: 'jna'
+        implementation.exclude module: 'xpp3'
+        implementation.exclude module: 'pull-parser'
+        implementation.exclude module: 'xsdlib'
         cucumberRuntime {
             extendsFrom testImplementation
         }

diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/resources/META-INF/plugin.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/resources/META-INF/plugin.xml
@@ -27,22 +27,10 @@
   <change-notes>
     <![CDATA[
     <html>
-      <h2 id="3-81-0">3.81.0</h2>
-      <h3 id="added">Added</h3>
-      <ul>
-      <li>Bring all new feature to IntelliJ IDEA 2021.3</li>
-      </ul>
-      <h3 id="changed">Changed</h3>
-      <ul>
-      <li>Upgrade Azure SDK to the latest.</li>
-      <li>More UI actions are tracked (Telemetry).</li>
-      <li>Resource Connections Explorer is deprecated.</li>
-      <li>Some minor UI updates.</li>
-      </ul>
+      <h2 id="3-81-1">3.81.1</h2>
       <h3 id="fixed">Fixed</h3>
       <ul>
-      <li>NPE when creating storage account if region is loading.</li>
-      <li>other known issues.</li>
+      <li><a href="https://github.com/microsoft/azure-tools-for-java/issues/7897">#7897</a>: Uncaught Exception: Error was received while reading the incoming data. The connection will be closed.</li>
       </ul>
       <p>You may get the full change log <a href="https://github.com/Microsoft/azure-tools-for-java/blob/develop/CHANGELOG.md">here</a></p>
     </html>