Rework jexl dependency per build requirement

johnbley · johnbley · commit 8e53bbd35b54 · 2025-03-26T12:03:50.000-04:00
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -119,7 +119,8 @@ val DEPENDENCIES = listOf(
   "org.objenesis:objenesis:3.4",
   "javax.validation:validation-api:2.0.1.Final",
   "org.snakeyaml:snakeyaml-engine:2.9",
-  "org.elasticmq:elasticmq-rest-sqs_2.13:1.6.11"
+  "org.elasticmq:elasticmq-rest-sqs_2.13:1.6.11",
+  "org.apache.commons:commons-jexl3:3.4.0"
 )
 
 javaPlatform {
diff --git a/instrumentation/nocode/javaagent/build.gradle.kts b/instrumentation/nocode/javaagent/build.gradle.kts
@@ -22,10 +22,7 @@ dependencies {
 
   compileOnly("org.snakeyaml:snakeyaml-engine:2.9")
 
-  implementation("org.apache.commons:commons-jexl3:3.4.0") {
-    exclude("commons-logging", "commons-logging")
-  }
-  implementation("org.slf4j:jcl-over-slf4j")
+  implementation("org.apache.commons:commons-jexl3")
 
   add("codegen", project(":instrumentation:nocode:bootstrap"))
 }

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,8 @@ val DEPENDENCIES = listOf(`
`119`	`119`	`"org.objenesis:objenesis:3.4",`
`120`	`120`	`"javax.validation:validation-api:2.0.1.Final",`
`121`	`121`	`"org.snakeyaml:snakeyaml-engine:2.9",`
`122`		`- "org.elasticmq:elasticmq-rest-sqs_2.13:1.6.11"`
	`122`	`+ "org.elasticmq:elasticmq-rest-sqs_2.13:1.6.11",`
	`123`	`+ "org.apache.commons:commons-jexl3:3.4.0"`
`123`	`124`	`)`
`124`	`125`
`125`	`126`	`javaPlatform {`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,7 @@ dependencies {`
`22`	`22`
`23`	`23`	`compileOnly("org.snakeyaml:snakeyaml-engine:2.9")`
`24`	`24`
`25`		`- implementation("org.apache.commons:commons-jexl3:3.4.0") {`
`26`		`- exclude("commons-logging", "commons-logging")`
`27`		`- }`
`28`		`- implementation("org.slf4j:jcl-over-slf4j")`
	`25`	`+ implementation("org.apache.commons:commons-jexl3")`
`29`	`26`
`30`	`27`	`add("codegen", project(":instrumentation:nocode:bootstrap"))`
`31`	`28`	`}`