Reduce transitive dependencies

loveleif · loveleif · commit 53cbf943468a · 2025-11-12T17:45:44.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -33,12 +33,14 @@ subprojects {
         implementation group: 'org.scala-lang', name: 'scala-reflect', version: ver.scala.full
         implementation group: 'org.scala-lang', name: 'scala-compiler', version: ver.scala.full
 
-        api group: 'org.apache.logging.log4j', name: 'log4j-api', version: ver.log4j.main
-        api group: 'org.apache.logging.log4j', name: "log4j-api-scala".scala(), version: ver.log4j.scala
+        implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: ver.log4j.main
+        implementation group: 'org.apache.logging.log4j', name: "log4j-api-scala".scala(), version: ver.log4j.scala
 
         testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: ver.log4j.main
         testImplementation group: 'org.scalatest', name: "scalatest".scala(), version: ver.scalatest
         testImplementation group: 'org.scalacheck', name: "scalacheck".scala(), version: ver.scalacheck
+        testImplementation group: 'junit', name: 'junit', version: ver.junit.main
+        testImplementation group: 'org.mockito', name: 'mockito-all', version: ver.mockito
         testRuntimeOnly group: 'org.junit.platform', name: 'junit-platform-runner', version: ver.junit.runner
     }
 
diff --git a/graph-ddl/build.gradle b/graph-ddl/build.gradle
@@ -4,7 +4,8 @@ dependencies {
     api project(':okapi-trees')
     api project(':okapi-api')
 
-    api group: 'com.lihaoyi', name: "fastparse".scala(), version: ver.fastparse
+    implementation group: 'com.lihaoyi', name: "fastparse".scala(), version: ver.fastparse
+    implementation group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
 
     testImplementation project(':okapi-testing')
 }
diff --git a/morpheus-examples/build.gradle b/morpheus-examples/build.gradle
@@ -4,10 +4,19 @@ dependencies {
     api project(':morpheus-spark-cypher')
     api project(':morpheus-testing')
 
-    api group: 'org.apache.logging.log4j', name: 'log4j-core',           version: ver.log4j.main
-    api group: 'org.apache.spark',         name: "spark-graphx".scala(), version: ver.spark
-    api group: 'io.netty',                 name: 'netty-all',            version: ver.netty
-    api group: 'com.h2database',           name: 'h2',                   version: ver.h2
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-core',           version: ver.log4j.main
+    implementation group: 'org.apache.spark',         name: "spark-graphx".scala(), version: ver.spark
+    implementation group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark
+    implementation(group: 'org.apache.spark', name: "spark-catalyst".scala(), version: ver.spark) {
+        exclude group: 'org.slf4j', module: 'slf4j-log4j12'
+    }
+    implementation group: 'io.netty',                 name: 'netty-all',            version: ver.netty
+    implementation group: 'com.h2database',           name: 'h2',                   version: ver.h2
+    implementation(group: 'com.lihaoyi', name: "upickle".scala(), version: ver.upickle) {
+        exclude group: 'com.lihaoyi', module: 'utest'.scala()
+        exclude group: 'com.lihaoyi', module: 'acyclic'.scala()
+    }
+    implementation group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: ver.neo4j.driver
 }
 
 tasks.test.dependsOn(":okapi-neo4j-io-testing:neo4jStart")
