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

build.gradle

@@ -1,55 +1,55 @@
-apply plugin: 'java'
+apply plugin: 'java'
-apply plugin: 'eclipse'
+apply plugin: 'eclipse'
-
+
-
+
-apply plugin: 'com.github.ben-manes.versions'
+apply plugin: 'com.github.ben-manes.versions'
-
+
-buildscript {
+buildscript {
-  repositories {
+  repositories {
-    jcenter()
+    jcenter()
-  }
+  }
-
+
-  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'
-  }
+  }
-}
+}
-
+
-
+
-/*
+/*
- * The shared configuration for all sub-projects:
+ * The shared configuration for all sub-projects:
- */
+ */
-subprojects {
+subprojects {
-	apply plugin: 'java'
+	apply plugin: 'java'
-	apply plugin: 'eclipse'
+	apply plugin: 'eclipse'
-
+
-	// java compatibility version
+	// java compatibility version
-	sourceCompatibility = 1.8
+	sourceCompatibility = 1.8
-	
+	
-
+
-	configurations {
+	configurations {
-		tests
+		tests
-	}
+	}
-	
+	
-	// the repositories for external depenencies
+	// the repositories for external depenencies
-	repositories {
+	repositories {
-		maven { url 'http://repo.lucares.de/' }
+		maven { url 'http://repo.lucares.de/' }
-		mavenCentral()
+		mavenCentral()
-		jcenter()
+		jcenter()
-	}
+	}
-	
+	
-	// In this example we use TestNG as our testing tool. JUnit is the default.
+	// In this example we use TestNG as our testing tool. JUnit is the default.
-	test{
+	test{
-		useTestNG()
+		useTestNG()
-		//testLogging.showStandardStreams = true
+		//testLogging.showStandardStreams = true
-	}
+	}
-	
+	
-	// dependencies that all sub-projects have 
+	// dependencies that all sub-projects have 
-	dependencies {
+	dependencies {
-		testCompile group: 'org.testng', name: 'testng', version: '6.14.3'
+		testCompile group: 'org.testng', name: 'testng', version: '6.14.3'
-	}
+	}
-}
+}
-
+
-task wrapper(type: Wrapper) {
+task wrapper(type: Wrapper) {
-    gradleVersion = '4.7'
+    gradleVersion = '4.8'
-}
+}

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'

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

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.fasterxml.jackson.core:jackson-databind:2.9.6'
-	compile 'com.google.guava:guava:24.1-jre'
+	compile 'com.google.guava:guava:25.1-jre'
 }
 

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'
 	}
 }

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

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'