From 44af7f664f0429b2e6121473597378be4af191f3 Mon Sep 17 00:00:00 2001
From: graemerocher <graeme.rocher@gmail.com>
Date: Wed, 11 Dec 2019 10:54:32 +0100
Subject: [PATCH] Remove dependencies on shadow configuration

---
 aop/build.gradle           | 2 +-
 build.gradle               | 2 --
 inject-groovy/build.gradle | 2 +-
 inject-java/build.gradle   | 4 ++--
 management/build.gradle    | 2 +-
 runtime/build.gradle       | 4 ++--
 spring/build.gradle        | 2 +-
 websocket/build.gradle     | 2 +-
 8 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/aop/build.gradle b/aop/build.gradle
index fd4ae58d4bc..a620da42784 100644
--- a/aop/build.gradle
+++ b/aop/build.gradle
@@ -3,5 +3,5 @@ ext {
 }
 dependencies {
     api project(':inject')
-    implementation project(path: ':core', configuration: 'shadow')
+    api project(':core')
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 27da459445d..a2931f053d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -691,8 +691,6 @@ subprojects { Project subproject ->
         configurations = [project.configurations.shadowCompile]
         relocate "com.github.benmanes.caffeine", "io.micronaut.caffeine"
         relocate "org.objectweb.asm", "io.micronaut.asm"
-
-        classifier = null
     }
 
     def isDocumented = subproject.name != 'inject' && subproject.name != 'core' && subproject.name != 'aop' && !subproject.name.contains('asciidoc-config-props')
diff --git a/inject-groovy/build.gradle b/inject-groovy/build.gradle
index c7a63a76214..d4b29359ae1 100644
--- a/inject-groovy/build.gradle
+++ b/inject-groovy/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
     api project(":inject")
-    api project(path: ':aop', configuration: 'shadow')
+    api project(':aop')
     api dependencyVersion("groovy")
 
     testImplementation "junit:junit:4.12"
diff --git a/inject-java/build.gradle b/inject-java/build.gradle
index a2792ba37fb..3fbec6d88a3 100644
--- a/inject-java/build.gradle
+++ b/inject-java/build.gradle
@@ -1,12 +1,12 @@
 dependencies {
     api project(":inject")
-    api project(path: ':aop', configuration: 'shadow')
+    api project(':aop')
 
     compileOnly files(org.gradle.internal.jvm.Jvm.current().toolsJar)
     compileOnly dependencyVersion("validation")
 
     testImplementation 'com.github.spotbugs:spotbugs-annotations:3.1.12'
-    testImplementation project(path: ':aop', configuration: 'shadow')
+    testImplementation project(':aop')
     testAnnotationProcessor project(":inject-java")
     testImplementation project(":runtime")
     testImplementation dependencyVersion("rxjava2")
diff --git a/management/build.gradle b/management/build.gradle
index 95ddfd97fcb..15525d380e4 100644
--- a/management/build.gradle
+++ b/management/build.gradle
@@ -2,7 +2,7 @@ dependencies {
     api project(":router")
     api project(":runtime")
     annotationProcessor project(":inject-java")
-    compileOnly project(":graal")
+    annotationProcessor project(":graal")
 
     testImplementation project(":http-client")
     testImplementation project(":inject-groovy")
diff --git a/runtime/build.gradle b/runtime/build.gradle
index 835bf536cab..b878851b509 100644
--- a/runtime/build.gradle
+++ b/runtime/build.gradle
@@ -5,8 +5,8 @@ dependencies {
     for(proj in ['http']) {
         api project(":$proj")
     }
-    api project(path: ':inject', configuration: 'shadow')
-    api project(path: ':aop', configuration: 'shadow')
+    api project(':inject')
+    api project(':aop')
     compileOnly "com.oracle.substratevm:svm:$graalVersion"
     compileOnly project(":graal")
     compileOnly dependencyVersion("jcache")
diff --git a/spring/build.gradle b/spring/build.gradle
index 081688d41f4..693a2476197 100644
--- a/spring/build.gradle
+++ b/spring/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     api project(":inject")
     annotationProcessor project(":inject-java")
     compileOnly dependencyModuleVersion("spring", "spring-jdbc")
-    api project(path: ':aop', configuration: 'shadow')
+    api project(':aop')
 
     testImplementation project(':runtime')
     testImplementation project(':inject-groovy')
diff --git a/websocket/build.gradle b/websocket/build.gradle
index b3eedb10730..71b7cb5c6a0 100644
--- a/websocket/build.gradle
+++ b/websocket/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
     api project(":http")
     api project(":inject")
-    api project(path: ':aop', configuration: 'shadow')
+    api project(':aop')
 
     api dependencyVersion("rxjava2")
     annotationProcessor project(":inject-java")