From 6d42e48861746646bd6895337e1854a7f5215a89 Mon Sep 17 00:00:00 2001
From: Max Lambrecht <maxlambrecht@gmail.com>
Date: Thu, 11 Jun 2020 11:35:34 -0300
Subject: [PATCH] Add all supported java versions to travis build. Extract
 common string versions to constants in build.gradle. Update some dependency
 version.

Signed-off-by: Max Lambrecht <maxlambrecht@gmail.com>
---
 .travis.yml                   |  7 +++++++
 build.gradle                  | 27 +++++++++++++++++----------
 java-spiffe-core/build.gradle |  1 +
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ef1e1d6..82d9bdc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,11 @@
 language: java
 jdk:
+  - openjdk8
+  - oraclejdk9
+  - openjdk10
+  - oraclejdk11
+  - oraclejdk12
+  - oraclejdk13
   - oraclejdk14
 
 before_cache:
@@ -20,3 +26,4 @@ deploy:
     on:
       tags: true
       condition: $GITHUB_TOKEN != ""
+      jdk: oraclejdk14
diff --git a/build.gradle b/build.gradle
index e007990..7acf2e7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,21 +17,28 @@ subprojects {
         finalizedBy jacocoTestReport
     }
 
+    ext {
+        jupiterVersion = '5.6.2'
+        mockitoVersion = '3.3.3'
+        lombokVersion = '1.18.12'
+    }
+
     dependencies {
-        implementation group: 'org.apache.commons', name: 'commons-lang3', version: "3.8.1"
+        implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
         implementation group: 'commons-validator', name: 'commons-validator', version: "1.6"
 
-        testCompileOnly 'org.junit.jupiter:junit-jupiter-api:5.6.2'
-        testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.2'
-        testCompileOnly 'org.junit.jupiter:junit-jupiter-params:5.6.2'
-        testCompileOnly 'org.mockito:mockito-core:3.3.3'
-        testRuntimeOnly 'org.mockito:mockito-junit-jupiter:3.3.3'
+        testCompileOnly group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: "${jupiterVersion}"
+        testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: "${jupiterVersion}"
+        testCompileOnly group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: "${jupiterVersion}"
+
+        testCompileOnly group: 'org.mockito', name: 'mockito-core', version: "${mockitoVersion}"
+        testRuntimeOnly group: 'org.mockito', name: 'mockito-junit-jupiter', version: "${mockitoVersion}"
 
         // Project Lombok dependency
-        compileOnly 'org.projectlombok:lombok:1.18.12'
-        annotationProcessor 'org.projectlombok:lombok:1.18.12'
-        testCompileOnly 'org.projectlombok:lombok:1.18.12'
-        testAnnotationProcessor 'org.projectlombok:lombok:1.18.12'
+        compileOnly group: 'org.projectlombok', name: 'lombok', version: "${lombokVersion}"
+        annotationProcessor group: 'org.projectlombok', name: 'lombok', version: "${lombokVersion}"
+        testCompileOnly group: 'org.projectlombok', name: 'lombok', version: "${lombokVersion}"
+        testAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: "${lombokVersion}"
     }
 
     jacocoTestReport {
diff --git a/java-spiffe-core/build.gradle b/java-spiffe-core/build.gradle
index a7a0c70..0daf6e1 100644
--- a/java-spiffe-core/build.gradle
+++ b/java-spiffe-core/build.gradle
@@ -16,6 +16,7 @@ ext {
     grpcVersion = '1.30.0'
     nettyVersion = '4.1.50.Final'
     protobufProtocVersion = '3.12.0'
+    bouncyCastleVersion = '1.65'  //used for testing
 }
 
 apply plugin: 'com.google.protobuf'