diff --git a/block-storage/build.gradle b/block-storage/build.gradle index 1bf9b18..dae8f5a 100644 --- a/block-storage/build.gradle +++ b/block-storage/build.gradle @@ -5,9 +5,9 @@ dependencies { compile project(':file-utils') compile project(':pdb-utils') - compile 'org.apache.logging.log4j:log4j-core:2.10.0' - compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' - compile 'org.lucares:primitiveCollections:0.1.20180908084945' + compile lib_log4j2_core + compile lib_log4j2_slf4j_impl + compile lib_primitive_collections } diff --git a/build.gradle b/build.gradle index 84f5e4b..2e0a782 100644 --- a/build.gradle +++ b/build.gradle @@ -30,10 +30,10 @@ ext { lib_primitive_collections='org.lucares:primitiveCollections:0.1.20181120195412' - lib_spring_boot_log4j2='org.springframework.boot:spring-boot-starter-log4j2:2.1.0.RELEASE' - lib_spring_boot_mustache='org.springframework.boot:spring-boot-starter-mustache:2.1.0.RELEASE' - lib_spring_boot_test='org.springframework.boot:spring-boot-starter-test:2.1.0.RELEASE' - lib_spring_boot_web='org.springframework.boot:spring-boot-starter-web:2.1.0.RELEASE' + lib_spring_boot_log4j2='org.springframework.boot:spring-boot-starter-log4j2:2.1.1.RELEASE' + lib_spring_boot_mustache='org.springframework.boot:spring-boot-starter-mustache:2.1.1.RELEASE' + lib_spring_boot_test='org.springframework.boot:spring-boot-starter-test:2.1.1.RELEASE' + lib_spring_boot_web='org.springframework.boot:spring-boot-starter-web:2.1.1.RELEASE' } /* @@ -83,6 +83,6 @@ allprojects { tasks.cleanEclipseJdt.dependsOn cleanEclipseSettings } -task wrapper(type: Wrapper) { - gradleVersion = '4.10.2' +wrapper { + gradleVersion = '5.0' } diff --git a/byte-utils/build.gradle b/byte-utils/build.gradle index a0821b1..b6bd871 100644 --- a/byte-utils/build.gradle +++ b/byte-utils/build.gradle @@ -1,7 +1,5 @@ dependencies { - - - compile 'org.apache.logging.log4j:log4j-core:2.10.0' - compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' - compile 'org.lucares:primitiveCollections:0.1.20180908084945' + compile lib_log4j2_core + compile lib_log4j2_slf4j_impl + compile lib_primitive_collections } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1353677..457aad0 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e0b3fb8..75b8c7c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index cccdd3d..af6708f 100755 --- a/gradlew +++ b/gradlew @@ -28,7 +28,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" diff --git a/gradlew.bat b/gradlew.bat index e95643d..0f8d593 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/pdb-api/build.gradle b/pdb-api/build.gradle index 6e0851f..0ec309f 100644 --- a/pdb-api/build.gradle +++ b/pdb-api/build.gradle @@ -3,5 +3,5 @@ dependencies { compile project(':byte-utils') compile project(':pdb-utils') compile project(':file-utils') - compile 'org.lucares:primitiveCollections:0.1.20180908084945' + compile lib_primitive_collections } \ No newline at end of file