Revert " [BZ 1081564] Update rhq ui to support patch update increment…

…s when available."

This reverts commit e84817f.

modules/core/domain/src/main/java/org/rhq/core/domain/common/ProductInfo.java

@@ -39,7 +39,6 @@ public class ProductInfo implements Serializable {
     private String version;
     private String buildNumber;
     private String helpDocRoot;
-    private String updateVersion;
     private HashMap<String, String> helpViewContent;
 
     public String getShortName() {
@@ -129,12 +128,4 @@ public HashMap<String, String> getHelpViewContent() {
     public void setHelpViewContent(HashMap<String, String> helpViewContent) {
         this.helpViewContent = helpViewContent;
     }
-
-    public String getUpdateVersion() {
-        return updateVersion;
-    }
-
-    public void setUpdateVersion(String updateVersion) {
-        this.updateVersion = updateVersion;
-    }
 }

modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/AboutModalWindow.java

@@ -71,14 +71,8 @@ private static Canvas buildAboutCanvas(ProductInfo productInfo) {
         productUrl.setWrap(false);
         productUrl.setWrapTitle(false);
 
-        //Conditionally check for and apply update/patch version details
-        String updatePortion = productInfo.getUpdateVersion();
-        if (updatePortion == null) {
-            updatePortion = "";
-        }
-
         StaticTextItem version = new StaticTextItem("version", MSG.view_aboutBox_version());
-        version.setValue(productInfo.getVersion() + (updatePortion.trim().length() == 0 ? "" : " " + updatePortion));
+        version.setValue(productInfo.getVersion());
         version.setWrap(false);
         version.setWrapTitle(false);
 

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java

@@ -62,6 +62,7 @@
 public class CoreServer implements CoreServerMBean {
     private static final String PRODUCT_INFO_PROPERTIES_RESOURCE_PATH =
             "org/rhq/enterprise/server/core/ProductInfo.properties";
+
     private static final Log LOG = LogFactory.getLog(CoreServer.class);
 
     /**
@@ -221,9 +222,6 @@ public ProductInfo getProductInfo() {
             productInfo.setUrl(props.getProperty("url"));
             productInfo.setVersion(props.getProperty("version"));
 
-            // Update property which records update/patch version: Ex. update-1, cp1, etc.
-            productInfo.setUpdateVersion(ProductUpdates.getUpdateVersion());
-
             HashMap<String, String> helpViewContent = new HashMap<String, String>();
 
             for (String propertyName : props.stringPropertyNames()) {