diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java index ade47fb4949..b5f5d78f716 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java @@ -221,17 +221,6 @@ public DataverseFacet findFacet(Long id) { public List findAllDataverseFacets() { return em.createQuery("select object(o) from DataverseFacet as o order by o.display").getResultList(); - } - - private String appVersionString; - - /** - * @todo Remove this method, and make all the (a couple of) xhtml pages - * call the SystemConfig.getVersion method directly - * (I don't have time to do it now -- L.A. 4.0.2) - */ - public String getApplicationVersion() { - return systemConfig.getVersion(true); } public String getDataverseLogoThumbnailAsBase64(Dataverse dataverse, User user) { diff --git a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java index 72c92677a0d..bbc93d43598 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java @@ -66,10 +66,6 @@ public class SystemConfig { */ private static final int defaultZipUploadFilesLimit = 1000; - /** - * @todo Reconcile with getApplicationVersion on DataverseServiceBean.java - * which we'd like to move to this class. - */ private static String appVersionString = null; private static String buildNumberString = null; diff --git a/src/main/webapp/dataverse_template.xhtml b/src/main/webapp/dataverse_template.xhtml index 9a6f95392c7..614bd601058 100644 --- a/src/main/webapp/dataverse_template.xhtml +++ b/src/main/webapp/dataverse_template.xhtml @@ -51,7 +51,7 @@ diff --git a/src/main/webapp/passwordreset.xhtml b/src/main/webapp/passwordreset.xhtml index 99bddd26cf4..2a257fd3822 100644 --- a/src/main/webapp/passwordreset.xhtml +++ b/src/main/webapp/passwordreset.xhtml @@ -99,8 +99,8 @@
- - + +

#{bundle['user.updatePassword.warning']}