Skip to content

Commit

Permalink
Merge pull request #963 from aws/salande/revert-s3control
Browse files Browse the repository at this point in the history
Revert "Changes document error root definition for XML based errors t…
bmaizels authored Sep 18, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 0ca7a09 + df6880e commit 036fed5
Showing 6 changed files with 1 addition and 176 deletions.
5 changes: 0 additions & 5 deletions .changes/2.14.21.json
Original file line number Diff line number Diff line change
@@ -17,11 +17,6 @@
"category": "AWS CodeStar connections",
"description": "New integration with the GitHub provider type."
},
{
"type": "bugfix",
"category": "AWS S3 Control",
"description": "Changes document error root definition for XML based errors to same as AWS S3, so that errors are fully parsed."
},
{
"type": "feature",
"category": "AWS SDK for Java v2",
4 changes: 0 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -7,10 +7,6 @@
- ### Features
- AWS Elemental MediaLive now supports batch operations, which allow users to start, stop, and delete multiple MediaLive resources with a single request.

## __AWS S3 Control__
- ### Bugfixes
- Changes document error root definition for XML based errors to same as AWS S3, so that errors are fully parsed.

## __AWS SDK for Java v2__
- ### Features
- Updated service endpoint metadata.
5 changes: 0 additions & 5 deletions services/s3control/pom.xml
Original file line number Diff line number Diff line change
@@ -78,10 +78,5 @@
<version>${awsjavasdk.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
@@ -3,6 +3,5 @@
"customResponseMetadata": {
"EXTENDED_REQUEST_ID": "x-amz-id-2",
"REQUEST_ID": "x-amz-request-id"
},
"customProtocolFactoryFqcn": "software.amazon.awssdk.protocols.xml.AwsS3ProtocolFactory"
}
}

This file was deleted.

33 changes: 0 additions & 33 deletions services/s3control/src/test/resources/log4j.properties

This file was deleted.

0 comments on commit 036fed5

Please sign in to comment.