Skip to content

Commit 580bf8a

Browse files
dagnirdagnir
authored
Additional s3 checksum coverage (#5905)
* Additional s3 checksum coverage * Update * Skip releasing and importing internally * Remove verbose logging * Update version * Remove unneeded build plugins * Update version * Update version
1 parent ce235a9 commit 580bf8a

File tree

7 files changed

+1284
-3
lines changed

7 files changed

+1284
-3
lines changed

‎.brazil.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@
111111
"v2-migration-tests": {"skipImport": true},
112112
"crt-unavailable-tests": { "skipImport": true },
113113
"bundle-shading-tests": { "skipImport": true },
114-
"architecture-tests": {"skipImport": true}
114+
"architecture-tests": {"skipImport": true},
115+
"s3-tests": {"skipImport": true}
115116
},
116117

117118
"dependencies": {

‎buildspecs/release-javadoc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ phases:
1818
commands:
1919
- python ./scripts/doc_crosslinks/generate_cross_link_data.py --apiDefinitionsBasePath ./services/ --apiDefinitionsRelativeFilePath src/main/resources/codegen-resources/service-2.json --templateFilePath ./scripts/doc_crosslinks/crosslink_redirect.html --outputFilePath ./scripts/crosslink_redirect.html
2020
- mvn install -P quick -T1C
21-
- mvn clean install javadoc:aggregate -B -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:s3-benchmarks,!:module-path-tests,!:test-utils,!:http-client-tests,!:tests-coverage-reporting,!:sdk-native-image-test,!:ruleset-testing-core,!:old-client-version-compatibility-test,!:crt-unavailable-tests,!:bundle-shading-tests,!:v2-migration,!:v2-migration-tests,!:architecture-tests'
21+
- mvn clean install javadoc:aggregate -B -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:s3-benchmarks,!:module-path-tests,!:test-utils,!:http-client-tests,!:tests-coverage-reporting,!:sdk-native-image-test,!:ruleset-testing-core,!:old-client-version-compatibility-test,!:crt-unavailable-tests,!:bundle-shading-tests,!:v2-migration,!:v2-migration-tests,!:architecture-tests,!:s3-tests'
2222
- RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
2323
-
2424
- aws s3 sync target/site/apidocs/ $DOC_PATH/$RELEASE_VERSION/ --acl="public-read"

‎buildspecs/release-to-maven.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ phases:
3737
awk 'BEGIN { var=ENVIRON["SDK_SIGNING_GPG_KEYNAME"] } { gsub("\\$SDK_SIGNING_GPG_KEYNAME", var, $0); print }' > \
3838
$SETTINGS_XML
3939
40-
mvn clean deploy -B -s $SETTINGS_XML -Ppublishing -DperformRelease -Dspotbugs.skip -DskipTests -Dcheckstyle.skip -Djapicmp.skip -Ddoclint=none -pl !:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:tests-coverage-reporting,!:stability-tests,!:sdk-native-image-test,!:auth-tests,!:s3-benchmarks,!:region-testing,!:old-client-version-compatibility-test,!:crt-unavailable-tests,!:bundle-shading-tests,!:v2-migration-tests,!:architecture-tests -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true
40+
mvn clean deploy -B -s $SETTINGS_XML -Ppublishing -DperformRelease -Dspotbugs.skip -DskipTests -Dcheckstyle.skip -Djapicmp.skip -Ddoclint=none -pl !:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:tests-coverage-reporting,!:stability-tests,!:sdk-native-image-test,!:auth-tests,!:s3-benchmarks,!:region-testing,!:old-client-version-compatibility-test,!:crt-unavailable-tests,!:bundle-shading-tests,!:v2-migration-tests,!:architecture-tests,!:s3-tests -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true
4141
else
4242
echo "This version was already released."
4343
fi

‎pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
<module>test/bundle-shading-tests</module>
9494
<module>test/crt-unavailable-tests</module>
9595
<module>test/architecture-tests</module>
96+
<module>test/s3-tests</module>
9697
</modules>
9798
<scm>
9899
<url>${scm.github.url}</url>

‎test/s3-tests/pom.xml

+184
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,184 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License").
6+
~ You may not use this file except in compliance with the License.
7+
~ A copy of the License is located at
8+
~
9+
~ http://aws.amazon.com/apache2.0
10+
~
11+
~ or in the "license" file accompanying this file. This file is distributed
12+
~ on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
13+
~ express or implied. See the License for the specific language governing
14+
~ permissions and limitations under the License.
15+
-->
16+
17+
<project xmlns="http://maven.apache.org/POM/4.0.0"
18+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<parent>
21+
<artifactId>aws-sdk-java-pom</artifactId>
22+
<groupId>software.amazon.awssdk</groupId>
23+
<version>2.30.33-SNAPSHOT</version>
24+
<relativePath>../../pom.xml</relativePath>
25+
</parent>
26+
<modelVersion>4.0.0</modelVersion>
27+
28+
<artifactId>s3-tests</artifactId>
29+
<name>AWS Java SDK :: Test :: S3 Tests</name>
30+
<description>Testing package for additional S3 and S3 Control testing.</description>
31+
<dependencyManagement>
32+
<dependencies>
33+
<dependency>
34+
<groupId>software.amazon.awssdk</groupId>
35+
<artifactId>bom-internal</artifactId>
36+
<version>${project.version}</version>
37+
<type>pom</type>
38+
<scope>import</scope>
39+
</dependency>
40+
</dependencies>
41+
</dependencyManagement>
42+
43+
<dependencies>
44+
<dependency>
45+
<groupId>software.amazon.awssdk.crt</groupId>
46+
<artifactId>aws-crt</artifactId>
47+
<version>${awscrt.version}</version>
48+
<scope>test</scope>
49+
</dependency>
50+
<dependency>
51+
<groupId>software.amazon.awssdk</groupId>
52+
<artifactId>auth</artifactId>
53+
<version>${awsjavasdk.version}</version>
54+
<scope>test</scope>
55+
</dependency>
56+
<dependency>
57+
<groupId>software.amazon.awssdk</groupId>
58+
<artifactId>http-client-spi</artifactId>
59+
<version>${awsjavasdk.version}</version>
60+
<scope>test</scope>
61+
</dependency>
62+
<dependency>
63+
<groupId>software.amazon.awssdk</groupId>
64+
<artifactId>regions</artifactId>
65+
<version>${awsjavasdk.version}</version>
66+
<scope>test</scope>
67+
</dependency>
68+
<dependency>
69+
<groupId>software.amazon.awssdk</groupId>
70+
<artifactId>sdk-core</artifactId>
71+
<version>${awsjavasdk.version}</version>
72+
<scope>test</scope>
73+
</dependency>
74+
<dependency>
75+
<groupId>software.amazon.awssdk</groupId>
76+
<artifactId>utils</artifactId>
77+
<version>${awsjavasdk.version}</version>
78+
<scope>test</scope>
79+
</dependency>
80+
<dependency>
81+
<groupId>software.amazon.awssdk</groupId>
82+
<artifactId>s3</artifactId>
83+
<version>${awsjavasdk.version}</version>
84+
</dependency>
85+
<dependency>
86+
<groupId>software.amazon.awssdk</groupId>
87+
<artifactId>s3control</artifactId>
88+
<version>${awsjavasdk.version}</version>
89+
<scope>test</scope>
90+
</dependency>
91+
<dependency>
92+
<groupId>software.amazon.awssdk</groupId>
93+
<artifactId>sts</artifactId>
94+
<version>${awsjavasdk.version}</version>
95+
<scope>test</scope>
96+
</dependency>
97+
<dependency>
98+
<groupId>software.amazon.awssdk</groupId>
99+
<artifactId>aws-core</artifactId>
100+
<version>${awsjavasdk.version}</version>
101+
<scope>test</scope>
102+
</dependency>
103+
<dependency>
104+
<groupId>org.assertj</groupId>
105+
<artifactId>assertj-core</artifactId>
106+
<scope>test</scope>
107+
</dependency>
108+
<dependency>
109+
<groupId>org.mockito</groupId>
110+
<artifactId>mockito-core</artifactId>
111+
<scope>test</scope>
112+
</dependency>
113+
<dependency>
114+
<groupId>org.junit.jupiter</groupId>
115+
<artifactId>junit-jupiter</artifactId>
116+
<scope>test</scope>
117+
</dependency>
118+
<dependency>
119+
<groupId>org.junit.vintage</groupId>
120+
<artifactId>junit-vintage-engine</artifactId>
121+
<scope>test</scope>
122+
</dependency>
123+
<dependency>
124+
<groupId>org.apache.logging.log4j</groupId>
125+
<artifactId>log4j-api</artifactId>
126+
<scope>test</scope>
127+
</dependency>
128+
<dependency>
129+
<groupId>org.apache.logging.log4j</groupId>
130+
<artifactId>log4j-core</artifactId>
131+
<scope>test</scope>
132+
</dependency>
133+
<dependency>
134+
<groupId>org.apache.logging.log4j</groupId>
135+
<artifactId>log4j-1.2-api</artifactId>
136+
<version>${log4j.version}</version>
137+
<scope>test</scope>
138+
</dependency>
139+
<dependency>
140+
<groupId>org.apache.logging.log4j</groupId>
141+
<artifactId>log4j-slf4j-impl</artifactId>
142+
<scope>test</scope>
143+
</dependency>
144+
<dependency>
145+
<groupId>io.reactivex.rxjava2</groupId>
146+
<artifactId>rxjava</artifactId>
147+
<scope>test</scope>
148+
</dependency>
149+
<dependency>
150+
<groupId>software.amazon.awssdk</groupId>
151+
<artifactId>checksums</artifactId>
152+
<version>${awsjavasdk.version}</version>
153+
<scope>test</scope>
154+
</dependency>
155+
</dependencies>
156+
157+
<build>
158+
<plugins>
159+
<plugin>
160+
<groupId>org.apache.maven.plugins</groupId>
161+
<artifactId>maven-compiler-plugin</artifactId>
162+
</plugin>
163+
<!-- Disable spotbugs for this test module to speed up the build. -->
164+
<plugin>
165+
<groupId>com.github.spotbugs</groupId>
166+
<artifactId>spotbugs-maven-plugin</artifactId>
167+
<configuration>
168+
<skip>true</skip>
169+
</configuration>
170+
</plugin>
171+
<!-- Disable dependency check for this test module to speed up the build. -->
172+
<plugin>
173+
<groupId>org.apache.maven.plugins</groupId>
174+
<artifactId>maven-dependency-plugin</artifactId>
175+
<version>${maven-dependency-plugin.version}</version>
176+
<configuration>
177+
<failOnWarning>false</failOnWarning>
178+
<ignoreNonCompile>false</ignoreNonCompile>
179+
</configuration>
180+
</plugin>
181+
182+
</plugins>
183+
</build>
184+
</project>

0 commit comments

Comments
 (0)