Merge pull request #1332 from DataDog/mar-kolya/test-with-jdk14

Test with jdk14 on CI

.circleci/config.yml

@@ -142,6 +142,11 @@ jobs:
     environment:
       - TEST_TASK: testJava13
 
+  test_14:
+    <<: *default_test_job
+    environment:
+      - TEST_TASK: testJava14
+
   agent_integration_tests:
     <<: *defaults
     docker:
@@ -322,6 +327,12 @@ workflows:
           filters:
             tags:
               only: /.*/
+      - test_14:
+          requires:
+            - build
+          filters:
+            tags:
+              only: /.*/
 
       - agent_integration_tests:
           requires:
@@ -357,6 +368,7 @@ workflows:
             - test_zulu11
             - test_12
             - test_13
+            - test_14
             - agent_integration_tests
             - check
           filters:
@@ -378,6 +390,7 @@ workflows:
             - test_zulu11
             - test_12
             - test_13
+            - test_14
             - agent_integration_tests
             - check
           filters:

dd-java-agent/instrumentation/spring-data-1.8/spring-data-1.8.gradle

@@ -40,7 +40,7 @@ dependencies {
 
   // JPA dependencies
   testCompile project(':dd-java-agent:instrumentation:jdbc')
-  testCompile group: 'org.springframework.data', name: 'spring-data-jpa', version: '1.7.0.RELEASE'
+  testCompile group: 'org.springframework.data', name: 'spring-data-jpa', version: '1.8.0.RELEASE'
   testCompile group: 'com.mysema.querydsl', name: 'querydsl-jpa', version: '3.7.4'
   testCompile group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
   testCompile group: 'org.hibernate', name: 'hibernate-entitymanager', version: '4.3.0.Final'

gradle/dependencies.gradle

@@ -1,4 +1,4 @@
-def groovyVer = "2.5.8"
+def groovyVer = "2.5.10"
 def spockGroovyVer = groovyVer.replaceAll(/\.\d+$/, '')
 
 ext {