Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions 1

Drop apache http client, avoid rebase issues in S3 storage code

Browse source
This commit is contained in:
Mike Primm 2022-02-24 17:54:47 -06:00
parent 45c4523405
commit 3b176dc590
2 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
DynmapCore/build.gradle
View file

@ -21,11 +21,7 @@ dependencies {
implementation 'io.github.linktosriram:s3-lite-api:0.2.0'
implementation 'io.github.linktosriram:s3-lite-http-client-url-connection:0.2.0'
implementation 'io.github.linktosriram:s3-lite-http-client-spi:0.2.0'
implementation 'io.github.linktosriram:s3-lite-http-client-apache:0.2.0'
implementation 'io.github.linktosriram:s3-lite-util:0.2.0'
implementation 'org.apache.httpcomponents:httpclient:4.5.9'
implementation 'javax.xml.bind:jaxb-api:2.3.1'
implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.1'
}
processResources {
@ -64,9 +60,7 @@ shadowJar {
include(dependency('io.github.linktosriram:s3-lite-api:'))
include(dependency('io.github.linktosriram:s3-lite-http-client-url-connection:'))
include(dependency('io.github.linktosriram:s3-lite-http-client-spi:'))
include(dependency('io.github.linktosriram:s3-lite-http-client-apache:'))
include(dependency('io.github.linktosriram:s3-lite-util:'))
include(dependency('org.apache.httpcomponents:httpclient:'))
include(dependency(':DynmapCoreAPI'))
exclude("META-INF/maven/**")
exclude("META-INF/services/**")
@ -78,7 +72,6 @@ shadowJar {
relocate('javax.servlet', 'org.dynmap.javax.servlet' )
relocate('org.postgresql', 'org.dynmap.org.postgresql')
relocate('io.github.linktosriram.s3lite', 'org.dynmap.s3lite')
relocate('org.apache', 'org.dynmap.apache')
destinationDir = file '../target'
classifier = ''