@@ -20,27 +20,49 @@ esplugin {
2020}
2121
2222dependencies {
23- api " com.amazonaws:aws-java-sdk-s3:${ versions.awsv1sdk} "
24- api " com.amazonaws:aws-java-sdk-core:${ versions.awsv1sdk} "
25- api " com.amazonaws:aws-java-sdk-sts:${ versions.awsv1sdk} "
26- api " com.amazonaws:jmespath-java:${ versions.awsv1sdk} "
27- api " org.apache.httpcomponents:httpclient:${ versions.httpclient} "
28- api " org.apache.httpcomponents:httpcore:${ versions.httpcore} "
29- api " commons-logging:commons-logging:${ versions.commonslogging} "
30- api " org.apache.logging.log4j:log4j-1.2-api:${ versions.log4j} "
31- api " commons-codec:commons-codec:${ versions.commonscodec} "
32- api " com.fasterxml.jackson.core:jackson-core:${ versions.jackson} "
33- api " com.fasterxml.jackson.core:jackson-databind:${ versions.jackson} "
34- api " com.fasterxml.jackson.core:jackson-annotations:${ versions.jackson} "
35- api " com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${ versions.jackson} "
36- api " joda-time:joda-time:2.10.14"
37-
38- // HACK: javax.xml.bind was removed from default modules in java 9, so we pull the api in here,
39- // and whitelist this hack in JarHell
40- api ' javax.xml.bind:jaxb-api:2.2.2'
23+ implementation " software.amazon.awssdk:annotations:${ versions.awsv2sdk} "
24+ implementation " software.amazon.awssdk:apache-client:${ versions.awsv2sdk} "
25+ implementation " software.amazon.awssdk:auth:${ versions.awsv2sdk} "
26+ implementation " software.amazon.awssdk:aws-core:${ versions.awsv2sdk} "
27+ implementation " software.amazon.awssdk:aws-xml-protocol:${ versions.awsv2sdk} "
28+ implementation " software.amazon.awssdk:http-client-spi:${ versions.awsv2sdk} "
29+ implementation " software.amazon.awssdk:identity-spi:${ versions.awsv2sdk} "
30+ implementation " software.amazon.awssdk:metrics-spi:${ versions.awsv2sdk} "
31+ implementation " software.amazon.awssdk:regions:${ versions.awsv2sdk} "
32+ implementation " software.amazon.awssdk:retries-spi:${ versions.awsv2sdk} "
33+ implementation " software.amazon.awssdk:retries:${ versions.awsv2sdk} "
34+ implementation " software.amazon.awssdk:s3:${ versions.awsv2sdk} "
35+ implementation " software.amazon.awssdk:sdk-core:${ versions.awsv2sdk} "
36+ implementation " software.amazon.awssdk:services:${ versions.awsv2sdk} "
37+ implementation " software.amazon.awssdk:sts:${ versions.awsv2sdk} "
38+ implementation " software.amazon.awssdk:utils:${ versions.awsv2sdk} "
39+
40+ implementation " org.apache.httpcomponents:httpclient:${ versions.httpclient} "
41+
42+ runtimeOnly " commons-codec:commons-codec:${ versions.commonscodec} "
43+ runtimeOnly " commons-logging:commons-logging:${ versions.commonslogging} "
44+ runtimeOnly " joda-time:joda-time:2.10.14"
45+ runtimeOnly " org.apache.httpcomponents:httpcore:${ versions.httpcore} "
46+ runtimeOnly " org.apache.logging.log4j:log4j-1.2-api:${ versions.log4j} "
47+ runtimeOnly " org.reactivestreams:reactive-streams:${ versions.reactive_streams} "
48+ runtimeOnly " org.slf4j:slf4j-api:${ versions.slf4j} "
49+ runtimeOnly " software.amazon.awssdk:arns:${ versions.awsv2sdk} "
50+ runtimeOnly " software.amazon.awssdk:aws-query-protocol:${ versions.awsv2sdk} "
51+ runtimeOnly " software.amazon.awssdk:checksums-spi:${ versions.awsv2sdk} "
52+ runtimeOnly " software.amazon.awssdk:checksums:${ versions.awsv2sdk} "
53+ runtimeOnly " software.amazon.awssdk:endpoints-spi:${ versions.awsv2sdk} "
54+ runtimeOnly " software.amazon.awssdk:http-auth:${ versions.awsv2sdk} "
55+ runtimeOnly " software.amazon.awssdk:http-auth-aws:${ versions.awsv2sdk} "
56+ runtimeOnly " software.amazon.awssdk:http-auth-spi:${ versions.awsv2sdk} "
57+ runtimeOnly " software.amazon.awssdk:json-utils:${ versions.awsv2sdk} "
58+ runtimeOnly " software.amazon.awssdk:profiles:${ versions.awsv2sdk} "
59+ runtimeOnly " software.amazon.awssdk:protocol-core:${ versions.awsv2sdk} "
60+ runtimeOnly " software.amazon.awssdk:third-party-jackson-core:${ versions.awsv2sdk} "
4161
4262 testImplementation project(' :test:fixtures:s3-fixture' )
63+ testImplementation " software.amazon.awssdk:endpoints-spi:${ versions.awsv2sdk} "
4364
65+ internalClusterTestImplementation project(' :test:fixtures:aws-fixture-utils' )
4466 internalClusterTestImplementation project(' :test:fixtures:minio-fixture' )
4567 internalClusterTestRuntimeOnly " org.slf4j:slf4j-simple:${ versions.slf4j} "
4668
@@ -69,10 +91,34 @@ restResources {
6991}
7092
7193tasks. named(" dependencyLicenses" ). configure {
72- mapping from : / aws-java-sdk-.*/ , to : ' aws-java-sdk'
73- mapping from : / jmespath-java.*/ , to : ' aws-java-sdk'
74- mapping from : / jackson-.*/ , to : ' jackson'
75- mapping from : / jaxb-.*/ , to : ' jaxb'
94+ mapping from : ' annotations' , to : ' aws-sdk-2'
95+ mapping from : ' apache-client' , to : ' aws-sdk-2'
96+ mapping from : ' arns' , to : ' aws-sdk-2'
97+ mapping from : ' auth' , to : ' aws-sdk-2'
98+ mapping from : ' aws-core' , to : ' aws-sdk-2'
99+ mapping from : ' aws-query-protocol' , to : ' aws-sdk-2'
100+ mapping from : ' aws-xml-protocol' , to : ' aws-sdk-2'
101+ mapping from : ' checksums' , to : ' aws-sdk-2'
102+ mapping from : ' checksums-spi' , to : ' aws-sdk-2'
103+ mapping from : ' endpoints-spi' , to : ' aws-sdk-2'
104+ mapping from : ' http-auth' , to : ' aws-sdk-2'
105+ mapping from : ' http-auth-aws' , to : ' aws-sdk-2'
106+ mapping from : ' http-auth-spi' , to : ' aws-sdk-2'
107+ mapping from : ' http-client-spi' , to : ' aws-sdk-2'
108+ mapping from : ' identity-spi' , to : ' aws-sdk-2'
109+ mapping from : ' json-utils' , to : ' aws-sdk-2'
110+ mapping from : ' metrics-spi' , to : ' aws-sdk-2'
111+ mapping from : ' profiles' , to : ' aws-sdk-2'
112+ mapping from : ' protocol-core' , to : ' aws-sdk-2'
113+ mapping from : ' regions' , to : ' aws-sdk-2'
114+ mapping from : ' retries' , to : ' aws-sdk-2'
115+ mapping from : ' retries-spi' , to : ' aws-sdk-2'
116+ mapping from : ' s3' , to : ' aws-sdk-2'
117+ mapping from : ' sdk-core' , to : ' aws-sdk-2'
118+ mapping from : ' services' , to : ' aws-sdk-2'
119+ mapping from : ' sts' , to : ' aws-sdk-2'
120+ mapping from : ' third-party-jackson-core' , to : ' aws-sdk-2'
121+ mapping from : ' utils' , to : ' aws-sdk-2'
76122}
77123
78124esplugin. bundleSpec. from(' config/repository-s3' ) {
@@ -86,23 +132,61 @@ tasks.named("internalClusterTest").configure {
86132
87133tasks. named(" thirdPartyAudit" ). configure {
88134 ignoreMissingClasses(
89- // classes are missing
90- ' javax.servlet.ServletContextEvent' ,
91- ' javax.servlet.ServletContextListener' ,
92- ' org.apache.avalon.framework.logger.Logger' ,
93- ' org.apache.log.Hierarchy' ,
94- ' org.apache.log.Logger' ,
95- ' javax.jms.Message' ,
96- // We don't use the kms dependency
97- ' com.amazonaws.services.kms.AWSKMS' ,
98- ' com.amazonaws.services.kms.AWSKMSClient' ,
99- ' com.amazonaws.services.kms.AWSKMSClientBuilder' ,
100- ' com.amazonaws.services.kms.model.DecryptRequest' ,
101- ' com.amazonaws.services.kms.model.DecryptResult' ,
102- ' com.amazonaws.services.kms.model.EncryptRequest' ,
103- ' com.amazonaws.services.kms.model.EncryptResult' ,
104- ' com.amazonaws.services.kms.model.GenerateDataKeyRequest' ,
105- ' com.amazonaws.services.kms.model.GenerateDataKeyResult' ,
106- ' javax.activation.DataHandler'
135+ // missing/unused classes
136+ ' javax.servlet.ServletContextEvent' ,
137+ ' javax.servlet.ServletContextListener' ,
138+ ' org.apache.avalon.framework.logger.Logger' ,
139+ ' org.apache.log.Hierarchy' ,
140+ ' org.apache.log.Logger' ,
141+ ' javax.jms.Message' ,
142+
143+ // We use the Apache HTTP client rather than an AWS common runtime (CRT) one, so we don't need any of these classes:
144+ ' software.amazon.awssdk.crt.CRT' ,
145+ ' software.amazon.awssdk.crt.auth.credentials.Credentials' ,
146+ ' software.amazon.awssdk.crt.auth.credentials.CredentialsProvider' ,
147+ ' software.amazon.awssdk.crt.auth.credentials.DelegateCredentialsProvider$DelegateCredentialsProviderBuilder' ,
148+ ' software.amazon.awssdk.crt.auth.signing.AwsSigner' ,
149+ ' software.amazon.awssdk.crt.auth.signing.AwsSigningConfig$AwsSignatureType' ,
150+ ' software.amazon.awssdk.crt.auth.signing.AwsSigningConfig$AwsSignedBodyHeaderType' ,
151+ ' software.amazon.awssdk.crt.auth.signing.AwsSigningConfig$AwsSigningAlgorithm' ,
152+ ' software.amazon.awssdk.crt.auth.signing.AwsSigningConfig' ,
153+ ' software.amazon.awssdk.crt.auth.signing.AwsSigningResult' ,
154+ ' software.amazon.awssdk.crt.http.HttpHeader' ,
155+ ' software.amazon.awssdk.crt.http.HttpMonitoringOptions' ,
156+ ' software.amazon.awssdk.crt.http.HttpProxyEnvironmentVariableSetting$HttpProxyEnvironmentVariableType' ,
157+ ' software.amazon.awssdk.crt.http.HttpProxyEnvironmentVariableSetting' ,
158+ ' software.amazon.awssdk.crt.http.HttpProxyOptions' ,
159+ ' software.amazon.awssdk.crt.http.HttpRequest' ,
160+ ' software.amazon.awssdk.crt.http.HttpRequestBodyStream' ,
161+ ' software.amazon.awssdk.crt.io.ClientBootstrap' ,
162+ ' software.amazon.awssdk.crt.io.ExponentialBackoffRetryOptions' ,
163+ ' software.amazon.awssdk.crt.io.StandardRetryOptions' ,
164+ ' software.amazon.awssdk.crt.io.TlsCipherPreference' ,
165+ ' software.amazon.awssdk.crt.io.TlsContext' ,
166+ ' software.amazon.awssdk.crt.io.TlsContextOptions' ,
167+ ' software.amazon.awssdk.crt.s3.ChecksumAlgorithm' ,
168+ ' software.amazon.awssdk.crt.s3.ChecksumConfig$ChecksumLocation' ,
169+ ' software.amazon.awssdk.crt.s3.ChecksumConfig' ,
170+ ' software.amazon.awssdk.crt.s3.ResumeToken' ,
171+ ' software.amazon.awssdk.crt.s3.S3Client' ,
172+ ' software.amazon.awssdk.crt.s3.S3ClientOptions' ,
173+ ' software.amazon.awssdk.crt.s3.S3FinishedResponseContext' ,
174+ ' software.amazon.awssdk.crt.s3.S3MetaRequest' ,
175+ ' software.amazon.awssdk.crt.s3.S3MetaRequestOptions$MetaRequestType' ,
176+ ' software.amazon.awssdk.crt.s3.S3MetaRequestOptions' ,
177+ ' software.amazon.awssdk.crt.s3.S3MetaRequestProgress' ,
178+ ' software.amazon.awssdk.crt.s3.S3MetaRequestResponseHandler' ,
179+ ' software.amazon.awssdk.crtcore.CrtConfigurationUtils' ,
180+ ' software.amazon.awssdk.crtcore.CrtConnectionHealthConfiguration$Builder' ,
181+ ' software.amazon.awssdk.crtcore.CrtConnectionHealthConfiguration$DefaultBuilder' ,
182+ ' software.amazon.awssdk.crtcore.CrtConnectionHealthConfiguration' ,
183+ ' software.amazon.awssdk.crtcore.CrtProxyConfiguration$Builder' ,
184+ ' software.amazon.awssdk.crtcore.CrtProxyConfiguration$DefaultBuilder' ,
185+ ' software.amazon.awssdk.crtcore.CrtProxyConfiguration' ,
186+
187+ // We don't use anything eventstream-based so these classes are not needed:
188+ ' software.amazon.eventstream.HeaderValue' ,
189+ ' software.amazon.eventstream.Message' ,
190+ ' software.amazon.eventstream.MessageDecoder'
107191 )
108192}
0 commit comments