diff --git a/build.gradle b/build.gradle index c17c45a..ff7bc80 100644 --- a/build.gradle +++ b/build.gradle @@ -36,5 +36,5 @@ subprojects { } task wrapper(type: Wrapper) { - gradleVersion = '3.5' + gradleVersion = '4.3.1' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 857a3a7..05b3e27 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 663b3c7..c2782a1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Apr 14 07:01:05 CEST 2017 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip +#Sat Nov 18 09:30:43 CET 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip diff --git a/pdb-ui/build.gradle b/pdb-ui/build.gradle index 28ddf2e..d6b12dc 100644 --- a/pdb-ui/build.gradle +++ b/pdb-ui/build.gradle @@ -1,29 +1,29 @@ - -apply plugin: 'application' - - -mainClassName = "org.lucares.pdbui.PdbWebapp" -applicationDefaultJvmArgs = [ - "-Dspring.profiles.active=production", - "-Dspring.config.location=.", - "-Ddb.base=data" - ] - -dependencies { - compile project(':performanceDb') - compile project(':pdb-plotting') - - compile('org.springframework.boot:spring-boot-starter-mustache:1.5.7.RELEASE') { - exclude module: 'spring-boot-starter-logging' - } - compile("org.springframework.boot:spring-boot-starter-web:1.5.7.RELEASE"){ - exclude module: 'spring-boot-starter-logging' - } - compile("org.springframework.boot:spring-boot-starter-log4j2:1.5.7.RELEASE") - - testCompile("org.springframework.boot:spring-boot-starter-test:1.5.7.RELEASE") -} - -jar { - exclude 'application-dev.properties' + +apply plugin: 'application' + + +mainClassName = "org.lucares.pdbui.PdbWebapp" +applicationDefaultJvmArgs = [ + "-Dspring.profiles.active=production", + "-Dspring.config.location=.", + "-Ddb.base=data" + ] + +dependencies { + compile project(':performanceDb') + compile project(':pdb-plotting') + + compile('org.springframework.boot:spring-boot-starter-mustache:1.5.8.RELEASE') { + exclude module: 'spring-boot-starter-logging' + } + compile("org.springframework.boot:spring-boot-starter-web:1.5.8.RELEASE"){ + exclude module: 'spring-boot-starter-logging' + } + compile("org.springframework.boot:spring-boot-starter-log4j2:1.5.8.RELEASE") + + testCompile("org.springframework.boot:spring-boot-starter-test:1.5.8.RELEASE") +} + +jar { + exclude 'application-dev.properties' } \ No newline at end of file