Merge pull request #358 from ggalmazor/issue_355_hardcoded_version

Issue 355 hardcoded version
getodk · Dec 26, 2018 · c1e4a77 · c1e4a77
2 parents c0353a5 + 42cbbf7
commit c1e4a77
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/main/java/org/opendatakit/aggregate/constants/common/UIConsts.java b/src/main/java/org/opendatakit/aggregate/constants/common/UIConsts.java
@@ -17,13 +17,10 @@
 package org.opendatakit.aggregate.constants.common;
 
 public class UIConsts {
-  public static final String VERSION_STRING = "v1.4.15 Production";
-
   public static final String KML_NONE_OPTION = "None";
   public static final String KML_NONE_ENCODE_KEY = "*NONE*";
 
   public static final String URI_DEFAULT = "no uuid";
-  public static final String FSC_URI_PARAM = "fsc";
   public static final String PREVIEW_PARAM = "previewImage";
   public static final String PREVIEW_SET = "&" + PREVIEW_PARAM + "=true";
   public static final String PREVIEW_IMAGE_STYLENAME = "thumbnail";

diff --git a/src/main/java/org/opendatakit/common/security/Realm.java b/src/main/java/org/opendatakit/common/security/Realm.java
@@ -15,7 +15,7 @@
  */
 package org.opendatakit.common.security;
 
-import org.opendatakit.aggregate.constants.common.UIConsts;
+import org.opendatakit.aggregate.buildconfig.BuildConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
@@ -48,10 +48,10 @@ public void afterPropertiesSet() {
       throw new IllegalStateException("realmString (e.g., mydomain.org ODK Aggregate 1.0) must be specified");
     }
     Logger log = LoggerFactory.getLogger(Realm.class);
-    log.info("Version: " + UIConsts.VERSION_STRING);
+    log.info("Version: " + BuildConfig.VERSION);
     log.info("Hostname: " + hostname);
-    log.info("Port: " + Integer.toString(port));
-    log.info("SecurePort: " + Integer.toString(securePort));
+    log.info("Port: " + port);
+    log.info("SecurePort: " + securePort);
     log.info("SslIsRequired: " + (sslIsRequired ? "yes" : "no"));
     log.info("SslIsAvailable: " + (sslIsAvailable ? "yes" : "no"));
     log.info("ForceHttpsLinks: " + (forceHttpsLinks ? "yes" : "no"));