diff --git a/common/pom.xml b/common/pom.xml index 36f05e439c..4d9c4f5121 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -207,25 +207,6 @@ - - jdk11+ - - [11,) - - - 11 - - - - javax.annotation - javax.annotation-api - - - javax.xml.bind - jaxb-api - - - ${basedir}/.. diff --git a/core/pom.xml b/core/pom.xml index 7080b4b325..e558ea5617 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -128,13 +128,6 @@ log4j-core ${log4j2.version} - - - org.apache.logging.log4j - log4j-core - ${log4j2.version} - - org.springframework spring-orm diff --git a/domain/pom.xml b/domain/pom.xml index 1f790cfa5a..1ebd07278c 100644 --- a/domain/pom.xml +++ b/domain/pom.xml @@ -118,6 +118,12 @@ org.jasypt jasypt-hibernate5 + + javax.annotation + javax.annotation-api + 1.3.2 + compile + diff --git a/web-ui/src/main/resources/catalog/js/LoginController.js b/web-ui/src/main/resources/catalog/js/LoginController.js index e8b2ccdf7c..ec4df79ad4 100644 --- a/web-ui/src/main/resources/catalog/js/LoginController.js +++ b/web-ui/src/main/resources/catalog/js/LoginController.js @@ -84,15 +84,16 @@ $scope.isShowLoginAsLink = gnGlobalSettings.isShowLoginAsLink; $scope.isUserProfileUpdateEnabled = gnGlobalSettings.isUserProfileUpdateEnabled; - // take the bigger of the two values$scope.passwordMinLength = Math.max( + // take the bigger of the two values + $scope.passwordMinLength = Math.max( gnConfig["system.security.passwordEnforcement.minLength"], 6 - - );$scope.passwordMaxLength = Math.max( + ); + $scope.passwordMaxLength = Math.max( gnConfig["system.security.passwordEnforcement.maxLength"], 6 - - );$scope.passwordPattern = gnConfig["system.security.passwordEnforcement.pattern"]; + ); + $scope.passwordPattern = gnConfig["system.security.passwordEnforcement.pattern"]; function initForm() { if ($window.location.pathname.indexOf("new.password") !== -1) {