From 513c256352fb8bd58c16f87a98cf365531f8ad9c Mon Sep 17 00:00:00 2001
From: Andreas Huber <bitbucket@lucares.de>
Date: Fri, 17 Mar 2017 16:23:21 +0100
Subject: [PATCH] update third party libraries

---
 build.gradle                                              | 5 ++---
 gradle/wrapper/gradle-wrapper.properties                  | 2 +-
 pdb-keyword-db/build.gradle                               | 4 ++--
 .../main/antlr/org/lucares/pdb/keyword/db/KeywordsLang.g4 | 4 ++--
 pdb-plotting/build.gradle                                 | 2 +-
 pdb-ui/build.gradle                                       | 6 +++---
 performanceDb/build.gradle                                | 8 ++++----
 7 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/build.gradle b/build.gradle
index 10ee6e2..75412db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,11 +30,10 @@ subprojects {
 	
 	// dependencies that all sub-projects have 
 	dependencies {
-		testCompile group: 'org.testng', name: 'testng', version: '6.9.6'
-		//testCompile group: 'junit', name: 'junit', version: '4.12'
+		testCompile group: 'org.testng', name: 'testng', version: '6.10'
 	}
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '3.3'
+    gradleVersion = '3.4.1'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d82765b..b719dcf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
diff --git a/pdb-keyword-db/build.gradle b/pdb-keyword-db/build.gradle
index 37c4366..968dd83 100644
--- a/pdb-keyword-db/build.gradle
+++ b/pdb-keyword-db/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'antlr'
 
 dependencies {
 	compile 'org.lucares:primitiveCollections:0.1.20170203201705'
-	runtime "org.antlr:antlr4:4.5.3"
-	antlr "org.antlr:antlr4:4.5.3"
+	runtime "org.antlr:antlr4:4.6"
+	antlr "org.antlr:antlr4:4.6"
 }
 
 sourceSets {
diff --git a/pdb-keyword-db/src/main/antlr/org/lucares/pdb/keyword/db/KeywordsLang.g4 b/pdb-keyword-db/src/main/antlr/org/lucares/pdb/keyword/db/KeywordsLang.g4
index 3fa5d5e..25ad70b 100644
--- a/pdb-keyword-db/src/main/antlr/org/lucares/pdb/keyword/db/KeywordsLang.g4
+++ b/pdb-keyword-db/src/main/antlr/org/lucares/pdb/keyword/db/KeywordsLang.g4
@@ -10,8 +10,8 @@ expression
 	: prop=identifier eq=equal value=identifier       #propertyExpression
     | LPAREN expression RPAREN                       #parenExpression
 	| NOT expression                                 #notExpression
-    | left=expression op=and right=expression  #andExpression
-	| left=expression op=or right=expression #orExpression
+    | left=expression op_and=and right=expression  #andExpression
+	| left=expression op_or=or right=expression #orExpression
  ;
   
 identifier 
diff --git a/pdb-plotting/build.gradle b/pdb-plotting/build.gradle
index dc20b82..bf03ec5 100644
--- a/pdb-plotting/build.gradle
+++ b/pdb-plotting/build.gradle
@@ -1,7 +1,7 @@
 
 dependencies {
 	compile project(':performanceDb')
-	compile 'com.fasterxml.jackson.core:jackson-databind:2.8.6'
+	compile 'com.fasterxml.jackson.core:jackson-databind:2.8.7'
 	compile 'com.google.guava:guava:21.0'
 }
 
diff --git a/pdb-ui/build.gradle b/pdb-ui/build.gradle
index 54bb54e..3bdcb4d 100644
--- a/pdb-ui/build.gradle
+++ b/pdb-ui/build.gradle
@@ -8,10 +8,10 @@ dependencies {
 	compile project(':performanceDb')
 	compile project(':pdb-plotting')
 	
-	compile("org.springframework.boot:spring-boot-starter-web:1.5.1.RELEASE"){
+	compile("org.springframework.boot:spring-boot-starter-web:1.5.2.RELEASE"){
 		exclude module: 'spring-boot-starter-logging'
 	}
-	compile("org.springframework.boot:spring-boot-starter-log4j2:1.5.1.RELEASE")
+	compile("org.springframework.boot:spring-boot-starter-log4j2:1.5.2.RELEASE")
 	
-	testCompile("org.springframework.boot:spring-boot-starter-test:1.5.1.RELEASE")
+	testCompile("org.springframework.boot:spring-boot-starter-test:1.5.2.RELEASE")
 }
\ No newline at end of file
diff --git a/performanceDb/build.gradle b/performanceDb/build.gradle
index 360f3ae..58e98b7 100644
--- a/performanceDb/build.gradle
+++ b/performanceDb/build.gradle
@@ -2,11 +2,11 @@
 dependencies {
 	compile project(':pdb-api')
 	compile 'org.lucares:ludb:1.0.20170218180719'
-	compile 'com.fasterxml.jackson.core:jackson-databind:2.8.6'
+	compile 'com.fasterxml.jackson.core:jackson-databind:2.8.7'
 	
 	
 	
-	compile 'org.apache.logging.log4j:log4j-api:2.8'
-	compile 'org.apache.logging.log4j:log4j-core:2.8'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.8'
+	compile 'org.apache.logging.log4j:log4j-api:2.8.1'
+	compile 'org.apache.logging.log4j:log4j-core:2.8.1'
+	compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.8.1'
 }