diff --git a/build.gradle b/build.gradle index 548f5dd..31199f3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,55 +1,55 @@ -apply plugin: 'java' -apply plugin: 'eclipse' - - -apply plugin: 'com.github.ben-manes.versions' - -buildscript { - repositories { - jcenter() - } - - dependencies { - // usage: gradle dependencyUpdates -Drevision=release - classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0' - } -} - - -/* - * The shared configuration for all sub-projects: - */ -subprojects { - apply plugin: 'java' - apply plugin: 'eclipse' - - // java compatibility version - sourceCompatibility = 1.8 - - - configurations { - tests - } - - // the repositories for external depenencies - repositories { - maven { url 'http://repo.lucares.de/' } - mavenCentral() - jcenter() - } - - // In this example we use TestNG as our testing tool. JUnit is the default. - test{ - useTestNG() - //testLogging.showStandardStreams = true - } - - // dependencies that all sub-projects have - dependencies { - testCompile group: 'org.testng', name: 'testng', version: '6.14.3' - } -} - -task wrapper(type: Wrapper) { - gradleVersion = '4.7' -} +apply plugin: 'java' +apply plugin: 'eclipse' + + +apply plugin: 'com.github.ben-manes.versions' + +buildscript { + repositories { + jcenter() + } + + dependencies { + // usage: gradle dependencyUpdates -Drevision=release + classpath 'com.github.ben-manes:gradle-versions-plugin:0.19.0' + } +} + + +/* + * The shared configuration for all sub-projects: + */ +subprojects { + apply plugin: 'java' + apply plugin: 'eclipse' + + // java compatibility version + sourceCompatibility = 1.8 + + + configurations { + tests + } + + // the repositories for external depenencies + repositories { + maven { url 'http://repo.lucares.de/' } + mavenCentral() + jcenter() + } + + // In this example we use TestNG as our testing tool. JUnit is the default. + test{ + useTestNG() + //testLogging.showStandardStreams = true + } + + // dependencies that all sub-projects have + dependencies { + testCompile group: 'org.testng', name: 'testng', version: '6.14.3' + } +} + +task wrapper(type: Wrapper) { + gradleVersion = '4.8' +} diff --git a/data-store/build.gradle b/data-store/build.gradle index 88074b1..162b177 100644 --- a/data-store/build.gradle +++ b/data-store/build.gradle @@ -8,7 +8,7 @@ dependencies { compile 'org.lucares:primitiveCollections:0.1.20171228131833' compile 'org.apache.commons:commons-lang3:3.7' - compile 'com.google.guava:guava:24.1-jre' + compile 'com.google.guava:guava:25.1-jre' compile 'org.apache.logging.log4j:log4j-core:2.10.0' compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961f..91ca28c 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 16d2805..d2c45a4 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.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/pdb-plotting/build.gradle b/pdb-plotting/build.gradle index a46fd58..7fc70a8 100644 --- a/pdb-plotting/build.gradle +++ b/pdb-plotting/build.gradle @@ -2,7 +2,7 @@ dependencies { compile project(':performanceDb') compile 'org.lucares:primitiveCollections:0.1.20171228131833' - compile 'com.fasterxml.jackson.core:jackson-databind:2.9.5' - compile 'com.google.guava:guava:24.1-jre' + compile 'com.fasterxml.jackson.core:jackson-databind:2.9.6' + compile 'com.google.guava:guava:25.1-jre' } diff --git a/pdb-ui/build.gradle b/pdb-ui/build.gradle index 16e0fde..cf83110 100644 --- a/pdb-ui/build.gradle +++ b/pdb-ui/build.gradle @@ -13,15 +13,15 @@ dependencies { compile project(':performanceDb') compile project(':pdb-plotting') - compile('org.springframework.boot:spring-boot-starter-mustache:2.0.1.RELEASE') { + compile('org.springframework.boot:spring-boot-starter-mustache:2.0.3.RELEASE') { exclude module: 'spring-boot-starter-logging' } - compile("org.springframework.boot:spring-boot-starter-web:2.0.1.RELEASE"){ + compile("org.springframework.boot:spring-boot-starter-web:2.0.3.RELEASE"){ exclude module: 'spring-boot-starter-logging' } - compile("org.springframework.boot:spring-boot-starter-log4j2:2.0.1.RELEASE") + compile("org.springframework.boot:spring-boot-starter-log4j2:2.0.3.RELEASE") - testCompile("org.springframework.boot:spring-boot-starter-test:2.0.1.RELEASE"){ + testCompile("org.springframework.boot:spring-boot-starter-test:2.0.3.RELEASE"){ exclude module: 'spring-boot-starter-logging' } } diff --git a/pdb-ui/src/main/resources/application-prod.properties b/pdb-ui/src/main/resources/application-prod.properties new file mode 100644 index 0000000..1e419c9 --- /dev/null +++ b/pdb-ui/src/main/resources/application-prod.properties @@ -0,0 +1,5 @@ +#db.base=D:/ws/pdb/dataNew +db.base=C:/pdb/dataNew +server.port=17333 +gnuplot.home=D:/ws/pdb/gnuplot-5.2 +cache.images.duration.seconds=86400 \ No newline at end of file diff --git a/performanceDb/build.gradle b/performanceDb/build.gradle index 2aebde1..d3f2006 100644 --- a/performanceDb/build.gradle +++ b/performanceDb/build.gradle @@ -3,7 +3,7 @@ dependencies { compile project(':pdb-api') compile project(':data-store') compile project(':file-utils') - compile 'com.fasterxml.jackson.core:jackson-databind:2.9.5' + compile 'com.fasterxml.jackson.core:jackson-databind:2.9.6' compile 'org.apache.commons:commons-collections4:4.1'