Merge pull request #963 from aws/salande/revert-s3control

bmaizels · web-flow · commit 036fed567f9b · 2020-09-18T15:19:12.000-07:00
Revert "Changes document error root definition for XML based errors t…
diff --git a/.changes/2.14.21.json b/.changes/2.14.21.json
@@ -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",
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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.
diff --git a/services/s3control/pom.xml b/services/s3control/pom.xml
@@ -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>
diff --git a/services/s3control/src/main/resources/codegen-resources/customization.config b/services/s3control/src/main/resources/codegen-resources/customization.config
@@ -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"
+    }
 }
diff --git a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/functionaltests/CreateJobFunctionalTest.java b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/functionaltests/CreateJobFunctionalTest.java
diff --git a/services/s3control/src/test/resources/log4j.properties b/services/s3control/src/test/resources/log4j.properties

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,5 @@`
`3`	`3`	`"customResponseMetadata": {`
`4`	`4`	`"EXTENDED_REQUEST_ID": "x-amz-id-2",`
`5`	`5`	`"REQUEST_ID": "x-amz-request-id"`
`6`		`- },`
`7`		`- "customProtocolFactoryFqcn": "software.amazon.awssdk.protocols.xml.AwsS3ProtocolFactory"`
	`6`	`+ }`
`8`	`7`	`}`