Cleanup dependencies

bom/build.gradle

@@ -11,6 +11,7 @@ profiles.load(new StringReader(new File("$projectDir/profiles.properties").text)
 boolean micronautSnapshot = rootProject.version.toString().endsWith("-SNAPSHOT")
 
 def excludedProjects = [
+        "benchmarks",
         "test-suite",
         "test-suite-groovy",
         "test-suite-helper",

discovery-client/build.gradle

@@ -1,11 +1,11 @@
 dependencies {
     annotationProcessor project(":inject-java")
-    compileOnly project(":graal")
-    compileOnly project(":management")
 
     api project(":http-client")
     api project(":validation")
-
+
+    compileOnly project(":graal")
+    compileOnly project(":management")
     compileOnly dependencyVersion("micronaut.aws"), {
         exclude module:'micronaut-http-client'
         exclude module:'micronaut-inject'

function/build.gradle

@@ -1,6 +1,7 @@
 dependencies {
-    api project(":runtime")
-    annotationProcessor project(":inject-java")
+	annotationProcessor project(":inject-java")
+
+    api project(":runtime")    
     api project(":http")
 
     testAnnotationProcessor project(":inject-java")

http-client/build.gradle

@@ -1,18 +1,20 @@
 dependencies {
     annotationProcessor project(":inject-java")
-    api dependencyVersion("rxjava2")
-    api project(":http-netty")
+    api dependencyVersion("rxjava2")    
     api project(":runtime")
-    api dependencyModuleVersion("netty", "netty-handler-proxy")
-
-    compileOnly dependencyVersion("reactor")
     api project(":websocket")
 
-    testImplementation project(":inject-groovy")
-    testImplementation project(":validation")
+    implementation project(":http-netty")
+    implementation dependencyModuleVersion("netty", "netty-handler-proxy")
+
+    compileOnly dependencyVersion("reactor")
+
     testAnnotationProcessor project(":validation")
-    testImplementation project(":inject-java")
     testAnnotationProcessor project(":inject-java")
+
+    testImplementation project(":inject-groovy")
+    testImplementation project(":validation")    
+    testImplementation project(":inject-java")    
     testImplementation dependencyVersion("rxjava2")
     testImplementation dependencyVersion("reactor")
     testImplementation project(":http-server-netty")

http-netty/build.gradle

@@ -1,11 +1,13 @@
 dependencies {
+	annotationProcessor project(":inject-java")
     compileOnly "com.oracle.substratevm:svm:$graalVersion"
     compileOnly project(":graal")
-    api project(":buffer-netty")
+
     api project(":http")
     api project(":websocket")
-    annotationProcessor project(":inject-java")
-    api dependencyVersion("netty")
-    api dependencyVersion("rxjava2")
-    api dependencyModuleVersion("netty", "netty-handler")
+    api project(":buffer-netty")
+
+    implementation dependencyVersion("netty")
+    implementation dependencyVersion("rxjava2")
+    implementation dependencyModuleVersion("netty", "netty-handler")
 }

http-server-netty/build.gradle

@@ -1,8 +1,11 @@
 dependencies {
+    annotationProcessor project(":inject-java")
+
     api project(":http-server")
-    api project(":http-netty")
+    api project(":core")
+    implementation project(":http-netty")
+    implementation dependencyVersion("netty")
 
-    annotationProcessor project(":inject-java")
     compileOnly dependencyModuleVersion("netty", "netty-transport-native-epoll")
     compileOnly dependencyModuleVersion("netty", "netty-transport-native-kqueue")
 

http/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
-    api project(":inject")
-    annotationProcessor project(":inject-java")
+	annotationProcessor project(":inject-java")
+    api project(":inject")    
     compileOnly project(":graal")
 
     testImplementation project(":inject-groovy")

inject/build.gradle

@@ -5,7 +5,7 @@ dependencies {
     api dependencyVersion("javax.annotation-api")
     api group: 'javax.inject', name: 'javax.inject', version: '1'
     api project(':core')
-    api dependencyVersion("snakeyaml")
+    implementation dependencyVersion("snakeyaml")
 
     compileOnly "javax.persistence:javax.persistence-api:2.2"
     compileOnly dependencyVersion("groovy")

jdbc/build.gradle

@@ -1,8 +1,9 @@
 dependencies {
-    annotationProcessor project(":inject-java")
+    annotationProcessor project(":inject-java")    
+
+    api project(":inject")
+
     compileOnly project(":spring")
     compileOnly dependencyModuleVersion("spring", "spring-jdbc")
     compileOnly dependencyModuleVersion("spring", "spring-tx")
-
-    api project(":inject")
 }

management/build.gradle

@@ -1,8 +1,9 @@
 dependencies {
-    api project(":router")
-    api project(":runtime")
     annotationProcessor project(":inject-java")
     annotationProcessor project(":graal")
+
+    api project(":router")
+    api project(":runtime")
 
     testImplementation project(":http-client")
     testImplementation project(":inject-groovy")

messaging/build.gradle

@@ -1,5 +1,4 @@
 dependencies {
-    compileOnly project(":inject-java")
     annotationProcessor project(":inject-java")
     api project(":inject")
     api project(":runtime")

router/build.gradle

@@ -1,8 +1,9 @@
 dependencies {
-    compileOnly dependencyVersion("groovy")
+	annotationProcessor project(":inject-java")
+
     api project(":inject")
     api project(":http")
-    annotationProcessor project(":inject-java")
+    compileOnly dependencyVersion("groovy")
 
     testImplementation project(":inject-groovy")
     testImplementation project(":inject-java")

runtime-osx/build.gradle

@@ -2,6 +2,6 @@ dependencies {
     annotationProcessor project(":inject-java")
 
     api project(":runtime")
-    api dependencyVersion("methvin.directory-watcher")
-    api dependencyVersion("jna")
+    implementation dependencyVersion("methvin.directory-watcher")
+    implementation dependencyVersion("jna")
 }

runtime/build.gradle

@@ -2,19 +2,19 @@ ext {
     shadowJarEnabled = true
 }
 dependencies {
-    for(proj in ['http']) {
-        api project(":$proj")
-    }
+    annotationProcessor project(":inject-java")
+    api project(":http")
     api project(':inject')
     api project(':aop')
-    compileOnly "com.oracle.substratevm:svm:$graalVersion"
-    compileOnly project(":graal")
-    compileOnly dependencyVersion("jcache")
     api dependencyVersion("validation")
     api dependencyVersion("jackson.databind")
     api dependencyVersion("rxjava2")
 
-    compile([
+    compileOnly "com.oracle.substratevm:svm:$graalVersion"
+    compileOnly project(":graal")
+    compileOnly dependencyVersion("jcache")
+
+    implementation([
         dependencyVersion('jackson.datatype'),
         dependencyModuleVersion('jackson.datatype', 'jackson-datatype-jsr310')
     ])
@@ -38,15 +38,14 @@ dependencies {
     compileOnly 'org.glassfish:javax.el:3.0.1-b09'
     compileOnly dependencyVersion("reactor")
     compileOnly dependencyVersion("rxjava1.interop")
-    compileOnly "com.github.ben-manes.caffeine:caffeine:$caffeineVersion"
-    annotationProcessor project(":inject-java")
+    compileOnly "com.github.ben-manes.caffeine:caffeine:$caffeineVersion"    
 
+    testAnnotationProcessor project(":inject-java") 
     testImplementation 'org.jsr107.ri:cache-ri-impl:1.1.0'
     testImplementation dependencyVersion("jcache")
     testImplementation dependencyVersion("rxjava1.interop")
     testImplementation dependencyVersion("reactor")
-    testImplementation project(":inject-java")
-    testAnnotationProcessor project(":inject-java")
+    testImplementation project(":inject-java")    
     testImplementation project(":inject-java-test")
     testImplementation project(":inject-groovy")
     testImplementation dependencyModuleVersion("gorm", "grails-datastore-gorm")

session/build.gradle

@@ -2,19 +2,18 @@ ext {
     shadowJarEnabled = true
 }
 dependencies {
+    annotationProcessor project(":inject-java")
     api project(":runtime")
     api project(":http")
-
-    annotationProcessor project(":inject-java")
+
     compileOnly project(":http-server")
 
+
+    testAnnotationProcessor project(":inject-java")
     testImplementation project(":inject-groovy")
     testImplementation project(":inject-java")
     testImplementation project(":http-server-netty")
     testImplementation project(":http-client")
-
-    testAnnotationProcessor project(":inject-groovy")
-    testAnnotationProcessor project(":inject-java")
 }
 
 

spring/build.gradle

@@ -1,16 +1,17 @@
 dependencies {
+    annotationProcessor project(":inject-java")
     api dependencyVersion("spring")
     api dependencyModuleVersion("spring", "spring-tx")
     api dependencyModuleVersion("spring", "spring-context")
     api project(":inject")
-    annotationProcessor project(":inject-java")
-    compileOnly dependencyModuleVersion("spring", "spring-jdbc")
     api project(':aop')
 
+    compileOnly dependencyModuleVersion("spring", "spring-jdbc")
+
+    testAnnotationProcessor project(':inject-java')
     testImplementation project(':runtime')
     testImplementation project(':inject-groovy')
-    testImplementation project(':inject-java')
-    testAnnotationProcessor project(':inject-java')
+    testImplementation project(':inject-java')    
     testImplementation dependencyVersion('spock')
     testImplementation dependencyModuleVersion('spock', 'spock-spring')
     testImplementation dependencyModuleVersion('spring', 'spring-test')

tracing/build.gradle

@@ -1,5 +1,5 @@
 dependencies {
-
+    annotationProcessor project(":inject-java")
     api dependencyVersion("opentracing")
     api dependencyModuleVersion('opentracing', 'opentracing-util')
     api project(":runtime")
@@ -8,7 +8,7 @@ dependencies {
 
     // the following are Tracing implementations and instrumentations which
     // are optionally loaded and not required
-    annotationProcessor project(":inject-java")
+
     compileOnly dependencyModuleVersion('micronaut.netflix', 'micronaut-netflix-hystrix'), {
         exclude group:"io.micronaut", module:'micronaut-runtime'
         exclude group:"io.micronaut.configuration", module:'micronaut-netflix-archaius'

validation/build.gradle

@@ -1,18 +1,20 @@
 dependencies {
     annotationProcessor project(":inject-java")
-    compileOnly project(":http-server")
+
     api project(":inject")
     api project(":http")
     api dependencyVersion("validation")
+
     compileOnly dependencyVersion("gorm")
+    compileOnly project(":http-server")
 
+    testAnnotationProcessor project(":inject-java")
     testImplementation project(":http-server-netty")
     testImplementation project(":websocket")
     testImplementation project(":http-client")
     testImplementation project(":inject-groovy")
     testImplementation dependencyModuleVersion("groovy", "groovy-json")
     testImplementation project(":inject-java-test")
 
-    testAnnotationProcessor project(":inject-java")
 }
 //compileTestGroovy.groovyOptions.forkOptions.jvmArgs = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005']

websocket/build.gradle

@@ -1,10 +1,9 @@
 dependencies {
+	annotationProcessor project(":inject-java")
     api project(":http")
     api project(":inject")
     api project(':aop')
-
     api dependencyVersion("rxjava2")
-    annotationProcessor project(":inject-java")
 
     testImplementation project(":inject-groovy")
 }