diff --git a/dd-java-agent/instrumentation/spring-data/spring-data.gradle b/dd-java-agent/instrumentation/spring-data-1.9/spring-data-1.9.gradle similarity index 99% rename from dd-java-agent/instrumentation/spring-data/spring-data.gradle rename to dd-java-agent/instrumentation/spring-data-1.9/spring-data-1.9.gradle index a7336d6340..e19e1fd691 100644 --- a/dd-java-agent/instrumentation/spring-data/spring-data.gradle +++ b/dd-java-agent/instrumentation/spring-data-1.9/spring-data-1.9.gradle @@ -36,7 +36,7 @@ dependencies { 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' - + latestDepTestCompile group: 'org.springframework', name: 'spring-test', version: '+' latestDepTestCompile group: 'org.springframework', name: 'spring-context', version: '+' latestDepTestCompile group: 'org.springframework.data', name: 'spring-data-commons', version: '1.9.+' diff --git a/dd-java-agent/instrumentation/spring-data/src/main/java/datadog/trace/instrumentation/springdata/SpringDataDecorator.java b/dd-java-agent/instrumentation/spring-data-1.9/src/main/java/datadog/trace/instrumentation/springdata/SpringDataDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/spring-data/src/main/java/datadog/trace/instrumentation/springdata/SpringDataDecorator.java rename to dd-java-agent/instrumentation/spring-data-1.9/src/main/java/datadog/trace/instrumentation/springdata/SpringDataDecorator.java diff --git a/dd-java-agent/instrumentation/spring-data/src/main/java/datadog/trace/instrumentation/springdata/SpringRepositoryInstrumentation.java b/dd-java-agent/instrumentation/spring-data-1.9/src/main/java/datadog/trace/instrumentation/springdata/SpringRepositoryInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/spring-data/src/main/java/datadog/trace/instrumentation/springdata/SpringRepositoryInstrumentation.java rename to dd-java-agent/instrumentation/spring-data-1.9/src/main/java/datadog/trace/instrumentation/springdata/SpringRepositoryInstrumentation.java diff --git a/dd-java-agent/instrumentation/spring-data/src/test/groovy/SpringJpaTest.groovy b/dd-java-agent/instrumentation/spring-data-1.9/src/test/groovy/SpringJpaTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/spring-data/src/test/groovy/SpringJpaTest.groovy rename to dd-java-agent/instrumentation/spring-data-1.9/src/test/groovy/SpringJpaTest.groovy diff --git a/dd-java-agent/instrumentation/spring-data/src/test/java/spring/jpa/JpaCustomer.java b/dd-java-agent/instrumentation/spring-data-1.9/src/test/java/spring/jpa/JpaCustomer.java similarity index 100% rename from dd-java-agent/instrumentation/spring-data/src/test/java/spring/jpa/JpaCustomer.java rename to dd-java-agent/instrumentation/spring-data-1.9/src/test/java/spring/jpa/JpaCustomer.java diff --git a/dd-java-agent/instrumentation/spring-data/src/test/java/spring/jpa/JpaCustomerRepository.java b/dd-java-agent/instrumentation/spring-data-1.9/src/test/java/spring/jpa/JpaCustomerRepository.java similarity index 100% rename from dd-java-agent/instrumentation/spring-data/src/test/java/spring/jpa/JpaCustomerRepository.java rename to dd-java-agent/instrumentation/spring-data-1.9/src/test/java/spring/jpa/JpaCustomerRepository.java diff --git a/dd-java-agent/instrumentation/spring-data/src/test/java/spring/jpa/JpaPersistenceConfig.java b/dd-java-agent/instrumentation/spring-data-1.9/src/test/java/spring/jpa/JpaPersistenceConfig.java similarity index 100% rename from dd-java-agent/instrumentation/spring-data/src/test/java/spring/jpa/JpaPersistenceConfig.java rename to dd-java-agent/instrumentation/spring-data-1.9/src/test/java/spring/jpa/JpaPersistenceConfig.java diff --git a/settings.gradle b/settings.gradle index 076489faa2..b308a9244e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -88,7 +88,7 @@ include ':dd-java-agent:instrumentation:servlet-2' include ':dd-java-agent:instrumentation:servlet-3' include ':dd-java-agent:instrumentation:slf4j-mdc' include ':dd-java-agent:instrumentation:sparkjava-2.3' -include ':dd-java-agent:instrumentation:spring-data' +include ':dd-java-agent:instrumentation:spring-data-1.9' include ':dd-java-agent:instrumentation:spring-web' include ':dd-java-agent:instrumentation:spring-webflux' include ':dd-java-agent:instrumentation:spymemcached-2.12'