Merge branch 'master' of https://bitbucket.com/andreashuber/performance

# Conflicts: # build.gradle
2020-08-11 19:48:09 +02:00
parent 275b6945cc 668f86323e
commit 5b55badfea
12 changed files with 83 additions and 59 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -31,7 +31,11 @@ ext {
    
    lib_commons_collections4 = 'org.apache.commons:commons-collections4:4.4'
    lib_commons_lang3 = 'org.apache.commons:commons-lang3:3.10'
+<<<<<<< HEAD
    lib_jackson_databind = 'com.fasterxml.jackson.core:jackson-databind:2.11.2'
+=======
+    lib_jackson_databind = 'com.fasterxml.jackson.core:jackson-databind:2.11.0'
+>>>>>>> 668f86323eb4efa2f2c5a016e8785958517af07b
    
    lib_log4j2_core = "org.apache.logging.log4j:log4j-core:${version_log4j2}"
    lib_log4j2_slf4j_impl = "org.apache.logging.log4j:log4j-slf4j-impl:${version_log4j2}"
@@ -124,5 +128,9 @@ subprojects {
 }

 wrapper {
+<<<<<<< HEAD
    gradleVersion = '6.6'
+=======
+    gradleVersion = '6.4'
+>>>>>>> 668f86323eb4efa2f2c5a016e8785958517af07b
 }