Remove azure-commons dependency (#275)

jenkinsci · May 10, 2021 · e999fe2 · e999fe2
1 parent 0bbd3d0
commit e999fe2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 38 deletions.
diff --git a/pom.xml b/pom.xml
@@ -54,7 +54,6 @@
         <findbugs.excludeFilterFile>findbugs-exclude.xml</findbugs.excludeFilterFile>
         <maven.javadoc.skip>true</maven.javadoc.skip>
         <azure-credentials.version>181.v00b0d97d2686</azure-credentials.version>
-        <azure-commons.version>1.1.3</azure-commons.version>
     </properties>
 
     <dependencyManagement>
@@ -80,17 +79,6 @@
             <artifactId>azure-credentials</artifactId>
             <version>${azure-credentials.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.jenkins-ci.plugins</groupId>
-            <artifactId>azure-commons-core</artifactId>
-            <version>${azure-commons.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>jsch</artifactId>

diff --git a/src/main/java/com/microsoft/azure/vmagent/AzureVMAgentTemplate.java b/src/main/java/com/microsoft/azure/vmagent/AzureVMAgentTemplate.java
@@ -1362,10 +1362,6 @@ public ListBoxModel doFillLocationItems(@RelativePath("..") @QueryParameter Stri
             return model;
         }
 
-        public ListBoxModel doFillAvailabilityTypeValueItems() {
-            return null;
-        }
-
         public ListBoxModel doFillAvailabilitySetItems(
                 @RelativePath("../..") @QueryParameter String azureCredentialsId,
                 @RelativePath("../..") @QueryParameter String resourceGroupReferenceType,
@@ -1511,10 +1507,6 @@ public ListBoxModel doFillDiskTypeItems() {
             return model;
         }
 
-        public ListBoxModel doFillImageReferenceTypeValueItems() {
-            return null;
-        }
-
         public FormValidation doAgentLaunchMethod(@QueryParameter String value) {
             if (Constants.LAUNCH_METHOD_JNLP.equals(value)) {
                 return FormValidation.warning(Messages.Azure_GC_LaunchMethod_Warn_Msg());

diff --git a/src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/config.jelly b/src/main/resources/com/microsoft/azure/vmagent/AzureVMAgentTemplate/config.jelly
@@ -1,6 +1,6 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:c="/lib/credentials"
-         xmlns:f="/lib/form" xmlns:ui="/lib/azure">
+         xmlns:f="/lib/form">
     <div>
         <f:section title="${%General_Configuration}">
             <f:entry title="${%Template_Name}" field="templateName"
@@ -26,15 +26,15 @@
                 <f:select/>
             </f:entry>
 
-            <ui:dropdownList title="${%Availability_Options}" selectedName="availabilityTypeValue" name="availabilityType" help="/plugin/azure-vm-agents/help-availability.html">
+            <f:dropdownList title="${%Availability_Options}" name="availabilityType" help="/plugin/azure-vm-agents/help-availability.html">
                 <f:dropdownListBlock title="${%No_Availability}" value="unknown" selected="${instance == null || instance.getAvailabilityType() == 'unknown'}">
                 </f:dropdownListBlock>
                 <f:dropdownListBlock title="${%Availability_Set}" value="availabilitySet" selected="${instance.getAvailabilitySet() != null}">
                     <f:entry title="${%name}" field="availabilitySet" help="/plugin/azure-vm-agents/help-availabilitySet.html">
                         <f:select/>
                     </f:entry>
                 </f:dropdownListBlock>
-            </ui:dropdownList>
+            </f:dropdownList>
 
             <f:entry title="${%Virtual_Machine_Size}" field="virtualMachineSize"
                      help="/plugin/azure-vm-agents/help-virtualMachineSize.html">
@@ -47,17 +47,17 @@
             </f:entry>
 
             <f:entry title="${%Storage_Account_Name}">
-                <ui:radioBlock name="storageAccountNameReferenceType" value="new" title="${%Storage_Account_Create_New}" checked="${instance == null || instance.isStorageAccountNameReferenceTypeEquals('new')}" inline="true">
+                <f:radioBlock name="storageAccountNameReferenceType" value="new" title="${%Storage_Account_Create_New}" checked="${instance == null || instance.isStorageAccountNameReferenceTypeEquals('new')}" inline="true">
                     <f:entry title="${%Name}" field="newStorageAccountName" help="/plugin/azure-vm-agents/help-storageAccountName.html">
                         <f:textbox/>
                     </f:entry>
-                </ui:radioBlock>
+                </f:radioBlock>
 
-                <ui:radioBlock name="storageAccountNameReferenceType" value="existing" title="${%Storage_Account_Use_Exist}" checked="${instance.isStorageAccountNameReferenceTypeEquals('existing')}" inline="true">
+                <f:radioBlock name="storageAccountNameReferenceType" value="existing" title="${%Storage_Account_Use_Exist}" checked="${instance.isStorageAccountNameReferenceTypeEquals('existing')}" inline="true">
                     <f:entry title="${%Name}" field="existingStorageAccountName" help="/plugin/azure-vm-agents/help-storageAccountName.html">
                         <f:select/>
                     </f:entry>
-                </ui:radioBlock>
+                </f:radioBlock>
             </f:entry>
 
             <f:entry title="${%Disk_Type}" field="diskType" help="/plugin/azure-vm-agents/help-diskType.html">
@@ -107,7 +107,7 @@
         </f:section>
 
         <f:section title="${%Image_Configuration}">
-            <ui:radioBlock name="imageTopLevelType" value="basic" title="${%Built_In_Image}" checked="${instance == null || instance.isTopLevelType('basic')}"
+            <f:radioBlock name="imageTopLevelType" value="basic" title="${%Built_In_Image}" checked="${instance == null || instance.isTopLevelType('basic')}"
                            inline="true">
                 <f:entry field="builtInImage">
                     <f:select/>
@@ -126,10 +126,10 @@
                         <f:checkbox/>
                     </f:entry>
                 </f:section>
-            </ui:radioBlock>
+            </f:radioBlock>
 
-            <ui:radioBlock name="imageTopLevelType" value="advanced" title="${%Advanced_Image}" checked="${instance.isTopLevelType('advanced')}" inline="true">
-                <ui:dropdownList selectedName="imageReferenceTypeValue" name="imageReference">
+            <f:radioBlock name="imageTopLevelType" value="advanced" title="${%Advanced_Image}" checked="${instance.isTopLevelType('advanced')}" inline="true">
+                <f:dropdownList name="imageReference">
                     <f:dropdownListBlock title="${%Custom_Image}" value="custom" selected="${instance == null || instance.isType('custom')}">
                         <f:entry title="${%Image}" field="uri" help="/plugin/azure-vm-agents/help-image.html">
                             <f:textbox/>
@@ -178,7 +178,7 @@
                             <f:textbox/>
                         </f:entry>
                     </f:dropdownListBlock>
-                </ui:dropdownList>
+                </f:dropdownList>
 
                 <f:entry title="${%Os_Type}" field="osType" help="/plugin/azure-vm-agents/help-osType.html">
                     <f:select/>
@@ -262,7 +262,7 @@
                         <f:textarea/>
                     </f:entry>
                 </f:advanced>
-            </ui:radioBlock>
+            </f:radioBlock>
         </f:section>
 
         <f:section title="${%Admin_Credentials}">

diff --git a/src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/config.jelly b/src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/config.jelly
@@ -1,6 +1,6 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
-         xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:c="/lib/credentials"  xmlns:ui="/lib/azure">
+         xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:c="/lib/credentials">
     <f:block>
         <a href="${rootURL}/log/${descriptor.logRecorderName}/" target="_blank">${%Azure_VM_Agent_Log_Link}</a>
     </f:block>
@@ -34,17 +34,17 @@
         </f:entry>
 
         <f:entry title="${%Resource_Group_Name}">
-            <ui:radioBlock name="resourceGroupReferenceType" value="new" title="${%Resource_Group_Create_New}" checked="${instance == null || instance.isResourceGroupReferenceTypeEquals('new')}" inline="true">
+            <f:radioBlock name="resourceGroupReferenceType" value="new" title="${%Resource_Group_Create_New}" checked="${instance == null || instance.isResourceGroupReferenceTypeEquals('new')}" inline="true">
                 <f:entry title="${%Name}" field="newResourceGroupName" help="/plugin/azure-vm-agents/help-resourceGroupName.html">
                     <f:textbox/>
                 </f:entry>
-            </ui:radioBlock>
+            </f:radioBlock>
 
-            <ui:radioBlock name="resourceGroupReferenceType" value="existing" title="${%Resource_Group_Use_Exist}" checked="${instance.isResourceGroupReferenceTypeEquals('existing')}" inline="true">
+            <f:radioBlock name="resourceGroupReferenceType" value="existing" title="${%Resource_Group_Use_Exist}" checked="${instance.isResourceGroupReferenceTypeEquals('existing')}" inline="true">
                 <f:entry title="${%Name}" field="existingResourceGroupName" help="/plugin/azure-vm-agents/help-resourceGroupName.html">
                     <f:select/>
                 </f:entry>
-            </ui:radioBlock>
+            </f:radioBlock>
         </f:entry>
 
         <f:validateButton title="${%Verify_Configuration}" progress="${%Verifying}" method="verifyConfiguration"