Skip to content

Commit c898d49

Browse files
committed
use shadow configuration so we don't have to manage core/web dependencies
remove unused relocation
1 parent fce4a5c commit c898d49

File tree

1 file changed

+4
-36
lines changed

1 file changed

+4
-36
lines changed

azure-application-insights-spring-boot-starter/build.gradle

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,16 @@ sourceSets {
4747

4848
def springBootVersion = '1.5.21.RELEASE'
4949
dependencies {
50-
compile(project(':core'))
51-
compile(project(':web'))
50+
compile(project(path: ':core', configuration: 'shadow'))
51+
compile(project(path: ':web', configuration: 'shadow'))
5252
compile(project(':ApplicationInsightsInternalLogger'))
5353
compile ([group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'])
54+
5455
compileOnly("org.springframework.boot:spring-boot:$springBootVersion")
5556
compileOnly("org.springframework.boot:spring-boot-autoconfigure:$springBootVersion")
5657
compileOnly("org.springframework.boot:spring-boot-starter-web:$springBootVersion")
5758
compileOnly("org.springframework.boot:spring-boot-configuration-processor:$springBootVersion")
59+
5860
testCompile('junit:junit:4.12')
5961
testCompile("org.springframework.boot:spring-boot-starter-test:$springBootVersion")
6062
testCompile("org.springframework.boot:spring-boot:$springBootVersion")
@@ -70,43 +72,9 @@ shadowJar {
7072
exclude(project(':core'))
7173
exclude(project(':web'))
7274
exclude(project(':ApplicationInsightsInternalLogger'))
73-
exclude(dependency([group: 'eu.infomas', name: 'annotation-detector', version: '3.0.5']))
74-
exclude(dependency([group: 'commons-io', name: 'commons-io', version: '2.6']))
75-
exclude(dependency([group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3']))
76-
// Transitive dependencies of httpclient that needs to be excluded seperately as shadow jar doesn't exclude them
77-
// automatically.
78-
exclude(dependency([group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.6']))
79-
exclude(dependency([group: 'org.apache.httpcomponents', name: 'httpcore-nio', version: '4.4.6']))
80-
// end excluding transitive dependencies
81-
82-
exclude(dependency([group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.3']))
83-
exclude(dependency([group: 'com.google.guava', name: 'guava', version: '26.0-android']))
84-
exclude(dependency([group: 'com.google.code.gson', name: 'gson', version: '2.8.2']))
85-
86-
// exclude gRPC and protobuf dependencies
87-
exclude(dependency([group: 'com.google.protobuf', name:'protobuf-java', version:'3.6.1']))
88-
exclude(dependency([group: 'io.grpc', name: 'grpc-stub', version: '1.16.1']))
89-
exclude(dependency([group: 'io.grpc', name: 'grpc-protobuf', version: '1.16.1']))
90-
exclude(dependency([group: 'io.grpc', name: 'grpc-context', version: '1.16.1']))
91-
exclude(dependency([group: 'com.google.code.gson', name: 'gson', version: '2.8.2']))
92-
exclude(dependency([group: 'com.google.guava', name: 'guava', version: '20.0']))
93-
exclude(dependency([group: 'com.google.errorprone', name: 'error_prone_annotations', version: '2.2.0']))
94-
exclude(dependency([group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2']))
95-
exclude(dependency([group: 'io.opencensus', name: 'opencensus-api', version: '0.12.3']))
96-
exclude(dependency([group: 'io.opencensus', name: 'opencensus-contrib-grpc-metrics', version: '0.12.3']))
97-
exclude(dependency([group: 'io.grpc', name: 'grpc-core', version: '1.16.1']))
98-
exclude(dependency([group: 'com.google.protobuf', name: 'protobuf-java', version: '3.6.1']))
99-
exclude(dependency([group: 'com.google.api.grpc', name: 'proto-google-common-protos', version: '1.0.0']))
100-
exclude(dependency([group: 'io.grpc', name: 'grpc-protobuf-lite', version: '1.16.1']))
101-
exclude(dependency([group: 'io.grpc', name: 'grpc-netty-shaded', version: '1.16.1']))
102-
exclude(dependency([group: 'org.codehaus.mojo', name: 'animal-sniffer-annotations', version: '1.17']))
103-
exclude(dependency([group: 'org.checkerframework', name: 'checker-compat-qual', version: '2.5.2']))
104-
exclude(dependency([group: 'com.google.j2objc', name:'j2objc-annotations', version: '1.1']))
105-
10675
}
10776
archiveClassifier=''
10877
relocate 'org.apache.commons', "${dependenciesPrefix}.apachecommons"
109-
relocate 'com.google', "${dependenciesPrefix}.google"
11078
}
11179

11280
jar {

0 commit comments

Comments
 (0)