Continued:

- updated Commons Lang3 to 3.12.0
- updated JAR(s)

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

diff --git a/lib/commons-lang3/commons-lang3-3.12.0.jar b/lib/commons-lang3/commons-lang3-3.12.0.jar
new file mode 100644 (file)
index 0000000..4d434a2
Binary files /dev/null and b/lib/commons-lang3/commons-lang3-3.12.0.jar differ

diff --git a/lib/commons-lang3/commons-lang3-3.8.1.jar b/lib/commons-lang3/commons-lang3-3.8.1.jar
deleted file mode 100644 (file)
index 2c65ce6..0000000
Binary files a/lib/commons-lang3/commons-lang3-3.8.1.jar and /dev/null differ

diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar
index 95d475b58baa0520f93e4954601765e2790b97b7..e8ad364cb5757b6bb9c0e4ac58f19095ffaa205d 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 d4fbbb3fb9d4bec922d0790f8fa0c18d56a2249a..e2d3f904d027944720689454a19ad13cda82afec 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 0118f3455d34c2bbe80df93238aab886cc4eb894..a00fa936595c60fd06bfc7de50afc123fd7b3cd7 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 3c68cea7837670db5539604fceb330188d91c410..de5c1896651d672bc4e8f36ff049e46dfeb4cd4a 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 f538affe8ec2523c162848a4aa1df7fb32311db6..6c771256c461f3edfee02a69571b90df7cfa1ad4 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 be2d630fa42d343ec7ea7731277668488cb9a54a..eea7e0425f2697fbea949c87f42ff8db46fade06 100644 (file)
--- a/lib/nblibraries.properties
+++ b/lib/nblibraries.properties
@@ -1,8 +1,6 @@
-<<<<<<< HEAD
-=======
 libs.commons-lang3.classpath=\
-    ${base}/commons-lang3/commons-lang3-3.8.1.jar
-libs.commons-lang3.displayName=Commons Lang3 3.8.1
+    ${base}/commons-lang3/commons-lang3-3.12.0.jar
+libs.commons-lang3.displayName=Commons Lang3 3.12.0
 libs.commons-lang3.javadoc=\
     https://commons.apache.org/proper/commons-lang/apidocs/
 >>>>>>> fbc872e... Please cherry-pick: