Skip to content

Commit 524bd10

Browse files
authored
Disable shading of Apache HTTP Components/Core libs (#959)
Fixes #958
1 parent 921726d commit 524bd10

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ subprojects {
5959
relocate('META-INF/native/libnetty', 'META-INF/native/liborg-testcontainers-shaded-netty')
6060

6161
[
62-
"org.apache.http",
6362
"org.apache.commons.lang",
6463
"org.apache.commons.io",
6564
"org.apache.commons.codec",

circle.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ jobs:
44
core:
55
steps:
66
- checkout
7+
- run:
8+
command: ./gradlew testcontainers:build -x test -x check
79
- run:
810
command: ./gradlew testcontainers:check --scan
911
- run:

core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ shadowJar {
1919
mergeServiceFiles()
2020

2121
exclude 'org/newsclub/**'
22+
exclude 'org/apache/http/**'
2223

2324
[
2425
'META-INF/io.netty.versions.properties',
@@ -40,7 +41,6 @@ shadowJar {
4041
].each { exclude(it) }
4142

4243
dependencies {
43-
include(dependency('org.apache.httpcomponents:.*'))
4444
include(dependency('org.glassfish.*:.*'))
4545
include(dependency('org.aopalliance.*:.*'))
4646
include(dependency('javax.ws.rs:.*'))

0 commit comments

Comments
 (0)