Merge branch 'endgame-june' into qianjin-endgame-june-fix

shenqianjin · shenqianjin · commit 4d8fb06412a3 · 2021-06-23T13:02:34.000+08:00
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle b/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle
@@ -31,6 +31,7 @@ processResources {
 }
 
 group 'com.microsoft.azuretools'
+apply plugin: 'java'
 
 compileJava {
     sourceCompatibility = javaVersion
@@ -139,7 +140,6 @@ configurations {
         extendsFrom testRuntime
     }
 }
-apply plugin: 'java'
 
 dependencyManagement {
     imports {
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/plugin.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/plugin.xml
@@ -25,26 +25,10 @@
   <change-notes>
     <![CDATA[
     <html>
-        <h3>3.53.0</h3>
+        <h3>3.54.0</h3>
         <h4>Added</h4>
-        <ul>
-            <li>Management workflow for Azure SQL Server</li>
-        
-            <li>New login ui for service principal authentication</li>
-        </ul>
-        <h4>Changed</h4>
-        <ul>
-            <li>Deprecated file based service principal authentication</li>
-        </ul>
         <h4>Fixed</h4>
-        <ul>
-            <li>
-                <a href="https://github.com/microsoft/azure-tools-for-java/pull/5228">PR #5228</a>
-                Fix OAuth/Device login could not be cancelled
-            </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>
+        <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>
     ]]>
   </change-notes>
diff --git a/Utils/pom.xml b/Utils/pom.xml
@@ -235,13 +235,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>com.microsoft.azure</groupId>
-                <artifactId>azure-toolkit-libs</artifactId>
-                <version>${azure.toolkit-lib.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>com.spotify</groupId>
                 <artifactId>docker-client</artifactId>
@@ -411,6 +404,13 @@
                 <version>${powermock.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>com.microsoft.azure</groupId>
+                <artifactId>azure-toolkit-libs</artifactId>
+                <version>0.9.0</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ processResources {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`group 'com.microsoft.azuretools'`
	`34`	`+apply plugin: 'java'`
`34`	`35`
`35`	`36`	`compileJava {`
`36`	`37`	`sourceCompatibility = javaVersion`
`@@ -139,7 +140,6 @@ configurations {`
`139`	`140`	`extendsFrom testRuntime`
`140`	`141`	`}`
`141`	`142`	`}`
`142`		`-apply plugin: 'java'`
`143`	`143`
`144`	`144`	`dependencyManagement {`
`145`	`145`	`imports {`