From b407dcce64cbf90d219e613d4bc00a47045df768 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 19 Mar 2018 02:33:48 +0100 Subject: [PATCH] Continued: - updated commons-codec to 1.11 - fixed UserUtils -> Users MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- lib/nblibraries.properties | 10 +++++----- nbproject/project.properties | 2 +- .../mxchange/juserlogincore/login/UserLoginUtils.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties index c717fe6..5edb005 100644 --- a/lib/nblibraries.properties +++ b/lib/nblibraries.properties @@ -1,8 +1,8 @@ -libs.Commons_Codec_1.10.classpath=\ - ${base}/commons-codec/commons-codec-1.10.jar -libs.Commons_Codec_1.10.displayName=Commons Codec 1.10 -libs.Commons_Codec_1.10.javadoc=\ - https://commons.apache.org/proper/commons-codec/archives/1.10/apidocs/ +libs.commons-codec.classpath=\ + ${base}/commons-codec/commons-codec-1.11.jar +libs.commons-codec.displayName=Commons Codec 1.11 +libs.commons-codec.javadoc=\ + https://commons.apache.org/proper/commons-codec/archives/1.11/apidocs/ libs.CopyLibs.classpath=\ ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar libs.CopyLibs.displayName=CopyLibs Task diff --git a/nbproject/project.properties b/nbproject/project.properties index 0a45fec..d68ed78 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -41,7 +41,7 @@ javac.classpath=\ ${file.reference.jcoreee.jar}:\ ${file.reference.jcontacts-core.jar}:\ ${file.reference.juser-core.jar}:\ - ${libs.Commons_Codec_1.10.classpath}:\ + ${libs.commons-codec.classpath}:\ ${libs.javaee-api-7.0.classpath} # Space-separated list of extra javac options javac.compilerargs=-Xlint:unchecked -Xlint:deprecation diff --git a/src/org/mxchange/juserlogincore/login/UserLoginUtils.java b/src/org/mxchange/juserlogincore/login/UserLoginUtils.java index ad3a059..d7b70d0 100644 --- a/src/org/mxchange/juserlogincore/login/UserLoginUtils.java +++ b/src/org/mxchange/juserlogincore/login/UserLoginUtils.java @@ -26,7 +26,7 @@ import org.apache.commons.codec.digest.Crypt; import org.apache.commons.codec.digest.DigestUtils; import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jusercore.model.user.UserUtils; +import org.mxchange.jusercore.model.user.Users; import org.mxchange.juserlogincore.container.login.LoginContainer; /** @@ -259,7 +259,7 @@ public class UserLoginUtils implements Serializable { * Generates random string by creating a random, encrypted password * which gives nice entropy to start with. */ - StringBuilder key = new StringBuilder(encryptPassword(UserUtils.generateRandomUserName())); + StringBuilder key = new StringBuilder(encryptPassword(Users.generateRandomUserName())); // Is user set? if (user instanceof User) { -- 2.39.5