From d9b0ae7f6d2bd880dedadf1f9687a19f6461226d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 19 Mar 2018 01:14:20 +0100 Subject: [PATCH] Continued: - jcore-utils was splitted out from jcoreee to reduce project centralization (means you have to that whole fat bunch of classes but only use a few) - removed no longer used jcoreee.jar - updated commons-codec to 1.11 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 | 8 ++++---- src/org/mxchange/jusercore/model/user/LoginUser.java | 2 +- 3 files changed, 10 insertions(+), 10 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 aff75ec..316fdad 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -31,15 +31,15 @@ dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= file.reference.jcontacts-core.jar=lib/jcontacts-core.jar -file.reference.jcoreee.jar=lib/jcoreee.jar +file.reference.jcore-utils.jar=lib/jcore-utils.jar includes=** jar.archive.disabled=${jnlp.enabled} jar.compress=false jar.index=${jnlp.enabled} javac.classpath=\ - ${file.reference.jcoreee.jar}:\ ${file.reference.jcontacts-core.jar}:\ - ${libs.Commons_Codec_1.10.classpath}:\ + ${file.reference.jcore-utils.jar}:\ + ${libs.commons-codec.classpath}:\ ${libs.javaee-api-7.0.classpath} # Space-separated list of extra javac options javac.compilerargs=-Xlint:unchecked -Xlint:deprecation @@ -94,6 +94,6 @@ run.test.classpath=\ ${build.test.classes.dir} source.encoding=UTF-8 source.reference.jcontacts-core.jar=../jcontacts-core/src/ -source.reference.jcoreee.jar=../jcoreee/src/ +source.reference.jcore-utils.jar=../jcore-utils/src/ src.dir=src test.src.dir=test diff --git a/src/org/mxchange/jusercore/model/user/LoginUser.java b/src/org/mxchange/jusercore/model/user/LoginUser.java index 0e05fd7..9f6709d 100644 --- a/src/org/mxchange/jusercore/model/user/LoginUser.java +++ b/src/org/mxchange/jusercore/model/user/LoginUser.java @@ -39,7 +39,7 @@ import javax.persistence.TemporalType; import javax.persistence.Transient; import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcontacts.model.contact.UserContact; -import org.mxchange.jcoreee.utils.Comparables; +import org.mxchange.jcoreutils.Comparables; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; import org.mxchange.jusercore.model.user.status.UserAccountStatus; -- 2.39.5