[github #1110][devops #1764036]: update version of `azure-auth-helper…

…` in depender
microsoft · Aug 25, 2020 · cc85087 · cc85087
1 parent 2fae287
commit cc85087
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/azure-maven-plugin-lib/pom.xml b/azure-maven-plugin-lib/pom.xml
@@ -34,7 +34,7 @@
         <powermock.version>2.0.2</powermock.version>
         <jaxb.version>2.3.2</jaxb.version>
         <zeroturnaround.zip.version>1.13</zeroturnaround.zip.version>
-        <azure.auth.helper.version>0.5.1</azure.auth.helper.version>
+        <azure.auth.helper.version>0.6.0-SNAPSHOT</azure.auth.helper.version>
         <azure-tools-common.version>0.6.0</azure-tools-common.version>
         <commons.collections4.version>4.4</commons.collections4.version>
     </properties>

diff --git a/azure-maven-plugin/pom.xml b/azure-maven-plugin/pom.xml
@@ -34,6 +34,8 @@
         <surefire.version>2.22.0</surefire.version>
         <mockito.version>2.28.2</mockito.version>
         <jacoco.version>0.8.4</jacoco.version>
+        <azure.auth.helper.version>0.6.0-SNAPSHOT</azure.auth.helper.version>
+        <azure.tools.common.version>0.3.0</azure.tools.common.version>
     </properties>
 
     <licenses>
@@ -97,9 +99,13 @@
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-auth-helper</artifactId>
-            <version>0.1.0</version>
+            <version>${azure.auth.helper.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-tools-common</artifactId>
+            <version>${azure.tools.common.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>

diff --git a/azure-maven-plugin/src/main/java/com/microsoft/azure/plugin/login/LoginMojo.java b/azure-maven-plugin/src/main/java/com/microsoft/azure/plugin/login/LoginMojo.java
@@ -11,10 +11,10 @@
 import com.microsoft.azure.auth.AzureCredential;
 import com.microsoft.azure.auth.exception.AzureLoginFailureException;
 import com.microsoft.azure.auth.exception.DesktopNotSupportedException;
+import com.microsoft.azure.common.utils.TextUtils;
 import com.microsoft.azure.management.Azure;
 import com.microsoft.azure.management.Azure.Authenticated;
 import com.microsoft.azure.management.resources.Subscription;
-import com.microsoft.azure.maven.common.utils.TextUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Mojo;

diff --git a/...e-maven-plugin/src/main/java/com/microsoft/azure/plugin/login/SelectSubscriptionMojo.java b/...e-maven-plugin/src/main/java/com/microsoft/azure/plugin/login/SelectSubscriptionMojo.java
@@ -9,11 +9,11 @@
 import com.microsoft.azure.PagedList;
 import com.microsoft.azure.auth.AzureAuthHelper;
 import com.microsoft.azure.auth.AzureCredential;
+import com.microsoft.azure.common.utils.TextUtils;
 import com.microsoft.azure.credentials.AzureTokenCredentials;
 import com.microsoft.azure.management.Azure;
 import com.microsoft.azure.management.Azure.Authenticated;
 import com.microsoft.azure.management.resources.Subscription;
-import com.microsoft.azure.maven.common.utils.TextUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;

diff --git a/azure-maven-plugin/src/test/java/com/microsoft/azure/plugin/login/TestHelper.java b/azure-maven-plugin/src/test/java/com/microsoft/azure/plugin/login/TestHelper.java
@@ -10,13 +10,13 @@
 import com.microsoft.applicationinsights.TelemetryClient;
 import com.microsoft.azure.Page;
 import com.microsoft.azure.PagedList;
+import com.microsoft.azure.common.utils.JsonUtils;
 import com.microsoft.azure.credentials.AzureTokenCredentials;
 import com.microsoft.azure.management.Azure;
 import com.microsoft.azure.management.Azure.Authenticated;
 import com.microsoft.azure.management.resources.Subscription;
 import com.microsoft.azure.management.resources.Subscriptions;
 import com.microsoft.azure.maven.common.telemetry.AppInsightHelper;
-import com.microsoft.azure.maven.common.utils.JsonUtils;
 import com.microsoft.rest.RestException;
 import org.apache.commons.lang3.SystemUtils;
 import org.mockito.ArgumentMatchers;

diff --git a/azure-spring-cloud-maven-plugin/pom.xml b/azure-spring-cloud-maven-plugin/pom.xml
@@ -35,7 +35,7 @@
         <appplatform.sdk.version>1.0.0-beta-2</appplatform.sdk.version>
         <mockito.version>2.28.2</mockito.version>
         <jacoco.version>0.8.4</jacoco.version>
-        <azure.auth.helper.version>0.5.1</azure.auth.helper.version>
+        <azure.auth.helper.version>0.6.0-SNAPSHOT</azure.auth.helper.version>
         <azure.storage.blob.version>11.0.1</azure.storage.blob.version>
         <dom4j.version>2.1.3</dom4j.version>
         <jtwig.core.version>5.87.0.RELEASE</jtwig.core.version>