diff --git a/aws-sdk-java/pom.xml b/aws-sdk-java/pom.xml index 9831a1f45ba4..05cc856bde48 100644 --- a/aws-sdk-java/pom.xml +++ b/aws-sdk-java/pom.xml @@ -15,7 +15,7 @@ Amazon AutoScaling, etc). https://aws.amazon.com/sdkforjava - + pinpoint @@ -633,17 +633,10 @@ ${awsjavasdk.version} + ${project.artifactId}-${project.version} - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - maven-dependency-plugin org.apache.maven.plugins @@ -655,50 +648,4 @@ - - - - - versiondiff - - - - com.github.siom79.japicmp - japicmp-maven-plugin - 0.5.0 - - - verify - - cmp - - - - - - - software.amazon.awssdk - aws-java-sdk - RELEASE - - - - - ${project.build.directory}/${project.artifactId}-${project.version}.jar - - - - true - public - false - false - - false - - - - - - - diff --git a/bom-internal/pom.xml b/bom-internal/pom.xml new file mode 100644 index 000000000000..25df47c186ef --- /dev/null +++ b/bom-internal/pom.xml @@ -0,0 +1,315 @@ + + + + aws-sdk-java-pom + software.amazon.awssdk + 2.4.4-SNAPSHOT + + 4.0.0 + + bom-internal + + + + + + software.amazon + flow + ${flow.version} + + + commons-io + commons-io + ${commons.io.version} + + + com.fasterxml.jackson.jr + jackson-jr-objects + ${jackson.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.annotations.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-cbor + ${jackson.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + ${jackson.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson.version} + + + software.amazon.ion + ion-java + ${ion.java.version} + + + org.apache.httpcomponents + httpclient + ${httpcomponents.httpclient.version} + + + org.apache.httpcomponents + httpcore + ${httpcomponents.httpcore.version} + + + io.netty + netty-codec-http + ${netty.version} + + + io.netty + netty-codec-http2 + ${netty.version} + + + io.netty + netty-handler + ${netty.version} + + + io.netty + netty-codec + ${netty.version} + + + io.netty + netty-transport + ${netty.version} + + + io.netty + netty-common + ${netty.version} + + + io.netty + netty-buffer + ${netty.version} + + + org.reactivestreams + reactive-streams + ${reactive-streams.version} + + + com.typesafe.netty + netty-reactive-streams-http + ${netty-reactive-streams-http.version} + + + io.netty + netty-transport-native-epoll + ${netty.version} + linux-x86_64 + + + org.eclipse.jdt.core + org.eclipse.jdt + ${org.eclipse.jdt.version} + + + org.eclipse.text + org.eclipse.text + ${org.eclipse.text.version} + + + com.squareup + javapoet + ${javapoet.verion} + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.1 + + + maven-plugin-api + org.apache.maven + 3.5.0 + + + maven-plugin-annotations + org.apache.maven.plugin-tools + 3.5 + + + maven-project + org.apache.maven + 2.2.1 + + + commons-cli + commons-cli + 1.4 + + + org.openjdk.jmh + jmh-core + ${jmh.version} + + + org.openjdk.jmh + jmh-generator-annprocess + ${jmh.version} + provided + + + + + com.puppycrawl.tools + checkstyle + 8.7 + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire.version} + + + + + io.reactivex.rxjava2 + rxjava + ${rxjava.version} + test + + + commons-lang3 + org.apache.commons + ${commons.lang.version} + test + + + commons-lang + commons-lang + ${commons-lang.verson} + test + + + org.unitils + unitils-core + ${unitils.version} + test + + + xmlunit + xmlunit + ${xmlunit.version} + test + + + org.mockito + mockito-core + ${mockito.version} + test + + + nl.jqno.equalsverifier + equalsverifier + ${equalsverifier.version} + test + + + log4j + log4j + ${log4j.version} + test + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + test + + + org.slf4j + slf4j-simple + 1.7.25 + test + + + org.assertj + assertj-core + ${assertj.version} + test + + + software.amazon.awssdk + test-utils + ${awsjavasdk.version} + test + + + com.github.tomakehurst + wiremock + ${wiremock.version} + test + + + com.google.guava + guava + ${guava.version} + test + + + junit + junit + ${junit.version} + test + + + org.hamcrest + hamcrest-all + ${hamcrest.version} + test + + + org.hamcrest + hamcrest-core + ${hamcrest.version} + test + + + org.reactivestreams + reactive-streams-tck + ${reactive-streams.version} + test + + + com.google.jimfs + jimfs + ${jimfs.version} + test + + + + + \ No newline at end of file diff --git a/build-tools/pom.xml b/build-tools/pom.xml index c4f1455bacef..4d1bd29d2a90 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -17,37 +17,38 @@ + 4.0.0 + software.amazon.awssdk build-tools - AWS Java SDK :: Build Tools 1.0 - This package holds the resources used for checkstyle and spotbugs. - - - UTF-8 - 2.8.2 - 3.7.0 - + AWS Java SDK :: Build Tools + This package holds the resources used for checkstyle and spotbugs. org.apache.maven.plugins - maven-deploy-plugin - ${maven-deploy-plugin.version} + maven-compiler-plugin - true + 1.8 + 1.8 + + + org.codehaus.mojo + build-helper-maven-plugin + + org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} + maven-deploy-plugin + 3.1.1 - 1.8 - 1.8 + true diff --git a/bundle/pom.xml b/bundle/pom.xml index a28e4c822433..33a9879fe7b9 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -37,10 +37,22 @@ true + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + + - aws-sdk-java software.amazon.awssdk + aws-sdk-java ${awsjavasdk.version} diff --git a/codegen-lite-maven-plugin/pom.xml b/codegen-lite-maven-plugin/pom.xml index f6a6105025a9..439f935f9615 100644 --- a/codegen-lite-maven-plugin/pom.xml +++ b/codegen-lite-maven-plugin/pom.xml @@ -24,27 +24,35 @@ 1.8 - + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + + + + codegen-lite + software.amazon.awssdk + ${awsjavasdk.version} + maven-plugin-api org.apache.maven - 3.5.0 maven-plugin-annotations org.apache.maven.plugin-tools - 3.5 maven-project org.apache.maven - 2.2.1 - - - codegen-lite - software.amazon.awssdk - [${awsjavasdk.version}] diff --git a/codegen-lite/pom.xml b/codegen-lite/pom.xml index 3edae64f6c67..8721159676c8 100644 --- a/codegen-lite/pom.xml +++ b/codegen-lite/pom.xml @@ -19,11 +19,32 @@ 1.8 + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + + + + software.amazon.awssdk + annotations + ${awsjavasdk.version} + + + software.amazon.awssdk + utils + ${awsjavasdk.version} + com.squareup javapoet - ${javapoet.verion} com.fasterxml.jackson.core @@ -32,8 +53,16 @@ com.fasterxml.jackson.jr jackson-jr-objects - ${jackson.version} + + org.eclipse.jdt.core + org.eclipse.jdt + + + org.eclipse.text + org.eclipse.text + + org.hamcrest hamcrest-all @@ -54,26 +83,6 @@ junit test - - software.amazon.awssdk - annotations - [${awsjavasdk.version}] - - - software.amazon.awssdk - utils - [${awsjavasdk.version}] - - - org.eclipse.jdt.core - org.eclipse.jdt - ${org.eclipse.jdt.version} - - - org.eclipse.text - org.eclipse.text - ${org.eclipse.text.version} - diff --git a/codegen-maven-plugin/pom.xml b/codegen-maven-plugin/pom.xml index d43ba04eec22..acb263dc1a23 100644 --- a/codegen-maven-plugin/pom.xml +++ b/codegen-maven-plugin/pom.xml @@ -39,27 +39,35 @@ 1.8 - + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + + + + codegen + software.amazon.awssdk + ${awsjavasdk.version} + maven-plugin-api org.apache.maven - 3.5.0 maven-plugin-annotations org.apache.maven.plugin-tools - 3.5 maven-project org.apache.maven - 2.2.1 - - - codegen - software.amazon.awssdk - ${awsjavasdk.version} diff --git a/codegen/pom.xml b/codegen/pom.xml index abd1c667557c..fada07f2879f 100644 --- a/codegen/pom.xml +++ b/codegen/pom.xml @@ -33,7 +33,19 @@ 1.8 - + + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + + software.amazon.awssdk @@ -70,20 +82,48 @@ software.amazon.awssdk ${awsjavasdk.version} + + software.amazon.awssdk + aws-json-protocol + ${awsjavasdk.version} + + + software.amazon.awssdk + aws-cbor-protocol + ${awsjavasdk.version} + + + software.amazon.awssdk + aws-ion-protocol + ${awsjavasdk.version} + + + software.amazon.awssdk + aws-query-protocol + ${awsjavasdk.version} + + + software.amazon.awssdk + aws-xml-protocol + ${awsjavasdk.version} + + + software.amazon.awssdk + protocol-core + ${awsjavasdk.version} + + org.eclipse.jdt.core org.eclipse.jdt - ${org.eclipse.jdt.version} org.eclipse.text org.eclipse.text - ${org.eclipse.text.version} com.squareup javapoet - ${javapoet.verion} com.fasterxml.jackson.core @@ -105,36 +145,6 @@ org.reactivestreams reactive-streams - - software.amazon.awssdk - aws-json-protocol - ${awsjavasdk.version} - - - software.amazon.awssdk - aws-cbor-protocol - ${awsjavasdk.version} - - - software.amazon.awssdk - aws-ion-protocol - ${awsjavasdk.version} - - - software.amazon.awssdk - aws-query-protocol - ${awsjavasdk.version} - - - software.amazon.awssdk - aws-xml-protocol - ${awsjavasdk.version} - - - software.amazon.awssdk - protocol-core - ${awsjavasdk.version} - junit @@ -157,65 +167,4 @@ test - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - - - - - - - versiondiff - - - - com.github.siom79.japicmp - japicmp-maven-plugin - 0.5.0 - - - verify - - cmp - - - - - - - software.amazon.awssdk - codegen - RELEASE - - - - - ${project.build.directory}/${project.artifactId}-${project.version}.jar - - - - true - public - false - false - - false - - - - - - - diff --git a/core/auth/pom.xml b/core/auth/pom.xml index d135d11fce9e..0d5713f39cee 100644 --- a/core/auth/pom.xml +++ b/core/auth/pom.xml @@ -54,37 +54,31 @@ software.amazon flow - ${flow.version} junit junit - ${junit.version} test com.github.tomakehurst wiremock - ${wiremock.version} test log4j log4j - ${log4j.version} test org.slf4j slf4j-log4j12 - ${slf4j.version} test software.amazon.awssdk test-utils - ${awsjavasdk.version} test diff --git a/core/aws-core/pom.xml b/core/aws-core/pom.xml index f3c4f2bdbcec..4a3030ef9724 100644 --- a/core/aws-core/pom.xml +++ b/core/aws-core/pom.xml @@ -55,9 +55,14 @@ software.amazon flow - ${flow.version} + + software.amazon.awssdk + test-utils + ${awsjavasdk.version} + test + junit junit @@ -78,12 +83,6 @@ slf4j-log4j12 test - - software.amazon.awssdk - test-utils - ${awsjavasdk.version} - test - org.hamcrest hamcrest-all @@ -125,12 +124,6 @@ guava test - - commons-lang - commons-lang - ${commons-lang.verson} - test - io.reactivex.rxjava2 rxjava @@ -139,18 +132,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - org.codehaus.mojo - build-helper-maven-plugin - org.apache.maven.plugins maven-jar-plugin @@ -163,21 +144,6 @@ - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.surefire.version} - - ${argLine} - - 1C - - - - diff --git a/core/pom.xml b/core/pom.xml index fb19acc7c996..69dab09cf902 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -46,4 +46,16 @@ protocols + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + + diff --git a/core/profiles/pom.xml b/core/profiles/pom.xml index 77153933f3e0..be077a0b7268 100644 --- a/core/profiles/pom.xml +++ b/core/profiles/pom.xml @@ -43,6 +43,7 @@ annotations ${awsjavasdk.version} + software.amazon.awssdk test-utils diff --git a/core/protocols/aws-ion-protocol/pom.xml b/core/protocols/aws-ion-protocol/pom.xml index cd0711618d07..00e2d27ccf18 100644 --- a/core/protocols/aws-ion-protocol/pom.xml +++ b/core/protocols/aws-ion-protocol/pom.xml @@ -54,6 +54,12 @@ com.fasterxml.jackson.core jackson-core + + software.amazon.awssdk + protocol-core + ${awsjavasdk.version} + test + junit junit @@ -74,12 +80,6 @@ mockito-core test - - software.amazon.awssdk - protocol-core - ${awsjavasdk.version} - test - diff --git a/core/regions/pom.xml b/core/regions/pom.xml index ca3906af92c5..c3002debdf96 100644 --- a/core/regions/pom.xml +++ b/core/regions/pom.xml @@ -31,22 +31,22 @@ software.amazon.awssdk annotations - [${awsjavasdk.version}] + ${awsjavasdk.version} software.amazon.awssdk utils - [${awsjavasdk.version}] + ${awsjavasdk.version} software.amazon.awssdk sdk-core - [${awsjavasdk.version}] + ${awsjavasdk.version} software.amazon.awssdk profiles - [${awsjavasdk.version}] + ${awsjavasdk.version} com.fasterxml.jackson.core @@ -63,19 +63,17 @@ software.amazon.awssdk test-utils - [${awsjavasdk.version}] + ${awsjavasdk.version} test junit junit - ${junit.version} test com.github.tomakehurst wiremock - ${wiremock.version} test diff --git a/core/sdk-core/pom.xml b/core/sdk-core/pom.xml index c6bf55a1c558..6ba0ea0ea480 100644 --- a/core/sdk-core/pom.xml +++ b/core/sdk-core/pom.xml @@ -169,21 +169,7 @@ - - - src/main/resources - true - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - org.codehaus.mojo build-helper-maven-plugin @@ -226,12 +212,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven.surefire.version} - - - 1C - ${argLine} - diff --git a/http-client-spi/pom.xml b/http-client-spi/pom.xml index 7490790b0d63..86bcb3a94edc 100644 --- a/http-client-spi/pom.xml +++ b/http-client-spi/pom.xml @@ -27,6 +27,18 @@ http-client-spi AWS Java SDK :: HTTP Client Interface + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + + software.amazon.awssdk @@ -56,7 +68,6 @@ org.reactivestreams reactive-streams-tck - ${reactive-streams.version} test diff --git a/http-clients/apache-client/pom.xml b/http-clients/apache-client/pom.xml index aa29538518c4..ad9ed77d435d 100644 --- a/http-clients/apache-client/pom.xml +++ b/http-clients/apache-client/pom.xml @@ -43,12 +43,6 @@ annotations ${awsjavasdk.version} - - software.amazon.awssdk - http-client-tests - ${awsjavasdk.version} - test - org.apache.httpcomponents httpclient @@ -58,6 +52,12 @@ httpcore + + software.amazon.awssdk + http-client-tests + ${awsjavasdk.version} + test + junit junit diff --git a/http-clients/netty-nio-client/pom.xml b/http-clients/netty-nio-client/pom.xml index 316971e35982..fca07395cdb2 100644 --- a/http-clients/netty-nio-client/pom.xml +++ b/http-clients/netty-nio-client/pom.xml @@ -79,7 +79,6 @@ io.netty netty-transport-native-epoll - ${netty.version} linux-x86_64 @@ -92,7 +91,6 @@ org.reactivestreams reactive-streams - org.slf4j slf4j-api @@ -127,7 +125,6 @@ org.reactivestreams reactive-streams-tck - ${reactive-streams.version} test @@ -144,18 +141,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - org.codehaus.mojo - build-helper-maven-plugin - org.apache.maven.plugins maven-jar-plugin diff --git a/http-clients/pom.xml b/http-clients/pom.xml index 7649c8626a96..a62c54e75470 100644 --- a/http-clients/pom.xml +++ b/http-clients/pom.xml @@ -39,4 +39,16 @@ url-connection-client + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + + diff --git a/http-clients/url-connection-client/pom.xml b/http-clients/url-connection-client/pom.xml index 6973839b0da6..54773e5c32a5 100644 --- a/http-clients/url-connection-client/pom.xml +++ b/http-clients/url-connection-client/pom.xml @@ -88,18 +88,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - org.codehaus.mojo - build-helper-maven-plugin - org.apache.maven.plugins maven-jar-plugin diff --git a/pom.xml b/pom.xml index 216c77371784..776dc982557b 100644 --- a/pom.xml +++ b/pom.xml @@ -49,12 +49,12 @@ - + aws-sdk-java core services - aws-sdk-java bom + bom-internal codegen http-client-spi http-clients @@ -103,6 +103,7 @@ 3.5.101 2.1.9 1.10 + 1.21 4.12 @@ -153,208 +154,13 @@ - - - org.unitils - unitils-core - ${unitils.version} - - - xmlunit - xmlunit - ${xmlunit.version} - - - commons-io - commons-io - ${commons.io.version} - - - com.fasterxml.jackson.jr - jackson-jr-objects - ${jackson.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.annotations.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-cbor - ${jackson.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - ${jackson.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} - - - software.amazon.ion - ion-java - ${ion.java.version} - - - commons-lang3 - org.apache.commons - ${commons.lang.version} - - - org.apache.httpcomponents - httpclient - ${httpcomponents.httpclient.version} - - - org.apache.httpcomponents - httpcore - ${httpcomponents.httpcore.version} - - - io.netty - netty-codec-http - ${netty.version} - - - io.netty - netty-codec-http2 - ${netty.version} - - - io.netty - netty-handler - ${netty.version} - - - io.netty - netty-codec - ${netty.version} - - - io.netty - netty-transport - ${netty.version} - - - io.netty - netty-common - ${netty.version} - - - io.netty - netty-buffer - ${netty.version} - - - org.mockito - mockito-core - ${mockito.version} - - - nl.jqno.equalsverifier - equalsverifier - ${equalsverifier.version} - test - - - org.assertj - assertj-core - ${assertj.version} - - - log4j - log4j - ${log4j.version} - - - com.typesafe.netty - netty-reactive-streams-http - ${netty-reactive-streams-http.version} - - - io.reactivex.rxjava2 - rxjava - ${rxjava.version} - - - org.reactivestreams - reactive-streams - ${reactive-streams.version} - - - - - software.amazon.awssdk - test-utils - ${awsjavasdk.version} - test - - - com.github.tomakehurst - wiremock - ${wiremock.version} - test - - - com.google.guava - guava - ${guava.version} - test - - - junit - junit - ${junit.version} - - - org.hamcrest - hamcrest-all - ${hamcrest.version} - - - org.hamcrest - hamcrest-core - ${hamcrest.version} - - - org.reactivestreams - reactive-streams-tck - ${reactive-streams.version} - test - - - com.google.jimfs - jimfs - ${jimfs.version} - test - - + + + + + aws-sdk-java-${project.artifactId}-${project.version} @@ -542,6 +348,21 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + org.codehaus.mojo + build-helper-maven-plugin + + org.apache.maven.plugins maven-dependency-plugin diff --git a/release-scripts/pom.xml b/release-scripts/pom.xml index c82b006186dc..cc36d7513b0e 100644 --- a/release-scripts/pom.xml +++ b/release-scripts/pom.xml @@ -35,37 +35,47 @@ 1.8 + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + + + + software.amazon.awssdk + utils + ${awsjavasdk.version} + org.apache.commons commons-lang3 - 3.7 + compile commons-io commons-io - 2.6 + compile commons-cli commons-cli - 1.4 - - - software.amazon.awssdk - utils - ${awsjavasdk.version} + compile log4j log4j - ${log4j.version} runtime org.slf4j slf4j-log4j12 - ${slf4j.version} runtime diff --git a/services/pom.xml b/services/pom.xml index 1f04f2923ef0..3be43ac287bc 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -9,9 +9,11 @@ services AWS Java SDK :: Services pom + ../.. + acm apigateway @@ -183,6 +185,19 @@ The AWS Java SDK services https://aws.amazon.com/sdkforjava + + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + + software.amazon.awssdk @@ -279,17 +294,10 @@ test + - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - software.amazon.awssdk codegen-maven-plugin @@ -303,7 +311,7 @@ - + com.github.spotbugs spotbugs-maven-plugin @@ -313,22 +321,8 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - org.codehaus.mojo - build-helper-maven-plugin - - + diff --git a/services/s3/pom.xml b/services/s3/pom.xml index 4d31d28cb444..b7e2657d5938 100644 --- a/services/s3/pom.xml +++ b/services/s3/pom.xml @@ -45,7 +45,6 @@ - software.amazon.awssdk diff --git a/test/codegen-generated-classes-test/pom.xml b/test/codegen-generated-classes-test/pom.xml index 53c6cef29178..104698c4e03d 100644 --- a/test/codegen-generated-classes-test/pom.xml +++ b/test/codegen-generated-classes-test/pom.xml @@ -21,6 +21,18 @@ ../.. + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + + software.amazon.awssdk @@ -62,6 +74,11 @@ software.amazon.awssdk ${awsjavasdk.version} + + software.amazon.awssdk + utils + ${awsjavasdk.version} + netty-nio-client software.amazon.awssdk @@ -126,11 +143,6 @@ ${awsjavasdk.version} test - - software.amazon.awssdk - utils - ${awsjavasdk.version} - org.assertj assertj-core diff --git a/test/dynamodbdocument-v1/pom.xml b/test/dynamodbdocument-v1/pom.xml index b4c7115816dd..d2fbe71c38f0 100644 --- a/test/dynamodbdocument-v1/pom.xml +++ b/test/dynamodbdocument-v1/pom.xml @@ -33,22 +33,17 @@ ../.. - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - org.codehaus.mojo - build-helper-maven-plugin - - - + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + diff --git a/test/dynamodbmapper-v1/pom.xml b/test/dynamodbmapper-v1/pom.xml index 2b8fee2f6347..e3fdc677fac2 100644 --- a/test/dynamodbmapper-v1/pom.xml +++ b/test/dynamodbmapper-v1/pom.xml @@ -33,22 +33,17 @@ ../.. - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - org.codehaus.mojo - build-helper-maven-plugin - - - + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + diff --git a/test/http-client-tests/pom.xml b/test/http-client-tests/pom.xml index af521e7760a6..d827d3300036 100644 --- a/test/http-client-tests/pom.xml +++ b/test/http-client-tests/pom.xml @@ -34,22 +34,17 @@ ../.. - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - org.codehaus.mojo - build-helper-maven-plugin - - - + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + @@ -65,14 +60,17 @@ junit junit + compile org.assertj assertj-core + compile org.mockito mockito-core + compile com.github.tomakehurst diff --git a/test/module-path-tests/pom.xml b/test/module-path-tests/pom.xml index 89859b4393fb..96ce2afd6a54 100644 --- a/test/module-path-tests/pom.xml +++ b/test/module-path-tests/pom.xml @@ -31,14 +31,26 @@ A set of tests to run v2 in module path with Java 9+. https://aws.amazon.com/sdkforjava + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + + software.amazon.awssdk s3 - ${project.parent.version} + ${awsjavasdk.version} - + netty-nio-client software.amazon.awssdk @@ -47,10 +59,10 @@ software.amazon.awssdk protocol-tests - ${project.parent.version} + ${awsjavasdk.version} - + netty-nio-client software.amazon.awssdk @@ -59,22 +71,22 @@ software.amazon.awssdk apache-client - ${project.parent.version} + ${awsjavasdk.version} software.amazon.awssdk url-connection-client - ${project.parent.version} + ${awsjavasdk.version} org.slf4j slf4j-simple - ${slf4j.version} + compile software.amazon.awssdk service-test-utils - ${project.parent.version} + ${awsjavasdk.version} compile diff --git a/test/protocol-tests-core/pom.xml b/test/protocol-tests-core/pom.xml index 048e1c93bda8..2443987c6d82 100644 --- a/test/protocol-tests-core/pom.xml +++ b/test/protocol-tests-core/pom.xml @@ -33,6 +33,18 @@ ../.. + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + + software.amazon.awssdk @@ -62,6 +74,7 @@ software.amazon.ion ion-java + compile org.apache.httpcomponents @@ -74,10 +87,12 @@ org.unitils unitils-core + compile xmlunit xmlunit + compile software.amazon.awssdk @@ -97,14 +112,17 @@ junit junit + compile org.hamcrest hamcrest-all + compile commons-io commons-io + compile com.fasterxml.jackson.core @@ -119,21 +137,4 @@ jackson-annotations - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - - org.codehaus.mojo - build-helper-maven-plugin - - - - + \ No newline at end of file diff --git a/test/protocol-tests/pom.xml b/test/protocol-tests/pom.xml index cf174a3d21ab..051558a03d6b 100644 --- a/test/protocol-tests/pom.xml +++ b/test/protocol-tests/pom.xml @@ -33,6 +33,18 @@ ../.. + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + + software.amazon.awssdk @@ -54,7 +66,6 @@ protocol-core ${awsjavasdk.version} - software.amazon.awssdk annotations @@ -150,10 +161,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - software.amazon.awssdk codegen-maven-plugin @@ -198,7 +205,6 @@ - diff --git a/test/sdk-benchmarks/pom.xml b/test/sdk-benchmarks/pom.xml index 94fae936adaf..59e0a6c6fb19 100755 --- a/test/sdk-benchmarks/pom.xml +++ b/test/sdk-benchmarks/pom.xml @@ -29,16 +29,26 @@ AWS Java SDK :: Test :: SDK Benchmarks Contains JMH benchmark code for the SDK + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + + org.openjdk.jmh jmh-core - ${jmh.version} org.openjdk.jmh jmh-generator-annprocess - ${jmh.version} provided @@ -47,55 +57,47 @@ aws-java-sdk-core ${sdk-v1.version} - com.amazonaws aws-java-sdk-dynamodb ${sdk-v1.version} - - - software.amazon.awssdk - dynamodb - ${awsjavasdk.version} - - com.amazonaws aws-java-sdk-ec2 ${sdk-v1.version} + + software.amazon.awssdk + dynamodb + ${awsjavasdk.version} + software.amazon.awssdk ec2 ${awsjavasdk.version} - software.amazon.awssdk aws-query-protocol ${awsjavasdk.version} - software.amazon.awssdk aws-json-protocol ${awsjavasdk.version} - software.amazon.awssdk protocol-core ${awsjavasdk.version} - software.amazon.awssdk sdk-core ${awsjavasdk.version} - software.amazon.awssdk http-client-spi @@ -106,20 +108,6 @@ UTF-8 - - - 1.21 - - - 1.8 - - benchmarks 1.11.404 @@ -128,16 +116,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - ${javac.target} - ${javac.target} - ${javac.target} - - org.apache.maven.plugins maven-shade-plugin diff --git a/test/service-test-utils/pom.xml b/test/service-test-utils/pom.xml index d486be46a386..47c3df469f1a 100644 --- a/test/service-test-utils/pom.xml +++ b/test/service-test-utils/pom.xml @@ -34,7 +34,18 @@ ../.. - + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + + software.amazon.awssdk @@ -64,30 +75,17 @@ junit junit + compile org.hamcrest hamcrest-core - - - org.mockito - mockito-core - test + compile - - org.apache.maven.plugins - maven-compiler-plugin - - - - org.apache.maven.plugins - maven-javadoc-plugin - - org.apache.maven.plugins maven-dependency-plugin diff --git a/test/test-utils/pom.xml b/test/test-utils/pom.xml index d514f10d37e0..8af110c56fef 100644 --- a/test/test-utils/pom.xml +++ b/test/test-utils/pom.xml @@ -34,7 +34,18 @@ ../.. - + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + + software.amazon.awssdk @@ -49,6 +60,7 @@ org.hamcrest hamcrest-core + compile com.fasterxml.jackson.core @@ -62,6 +74,7 @@ junit junit + compile com.fasterxml.jackson.core @@ -70,6 +83,7 @@ log4j log4j + compile org.mockito diff --git a/utils/pom.xml b/utils/pom.xml index d2ac2a50e2db..ab240ad4174e 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -28,6 +28,18 @@ AWS Java SDK :: Utilities + + + + software.amazon.awssdk + bom-internal + ${project.version} + pom + import + + + + org.reactivestreams