Bumping to the 3.0.2-SNAPSHOT and fixing URL

blackducksoftware · Apr 17, 2017 · 7e52e6b · 7e52e6b
1 parent 2b2540b
commit 7e52e6b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 13 deletions.
diff --git a/agent/pom.xml b/agent/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.blackducksoftware.integration</groupId>
     <artifactId>hub-teamcity</artifactId>
-    <version>3.0.1</version>
+    <version>3.0.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>hub-teamcity-agent</artifactId>

diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.blackducksoftware.integration</groupId>
     <artifactId>hub-teamcity</artifactId>
-    <version>3.0.1</version>
+    <version>3.0.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>hub-teamcity-assembly</artifactId>

diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.blackducksoftware.integration</groupId>
     <artifactId>hub-teamcity</artifactId>
-    <version>3.0.1</version>
+    <version>3.0.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>hub-teamcity-common</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
   </parent>
 
   <artifactId>hub-teamcity</artifactId>
-  <version>3.0.1</version>
+  <version>3.0.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Black Duck Hub Plugin for TeamCity</name>

diff --git a/server/pom.xml b/server/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.blackducksoftware.integration</groupId>
     <artifactId>hub-teamcity</artifactId>
-    <version>3.0.1</version>
+    <version>3.0.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>hub-teamcity-server</artifactId>

diff --git a/server/src/main/resources/buildServerResources/hubGlobalServerConfigTab.jsp b/server/src/main/resources/buildServerResources/hubGlobalServerConfigTab.jsp
@@ -1,10 +1,10 @@
 <%@ include file="/include.jsp" %>
 <%@ taglib prefix="forms" tagdir="/WEB-INF/tags/forms" %>
 
-<link href="${teamcityBaseUrl}${teamcityPluginResourcesPath}font-awesome-4.5.0/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
-
 <jsp:useBean id="hubConfigPersistenceManager" type="com.blackducksoftware.integration.hub.teamcity.server.global.ServerHubConfigPersistenceManager" scope="request" />
-<jsp:useBean id="teamcityBaseUrl" type="java.lang.String" scope="request"/>
+
+<c:url var="controllerUrl" value="/admin/hub/serverHubConfigTab.html"/>
+<c:url var="closeLogoUrl" value="${teamcityPluginResourcesPath}images/close.gif"/>
 
 <bs:linkScript>
     /js/bs/testConnection.js
@@ -207,7 +207,7 @@
 </script>
 
 <div id="bdHubContainer">
-    <form id="bdHubForm" action="${teamcityBaseUrl}/admin/hub/serverHubConfigTab.html" autocomplete="off">
+    <form id="bdHubForm" action="${controllerUrl}" autocomplete="off">
         <h3>Hub Settings</h3>
         <table border="0" style="width: 100%">
             <tr>
@@ -386,7 +386,6 @@
         <div class="saveButtonsBlock" id="saveButtonsBlock">
             <input type="button" value="Save" id=saveButton class="btn btn_primary submitButton" onclick="Config.save();"></input>
             <input type="button" value="Test connection" class="btn btn_primary submitButton" id="testConnection" onclick="TestConnectionDialog.testConnection();"></input>
-            <i id="saving" style="display: none;" class="fa fa-spinner fa-spin fa-fw"></i>
             <input type="hidden" id="publicKey" name="publicKey" value="<c:out value='${hubConfigPersistenceManager.hexEncodedPublicKey}'/>" />
         </div>
     </form>
@@ -396,7 +395,7 @@
     <div class="dialogHeader">
         <div class="closeWindow">
             <a title="Close dialog window" onclick="BS.TestConnectionDialog.close();" showdiscardchangesmessage='false'>
-                <img src="${teamcityBaseUrl}${teamcityPluginResourcesPath}images/close.gif" />
+                <img src="${closeLogoUrl}" />
             </a>
         </div>
         <div class="dialogHandle">
@@ -414,7 +413,7 @@
     <div class="dialogHeader">
         <div class="closeWindow">
             <a title="Close dialog window" onclick="Config.close();" showdiscardchangesmessage='false'>
-                <img src="${teamcityBaseUrl}${teamcityPluginResourcesPath}images/close.gif" />
+                <img src="${closeLogoUrl}" />
             </a>
         </div>
         <div class="dialogHandle">

diff --git a/server/src/main/resources/buildServerResources/hubRiskReportTab.jsp b/server/src/main/resources/buildServerResources/hubRiskReportTab.jsp
@@ -13,5 +13,5 @@
 	         frame.height = frame.contentWindow.document.body.scrollHeight;
 	      }, 200);
 	    };
-	    frame.src="${teamcityBaseUrl}${hubRiskReportUrl}";
+	    frame.src="${hubRiskReportUrl}";
 	</script>