Updated jar(s)

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar
index d0cf3b46495993aa24b59e997088029d82bc1207..58279f3fe2883abf3dc0be588fafd67501afeb6a 100644 (file)
Binary files a/lib/jcontacts-business-core.jar and b/lib/jcontacts-business-core.jar differ

diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar
index 73c9b77ea1e88df529450d692ba469d4f32b121f..dffb57da0537e28e1a0ad6c2d901bf9c0e6531f5 100644 (file)
Binary files a/lib/jcontacts-core.jar and b/lib/jcontacts-core.jar differ

diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar
index 0e464c46dcdab38c094b0f81e2362822dbcd9102..49b68f76c68919092ded0787ff0e19b5c7de1fbd 100644 (file)
Binary files a/lib/jcountry-core.jar and b/lib/jcountry-core.jar differ

diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar
index e70cda1bd4d0393cb756218e2b49cd3ecc94635a..00312016f0e403ec4c3f67830a56c6e90a50ffad 100644 (file)
Binary files a/lib/jphone-core.jar and b/lib/jphone-core.jar differ

diff --git a/lib/juser-core.jar b/lib/juser-core.jar
index 51e3ec4992472e543d0c4af12badbe46d1f9ed7e..778a12a9348d6e5dbfdd063fe2cb6f20bbf7aad0 100644 (file)
Binary files a/lib/juser-core.jar and b/lib/juser-core.jar differ

diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties
index cadf17c0bcbf3f50f5b253b95cf43c080dd5c639..be2d630fa42d343ec7ea7731277668488cb9a54a 100644 (file)
--- a/lib/nblibraries.properties
+++ b/lib/nblibraries.properties
@@ -1,3 +1,11 @@
+<<<<<<< HEAD
+=======
+libs.commons-lang3.classpath=\
+    ${base}/commons-lang3/commons-lang3-3.8.1.jar
+libs.commons-lang3.displayName=Commons Lang3 3.8.1
+libs.commons-lang3.javadoc=\
+    https://commons.apache.org/proper/commons-lang/apidocs/
+>>>>>>> fbc872e... Please cherry-pick:
 libs.CopyLibs.classpath=\
     ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
 libs.CopyLibs.displayName=CopyLibs Task