andi/perfdb
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Activity

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

Browse Source
This commit is contained in:
Andreas Huber
2018-07-28 08:39:32 +02:00
parent bb8dbad393 daaa0e6907
commit 8b7f7de226
8 changed files with 69 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -11,7 +11,7 @@ buildscript {
dependencies { dependencies {
// usage: gradle dependencyUpdates -Drevision=release // usage: gradle dependencyUpdates -Drevision=release
classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.19.0'
} }
} }
@@ -51,5 +51,5 @@ subprojects {
} }
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '4.7' gradleVersion = '4.8'
} }

2
data-store/build.gradle
View File

@@ -8,7 +8,7 @@ dependencies {
compile 'org.lucares:primitiveCollections:0.1.20171228131833' compile 'org.lucares:primitiveCollections:0.1.20171228131833'
compile 'org.apache.commons:commons-lang3:3.7' 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-core:2.10.0'
compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0'

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

4
pdb-plotting/build.gradle
View File

@@ -2,7 +2,7 @@
dependencies { dependencies {
compile project(':performanceDb') compile project(':performanceDb')
compile 'org.lucares:primitiveCollections:0.1.20171228131833' compile 'org.lucares:primitiveCollections:0.1.20171228131833'
compile 'com.fasterxml.jackson.core:jackson-databind:2.9.5' compile 'com.fasterxml.jackson.core:jackson-databind:2.9.6'
compile 'com.google.guava:guava:24.1-jre' compile 'com.google.guava:guava:25.1-jre'
} }

8
pdb-ui/build.gradle
View File

@@ -13,15 +13,15 @@ dependencies {
compile project(':performanceDb') compile project(':performanceDb')
compile project(':pdb-plotting') 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' 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' 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' exclude module: 'spring-boot-starter-logging'
} }
} }

5
pdb-ui/src/main/resources/application-prod.properties Normal file
View File

@@ -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

2
performanceDb/build.gradle
View File

@@ -3,7 +3,7 @@ dependencies {
compile project(':pdb-api') compile project(':pdb-api')
compile project(':data-store') compile project(':data-store')
compile project(':file-utils') 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' compile 'org.apache.commons:commons-collections4:4.1'