diff --git a/morpheus-jmh/build.gradle b/morpheus-jmh/build.gradle
@@ -5,13 +5,13 @@ description = 'Micro benchmarks for Cypher for Apache Spark'
 dependencies {
     api project(':morpheus-spark-cypher')
 
-    api(group: 'org.apache.spark', name: "spark-core".scala(), version: ver.spark) {
+    implementation(group: 'org.apache.spark', name: "spark-core".scala(), version: ver.spark) {
         exclude group: 'org.slf4j', module: 'slf4j-log4j12'
     }
-    api(group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark) {
+    implementation(group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark) {
         exclude group: 'org.slf4j', module: 'slf4j-log4j12'
     }
-    api(group: 'org.apache.spark', name: "spark-catalyst".scala(), version: ver.spark) {
+    implementation(group: 'org.apache.spark', name: "spark-catalyst".scala(), version: ver.spark) {
         exclude group: 'org.slf4j', module: 'slf4j-log4j12'
     }
 }
diff --git a/morpheus-spark-cypher/build.gradle b/morpheus-spark-cypher/build.gradle
@@ -13,7 +13,7 @@ if (project.hasProperty('testOkapiShade')) {
         }
     }
     dependencies {
-        api group: 'org.opencypher', name: 'okapi-shade', version: ver.self
+        implementation group: 'org.opencypher', name: 'okapi-shade', version: ver.self
     }
 }
 
@@ -22,12 +22,12 @@ dependencies {
     api project(':okapi-neo4j-io')
     api project(':graph-ddl')
 
-    api(group: 'com.lihaoyi', name: "upickle".scala(), version: ver.upickle) {
+    implementation(group: 'com.lihaoyi', name: "upickle".scala(), version: ver.upickle) {
         exclude group: 'com.lihaoyi', module: 'utest'.scala()
         exclude group: 'com.lihaoyi', module: 'acyclic'.scala()
     }
-    api group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
-    api group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: ver.neo4j.driver
+    implementation group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
+    implementation group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: ver.neo4j.driver
 
     compileOnly group: 'org.apache.spark', name: "spark-core".scala(), version: ver.spark
     compileOnly group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark
diff --git a/morpheus-tck/build.gradle b/morpheus-tck/build.gradle
@@ -8,6 +8,7 @@ sourceSets{
 dependencies {
     testImplementation project(':okapi-tck')
     testImplementation project(':morpheus-testing')
+    testImplementation group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark
     generatorImplementation project(':okapi-tck')
     generatorImplementation project(':morpheus-testing')
 }
diff --git a/morpheus-testing/build.gradle b/morpheus-testing/build.gradle
@@ -7,15 +7,22 @@ dependencies {
     api project(':okapi-testing')
     api project(':okapi-neo4j-io-testing')
 
-    api group: 'org.apache.spark', name: "spark-core".scala(), version: ver.spark
-    api group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark
-    api group: 'org.apache.spark', name: "spark-hive".scala(), version: ver.spark
-    api group: 'org.apache.hadoop', name: 'hadoop-minicluster', version: ver.hadoop
+    implementation group: 'org.apache.spark', name: "spark-core".scala(), version: ver.spark
+    implementation group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark
+    implementation group: 'org.apache.spark', name: "spark-hive".scala(), version: ver.spark
+    implementation group: 'org.apache.hadoop', name: 'hadoop-minicluster', version: ver.hadoop
+
+    implementation group: 'org.scalatest', name: "scalatest".scala(), version: ver.scalatest
+    implementation group: 'org.mockito', name: 'mockito-all', version: ver.mockito
 
     testImplementation project(':okapi-api').sourceSets.test.output
     testImplementation group: 'com.h2database', name: 'h2', version: ver.h2
     testImplementation group: 'org.spire-math', name: 'claimant'.scala(), version: ver.claimant
-
+    testImplementation(group: 'com.lihaoyi', name: "upickle".scala(), version: ver.upickle) {
+        exclude group: 'com.lihaoyi', module: 'utest'.scala()
+        exclude group: 'com.lihaoyi', module: 'acyclic'.scala()
+    }
+    testImplementation group: 'org.opencypher', name: 'front-end-9.0',  version: ver.cypher.frontend
 }
 
 tasks.test.dependsOn(":okapi-neo4j-io-testing:neo4jStart")
diff --git a/okapi-api/build.gradle b/okapi-api/build.gradle
@@ -3,19 +3,18 @@ description = 'Okapi - openCypher API'
 dependencies {
     api project(':okapi-trees')
 
-    api(group: 'org.opencypher', name: 'front-end-9.0', version: ver.cypher.frontend) {
+    implementation(group: 'org.opencypher', name: 'front-end-9.0', version: ver.cypher.frontend) {
         exclude group: 'org.scalacheck', module: 'scalacheck'.scala()
     }
 
-    api group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
-    api(group: 'com.lihaoyi', name: "upickle".scala(), version: ver.upickle) {
+    implementation group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
+    implementation(group: 'com.lihaoyi', name: "upickle".scala(), version: ver.upickle) {
         exclude group: 'com.lihaoyi', module: 'utest'.scala()
         exclude group: 'com.lihaoyi', module: 'acyclic'.scala()
     }
-    api group: 'com.lihaoyi', name: "fastparse".scala(), version: ver.fastparse
+    implementation group: 'com.lihaoyi', name: "fastparse".scala(), version: ver.fastparse
 
     testImplementation group: "org.typelevel", name: "discipline".scala(), version: ver.discipline
     testImplementation group: "org.typelevel", name: "cats-laws".scala(), version: ver.cats
-    testImplementation group: 'org.mockito', name: 'mockito-all', version: ver.mockito
     testImplementation group: 'junit', name: 'junit', version: ver.junit.main
 }
diff --git a/okapi-ir/build.gradle b/okapi-ir/build.gradle
@@ -3,10 +3,14 @@ description = 'Okapi IR - Declarative representation of Cypher queries'
 dependencies {
     api project(':okapi-api')
 
-    api group: 'org.atnos', name: "eff".scala(), version: ver.eff
+    implementation group: 'org.opencypher', name: 'expressions-9.0',  version: ver.cypher.frontend
+    implementation group: 'org.opencypher', name: 'ast-9.0',  version: ver.cypher.frontend
+    implementation group: 'org.opencypher', name: 'rewriting-9.0',  version: ver.cypher.frontend
+    implementation group: 'org.opencypher', name: 'front-end-9.0',  version: ver.cypher.frontend
+    implementation group: 'org.atnos', name: "eff".scala(), version: ver.eff
 
     testImplementation project(':okapi-testing')
 
-    testImplementation group: 'org.opencypher', name: 'ast-9.0',  version: ver.cypher.frontend, classifier: 'tests'
     testImplementation group: 'org.opencypher', name: 'util-9.0', version: ver.cypher.frontend, classifier: 'tests'
+    testImplementation group: 'org.opencypher', name: 'ast-9.0',  version: ver.cypher.frontend, classifier: 'tests'
 }
diff --git a/okapi-logical/build.gradle b/okapi-logical/build.gradle
@@ -3,5 +3,8 @@ description = 'Okapi Logical - Logical representation of Cypher queries'
 dependencies {
     api project(':okapi-ir')
 
+    implementation group: 'org.opencypher', name: 'expressions-9.0',  version: ver.cypher.frontend
+
     testImplementation project(':okapi-testing')
+    testImplementation group: 'org.opencypher', name: 'front-end-9.0',  version: ver.cypher.frontend
 }
diff --git a/okapi-neo4j-io-testing/build.gradle b/okapi-neo4j-io-testing/build.gradle
@@ -13,7 +13,9 @@ dependencies {
     api project(':okapi-neo4j-io')
     api project(':okapi-testing')
 
-    api group: 'org.bouncycastle', name: 'bctls-jdk15on', version: ver.bctls
+    implementation group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: ver.neo4j.driver
+    implementation group: 'org.bouncycastle', name: 'bctls-jdk15on', version: ver.bctls
+    implementation group: 'org.scalatest', name: "scalatest".scala(), version: ver.scalatest
 
     servicesImplementation group: 'org.neo4j.test', name: 'neo4j-harness',            version: ver.neo4j.harness
     servicesImplementation group: 'org.neo4j.test', name: 'neo4j-harness-enterprise', version: ver.neo4j.harness
diff --git a/okapi-neo4j-io/build.gradle b/okapi-neo4j-io/build.gradle
@@ -3,5 +3,5 @@ description = 'Okapi - Neo4j IO'
 dependencies {
     api project(':okapi-api')
 
-    api group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: ver.neo4j.driver
+    implementation group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: ver.neo4j.driver
 }
diff --git a/okapi-relational/build.gradle b/okapi-relational/build.gradle
@@ -5,6 +5,9 @@ description = 'Okapi Relational - Relational Algebra for Cypher'
 dependencies {
     api project(':okapi-logical')
 
+    implementation group: 'org.opencypher', name: 'front-end-9.0',  version: ver.cypher.frontend
+    implementation group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
+
     testImplementation project(':okapi-testing')
 }
 
diff --git a/okapi-tck/build.gradle b/okapi-tck/build.gradle
@@ -7,4 +7,5 @@ dependencies {
     api group: 'org.opencypher', name: 'tck',             version: ver.cypher.tck
     api group: 'org.opencypher', name: 'tck-api'.scala(), version: ver.cypher.tck
     implementation group: 'org.apache.commons', name: 'commons-text', version: ver.apache.commons.text
+    implementation group: 'org.scalatest', name: "scalatest".scala(), version: ver.scalatest
 }
diff --git a/okapi-testing/build.gradle b/okapi-testing/build.gradle
@@ -3,7 +3,11 @@ description = 'Okapi Test Utilities'
 dependencies {
     api project(':okapi-api')
 
-    api group: 'junit', name: 'junit', version: ver.junit.main
-    api group: 'org.mockito', name: 'mockito-all', version: ver.mockito
-    api group: 'org.scalatest', name: "scalatest".scala(), version: ver.scalatest
+    implementation group: 'org.opencypher', name: 'expressions-9.0',  version: ver.cypher.frontend
+    implementation group: 'org.opencypher', name: 'front-end-9.0',  version: ver.cypher.frontend
+
+    implementation group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
+    implementation group: 'junit', name: 'junit', version: ver.junit.main
+    implementation group: 'org.mockito', name: 'mockito-all', version: ver.mockito
+    implementation group: 'org.scalatest', name: "scalatest".scala(), version: ver.scalatest
 }
diff --git a/okapi-trees/build.gradle b/okapi-trees/build.gradle
@@ -1,7 +1,7 @@
 description = 'Okapi Trees - Tree rewriting framework for Okapi'
 
 dependencies {
-    api group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
+    implementation group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
 
     testImplementation group: 'junit', name: 'junit', version: ver.junit.main
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@ dependencies {`
`4`	`4`	`api project(':okapi-trees')`
`5`	`5`	`api project(':okapi-api')`
`6`	`6`
`7`		`- api group: 'com.lihaoyi', name: "fastparse".scala(), version: ver.fastparse`
	`7`	`+ implementation group: 'com.lihaoyi', name: "fastparse".scala(), version: ver.fastparse`
	`8`	`+ implementation group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats`
`8`	`9`
`9`	`10`	`testImplementation project(':okapi-testing')`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,13 @@ description = 'Micro benchmarks for Cypher for Apache Spark'`
`5`	`5`	`dependencies {`
`6`	`6`	`api project(':morpheus-spark-cypher')`
`7`	`7`
`8`		`- api(group: 'org.apache.spark', name: "spark-core".scala(), version: ver.spark) {`
	`8`	`+ implementation(group: 'org.apache.spark', name: "spark-core".scala(), version: ver.spark) {`
`9`	`9`	`exclude group: 'org.slf4j', module: 'slf4j-log4j12'`
`10`	`10`	`}`
`11`		`- api(group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark) {`
	`11`	`+ implementation(group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark) {`
`12`	`12`	`exclude group: 'org.slf4j', module: 'slf4j-log4j12'`
`13`	`13`	`}`
`14`		`- api(group: 'org.apache.spark', name: "spark-catalyst".scala(), version: ver.spark) {`
	`14`	`+ implementation(group: 'org.apache.spark', name: "spark-catalyst".scala(), version: ver.spark) {`
`15`	`15`	`exclude group: 'org.slf4j', module: 'slf4j-log4j12'`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ if (project.hasProperty('testOkapiShade')) {`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`	`dependencies {`
`16`		`- api group: 'org.opencypher', name: 'okapi-shade', version: ver.self`
	`16`	`+ implementation group: 'org.opencypher', name: 'okapi-shade', version: ver.self`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
`@@ -22,12 +22,12 @@ dependencies {`
`22`	`22`	`api project(':okapi-neo4j-io')`
`23`	`23`	`api project(':graph-ddl')`
`24`	`24`
`25`		`- api(group: 'com.lihaoyi', name: "upickle".scala(), version: ver.upickle) {`
	`25`	`+ implementation(group: 'com.lihaoyi', name: "upickle".scala(), version: ver.upickle) {`
`26`	`26`	`exclude group: 'com.lihaoyi', module: 'utest'.scala()`
`27`	`27`	`exclude group: 'com.lihaoyi', module: 'acyclic'.scala()`
`28`	`28`	`}`
`29`		`- api group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats`
`30`		`- api group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: ver.neo4j.driver`
	`29`	`+ implementation group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats`
	`30`	`+ implementation group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: ver.neo4j.driver`
`31`	`31`
`32`	`32`	`compileOnly group: 'org.apache.spark', name: "spark-core".scala(), version: ver.spark`
`33`	`33`	`compileOnly group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ sourceSets{`
`8`	`8`	`dependencies {`
`9`	`9`	`testImplementation project(':okapi-tck')`
`10`	`10`	`testImplementation project(':morpheus-testing')`
	`11`	`+ testImplementation group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark`
`11`	`12`	`generatorImplementation project(':okapi-tck')`
`12`	`13`	`generatorImplementation project(':morpheus-testing')`
`13`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,8 @@ description = 'Okapi Logical - Logical representation of Cypher queries'`
`3`	`3`	`dependencies {`
`4`	`4`	`api project(':okapi-ir')`
`5`	`5`
	`6`	`+ implementation group: 'org.opencypher', name: 'expressions-9.0', version: ver.cypher.frontend`
	`7`	`+`
`6`	`8`	`testImplementation project(':okapi-testing')`
	`9`	`+ testImplementation group: 'org.opencypher', name: 'front-end-9.0', version: ver.cypher.frontend`
`7`	`10`	`}`