Switch to sdk v2

This commit is contained in:
Mike Primm 2022-02-18 00:40:55 -06:00
parent be43f53d81
commit 45bc02cf3a
4 changed files with 105 additions and 100 deletions

View file

@ -17,12 +17,17 @@ dependencies {
implementation 'org.yaml:snakeyaml:1.23' // DON'T UPDATE - NEWER ONE TRIPS ON WINDOWS ENCODED FILES
implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1'
implementation 'org.postgresql:postgresql:42.2.18'
implementation platform('com.amazonaws:aws-java-sdk-bom:1.11.1000')
implementation 'com.amazonaws:aws-java-sdk-core'
implementation 'com.amazonaws:aws-java-sdk-s3'
implementation 'com.fasterxml.jackson.core:jackson-core'
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.fasterxml.jackson.core:jackson-annotations'
implementation 'software.amazon.awssdk:s3:2.17.132'
implementation 'software.amazon.awssdk:aws-core:2.17.132'
implementation 'software.amazon.awssdk:sdk-core:2.17.132'
implementation 'software.amazon.awssdk:utils:2.17.132'
implementation 'software.amazon.awssdk:http-client-spi:2.17.132'
implementation 'software.amazon.awssdk:profiles:2.17.132'
implementation 'software.amazon.awssdk:regions:2.17.132'
implementation 'software.amazon.awssdk:auth:2.17.132'
implementation 'software.amazon.awssdk:metrics-spi:2.17.132'
implementation 'software.amazon.awssdk:aws-xml-protocol:2.17.132'
implementation 'software.amazon.awssdk:protocol-core:2.17.132'
}
processResources {
@ -57,12 +62,17 @@ shadowJar {
include(dependency('org.eclipse.jetty::'))
include(dependency('org.eclipse.jetty.orbit:javax.servlet:'))
include(dependency('org.postgresql:postgresql:'))
include(dependency('com.amazonaws:aws-java-sdk-bom:'))
include(dependency('com.amazonaws:aws-java-sdk-core:'))
include(dependency('com.amazonaws:aws-java-sdk-s3:'))
include(dependency('com.fasterxml.jackson.core:jackson-core:'))
include(dependency('com.fasterxml.jackson.core:jackson-databind:'))
include(dependency('com.fasterxml.jackson.core:jackson-annotations:'))
include(dependency('software.amazon.awssdk:s3:'))
include(dependency('software.amazon.awssdk:aws-core:'))
include(dependency('software.amazon.awssdk:sdk-core:'))
include(dependency('software.amazon.awssdk:utils:'))
include(dependency('software.amazon.awssdk:http-client-spi:'))
include(dependency('software.amazon.awssdk:profiles:'))
include(dependency('software.amazon.awssdk:regions:'))
include(dependency('software.amazon.awssdk:auth:'))
include(dependency('software.amazon.awssdk:metrics-spi:'))
include(dependency('software.amazon.awssdk:aws-xml-protocol:'))
include(dependency('software.amazon.awssdk:protocol-core:'))
include(dependency(':DynmapCoreAPI'))
exclude("META-INF/maven/**")
exclude("META-INF/services/**")
@ -73,8 +83,7 @@ shadowJar {
relocate('org.owasp.html', 'org.dynmap.org.owasp.html')
relocate('javax.servlet', 'org.dynmap.javax.servlet' )
relocate('org.postgresql', 'org.dynmap.org.postgresql')
relocate('com.amazonaws', 'org.dynmap.com.amazonaws')
relocate('com.fasterxml', 'org.dynmap.com.fasterxml')
relocate('software.amazon.awssdk', 'org.dynmap.software.amazon.awssdk')
destinationDir = file '../target'
classifier = ''
}