Refactor versions of freemarker to a common folder (#7579)

DataDog · Sep 9, 2024 · 1d59e61 · 1d59e61
1 parent 3fd4174
commit 1d59e61
Show file tree

Hide file tree

Showing 17 changed files with 5 additions and 3 deletions.
diff --git a/dd-java-agent/instrumentation/freemarker/build.gradle b/dd-java-agent/instrumentation/freemarker/build.gradle
@@ -0,0 +1 @@
+apply from: "$rootDir/gradle/java.gradle"
diff --git a/...umentation/freemarker-2.3.24/build.gradle → ...freemarker/freemarker-2.3.24/build.gradle b/...umentation/freemarker-2.3.24/build.gradle → ...freemarker/freemarker-2.3.24/build.gradle
@@ -17,7 +17,7 @@ dependencies {
   compileOnly group: 'org.freemarker', name: 'freemarker', version: '2.3.24-incubating'
 
   testImplementation group: 'org.freemarker', name: 'freemarker', version: '2.3.24-incubating'
-  testImplementation project(':dd-java-agent:instrumentation:freemarker-2.3.9')
+  testImplementation project(':dd-java-agent:instrumentation:freemarker:freemarker-2.3.9')
 
   testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
 

diff --git a/...ntation/freemarker-2.3.24/gradle.lockfile → ...emarker/freemarker-2.3.24/gradle.lockfile b/...ntation/freemarker-2.3.24/gradle.lockfile → ...emarker/freemarker-2.3.24/gradle.lockfile
diff --git a/...tation/freemarker/StringUtilCallSite.java → ...tation/freemarker/StringUtilCallSite.java b/...tation/freemarker/StringUtilCallSite.java → ...tation/freemarker/StringUtilCallSite.java
diff --git a/...marker24/DollarVariableDatadogAdvice.java → ...marker24/DollarVariableDatadogAdvice.java b/...marker24/DollarVariableDatadogAdvice.java → ...marker24/DollarVariableDatadogAdvice.java
diff --git a/...rker24/DollarVariableInstrumentation.java → ...rker24/DollarVariableInstrumentation.java b/...rker24/DollarVariableInstrumentation.java → ...rker24/DollarVariableInstrumentation.java
diff --git a/...arker24/ObjectWrapperInstrumentation.java → ...arker24/ObjectWrapperInstrumentation.java b/...arker24/ObjectWrapperInstrumentation.java → ...arker24/ObjectWrapperInstrumentation.java
diff --git a/...eemarker/core/DollarVariable24Helper.java → ...eemarker/core/DollarVariable24Helper.java b/...eemarker/core/DollarVariable24Helper.java → ...eemarker/core/DollarVariable24Helper.java
diff --git a/.../freemarker/StringUtilCallSiteTest.groovy → .../freemarker/StringUtilCallSiteTest.groovy b/.../freemarker/StringUtilCallSiteTest.groovy → .../freemarker/StringUtilCallSiteTest.groovy
diff --git a/.../DollarVariableInstrumentationTest.groovy → .../DollarVariableInstrumentationTest.groovy b/.../DollarVariableInstrumentationTest.groovy → .../DollarVariableInstrumentationTest.groovy
diff --git a/...4/ObjectWrapperInstrumentationTest.groovy → ...4/ObjectWrapperInstrumentationTest.groovy b/...4/ObjectWrapperInstrumentationTest.groovy → ...4/ObjectWrapperInstrumentationTest.groovy
diff --git a/...est/java/foo/bar/TestStringUtilSuite.java → ...est/java/foo/bar/TestStringUtilSuite.java b/...est/java/foo/bar/TestStringUtilSuite.java → ...est/java/foo/bar/TestStringUtilSuite.java
diff --git a/...rumentation/freemarker-2.3.9/build.gradle → .../freemarker/freemarker-2.3.9/build.gradle b/...rumentation/freemarker-2.3.9/build.gradle → .../freemarker/freemarker-2.3.9/build.gradle
diff --git a/...arker9/DollarVariableInstrumentation.java → ...arker9/DollarVariableInstrumentation.java b/...arker9/DollarVariableInstrumentation.java → ...arker9/DollarVariableInstrumentation.java
diff --git a/...arker/core/DollarVariable2_3_9Helper.java → ...arker/core/DollarVariable2_3_9Helper.java b/...arker/core/DollarVariable2_3_9Helper.java → ...arker/core/DollarVariable2_3_9Helper.java
diff --git a/.../DollarVariableInstrumentationTest.groovy → .../DollarVariableInstrumentationTest.groovy b/.../DollarVariableInstrumentationTest.groovy → .../DollarVariableInstrumentationTest.groovy
diff --git a/settings.gradle b/settings.gradle
@@ -226,8 +226,9 @@ include ':dd-java-agent:instrumentation:elasticsearch:transport-7.3'
 include ':dd-java-agent:instrumentation:enable-wallclock-profiling'
 include ':dd-java-agent:instrumentation:exception-profiling'
 include ':dd-java-agent:instrumentation:finatra-2.9'
-include ':dd-java-agent:instrumentation:freemarker-2.3.9'
-include ':dd-java-agent:instrumentation:freemarker-2.3.24'
+include ':dd-java-agent:instrumentation:freemarker'
+include ':dd-java-agent:instrumentation:freemarker:freemarker-2.3.9'
+include ':dd-java-agent:instrumentation:freemarker:freemarker-2.3.24'
 include ':dd-java-agent:instrumentation:glassfish'
 include ':dd-java-agent:instrumentation:google-http-client'
 include ':dd-java-agent:instrumentation:google-pubsub'