Release preparation for removing Jackson as an external dependency (a…

…ws#2598) * Moved Jackson from being an external SDK dependency to an internal dependency. Jackson-databind was removed from being a dependency (except in the code generator). Jackson-core and Jackson-dataformat-cbor were moved to shaded dependencies. This was done because Jackson versions are not 100% compatible between minor versions and keeping them up to date were problematic for SDK customers. Customers will see a change in artifact sizes. Customers which do not use Jackson-databind outside of the SDK today will see a ~1 MB artifact size decrease. Customers which do use Jackson-databind outside of the SDK will see a ~0.5 MB artifact size increase. This change required breaking inter-module (protected) APIs, so it should not be released outside of an SDK minor version bump. Customers will not be able to use older client versions with this version of the core libraries. Change summary: 1. Added 'jackson-core' and 'jackson-dataformat-cbor' which contain the SDK's shaded versions with the Jackson packages of the same names. 2. Removed 'aws-ion-protocol' module. This was not used by any public AWS services and can be re-added when service support is needed. 3. Added 'json-utils', a library for reading and parsing JSON. * Version bump to 2.17.0
piotr-goetz-duco · Jul 16, 2021 · 51cf791 · 51cf791
1 parent 361afd8
commit 51cf791
Show file tree

Hide file tree

Showing 407 changed files with 2,488 additions and 5,269 deletions.
diff --git a/.brazil.json b/.brazil.json
@@ -0,0 +1,12 @@
+{
+    "modules": {
+        "third-party-jackson-core": {
+            "artifactType": "JAR",
+            "includes": ["target/aws-sdk-java-third-party-jackson-core-*.jar"]
+        },
+        "third-party-jackson-dataformat-cbor": {
+            "artifactType": "JAR",
+            "includes": ["target/aws-sdk-java-third-party-jackson-dataformat-cbor-*.jar"]
+        }
+    }
+}
diff --git a/.changes/next-release/feature-AWSSDKforJavav2-9e94920.json b/.changes/next-release/feature-AWSSDKforJavav2-9e94920.json
@@ -0,0 +1,6 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "contributor": "", 
+    "type": "feature", 
+    "description": "Moved Jackson from an external SDK dependency to an internal dependency: https://aws.amazon.com/blogs/developer/the-aws-sdk-for-java-2-17-removes-its-external-dependency-on-jackson/"
+}
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,10 @@
 # Maven
 target/
 
+# JEnv
+.java-version
+
+# Shade
 **/dependency-reduced-pom.xml
 
 *.pyc

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -12,6 +12,8 @@ This software includes third party software subject to the following copyrights:
 - PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc.
 - Apache Commons Lang - https://github.com/apache/commons-lang
 - Netty Reactive Streams - https://github.com/playframework/netty-reactive-streams
+- Jackson-core - https://github.com/FasterXML/jackson-core
+- Jackson-dataformat-cbor - https://github.com/FasterXML/jackson-dataformats-binary
 
 The licenses for these third party components are included in LICENSE.txt
 

diff --git a/archetypes/archetype-app-quickstart/pom.xml b/archetypes/archetype-app-quickstart/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.105-SNAPSHOT</version>
+        <version>2.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -171,4 +171,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/archetypes/archetype-lambda/pom.xml b/archetypes/archetype-lambda/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.105-SNAPSHOT</version>
+        <version>2.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetype-lambda</artifactId>
@@ -169,4 +169,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/archetypes/archetype-tools/pom.xml b/archetypes/archetype-tools/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.105-SNAPSHOT</version>
+        <version>2.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -59,4 +59,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.105-SNAPSHOT</version>
+        <version>2.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetypes</artifactId>
@@ -34,4 +34,4 @@
     <description>
         Maven Archetypes for applications using Java SDK 2.x
     </description>
-</project>
+</project>
diff --git a/aws-sdk-java/pom.xml b/aws-sdk-java/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.16.105-SNAPSHOT</version>
+        <version>2.17.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>

diff --git a/bom-internal/pom.xml b/bom-internal/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.105-SNAPSHOT</version>
+        <version>2.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -84,11 +84,6 @@
                 <artifactId>jackson-datatype-jsr310</artifactId>
                 <version>${jackson.version}</version>
             </dependency>
-            <dependency>
-                <groupId>software.amazon.ion</groupId>
-                <artifactId>ion-java</artifactId>
-                <version>${ion.java.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.16.105-SNAPSHOT</version>
+        <version>2.17.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>
@@ -64,27 +64,37 @@
             </dependency>
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
-                <artifactId>auth</artifactId>
+                <artifactId>json-utils</artifactId>
                 <version>${awsjavasdk.version}</version>
             </dependency>
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
-                <artifactId>aws-core</artifactId>
+                <artifactId>third-party-jackson-core</artifactId>
                 <version>${awsjavasdk.version}</version>
             </dependency>
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
-                <artifactId>profiles</artifactId>
+                <artifactId>third-party-jackson-dataformat-cbor</artifactId>
                 <version>${awsjavasdk.version}</version>
             </dependency>
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
-                <artifactId>aws-cbor-protocol</artifactId>
+                <artifactId>auth</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>aws-core</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>profiles</artifactId>
                 <version>${awsjavasdk.version}</version>
             </dependency>
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
-                <artifactId>aws-ion-protocol</artifactId>
+                <artifactId>aws-cbor-protocol</artifactId>
                 <version>${awsjavasdk.version}</version>
             </dependency>
             <dependency>

diff --git a/bundle/pom.xml b/bundle/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.16.105-SNAPSHOT</version>
+        <version>2.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>
@@ -70,31 +70,20 @@
                                 <include>com.fasterxml.jackson.jr:*</include>
                                 <include>io.netty:*</include>
                                 <include>com.typesafe.netty:*</include>
-                                <include>com.fasterxml.jackson.core:*</include>
-                                <include>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor</include>
                                 <include>org.apache.httpcomponents:*</include>
                                 <include>org.reactivestreams:*</include>
                                 <include>org.slf4j:*</include>
                                 <include>commons-codec:commons-codec</include>
-                                <include>software.amazon.ion:ion-java</include>
                                 <include>software.amazon.awssdk:*</include>
                                 <include>software.amazon:*</include>
                                 <include>commons-logging:*</include>
                             </includes>
                         </artifactSet>
                         <relocations>
-                            <relocation>
-                                <pattern>com.fasterxml.jackson</pattern>
-                                <shadedPattern>software.amazon.awssdk.thirdparty.com.fasterxml.jackson</shadedPattern>
-                            </relocation>
                             <relocation>
                                 <pattern>org.apache</pattern>
                                 <shadedPattern>software.amazon.awssdk.thirdparty.org.apache</shadedPattern>
                             </relocation>
-                            <relocation>
-                                <pattern>software.amazon.ion</pattern>
-                                <shadedPattern>software.amazon.awssdk.thirdparty.ion</shadedPattern>
-                            </relocation>
                             <relocation>
                                 <pattern>io.netty</pattern>
                                 <shadedPattern>software.amazon.awssdk.thirdparty.io.netty</shadedPattern>

diff --git a/change b/change
diff --git a/codegen-lite-maven-plugin/pom.xml b/codegen-lite-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.16.105-SNAPSHOT</version>
+        <version>2.17.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-lite-maven-plugin</artifactId>

diff --git a/codegen-lite/pom.xml b/codegen-lite/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.16.105-SNAPSHOT</version>
+        <version>2.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>codegen-lite</artifactId>
     <name>AWS Java SDK :: Code Generator Lite</name>

diff --git a/codegen-maven-plugin/pom.xml b/codegen-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.16.105-SNAPSHOT</version>
+        <version>2.17.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-maven-plugin</artifactId>

diff --git a/codegen/pom.xml b/codegen/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.16.105-SNAPSHOT</version>
+        <version>2.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>
@@ -102,11 +102,6 @@
             <artifactId>aws-cbor-protocol</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>aws-ion-protocol</artifactId>
-            <version>${awsjavasdk.version}</version>
-        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>aws-query-protocol</artifactId>
@@ -143,6 +138,14 @@
             <groupId>com.fasterxml.jackson.jr</groupId>
             <artifactId>jackson-jr-stree</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/Metadata.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/Metadata.java
@@ -499,17 +499,12 @@ public Metadata withJsonVersion(String jsonVersion) {
         return this;
     }
 
-    public boolean isIonProtocol() {
-        return protocol == Protocol.ION;
-    }
-
     public boolean isCborProtocol() {
         return protocol == Protocol.CBOR;
     }
 
     public boolean isJsonProtocol() {
         return protocol == Protocol.CBOR ||
-               protocol == Protocol.ION ||
                protocol == Protocol.AWS_JSON ||
                protocol == Protocol.REST_JSON;
     }

diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/Protocol.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/Protocol.java
@@ -24,8 +24,7 @@ public enum Protocol {
     REST_JSON("rest-json"),
     CBOR("cbor"),
     QUERY("query"),
-    REST_XML("rest-xml"),
-    ION("ion");
+    REST_XML("rest-xml");
 
     private String protocol;
 

diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java
@@ -339,7 +339,6 @@ static ProtocolSpec getProtocolSpecs(PoetExtensions poetExtensions, Intermediate
             case AWS_JSON:
             case REST_JSON:
             case CBOR:
-            case ION:
                 return new JsonProtocolSpec(poetExtensions, model);
             default:
                 throw new RuntimeException("Unknown protocol: " + protocol.name());

diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java
@@ -51,7 +51,6 @@
 import software.amazon.awssdk.core.http.HttpResponseHandler;
 import software.amazon.awssdk.core.protocol.VoidSdkResponse;
 import software.amazon.awssdk.protocols.cbor.AwsCborProtocolFactory;
-import software.amazon.awssdk.protocols.ion.AwsIonProtocolFactory;
 import software.amazon.awssdk.protocols.json.AwsJsonProtocol;
 import software.amazon.awssdk.protocols.json.AwsJsonProtocolFactory;
 import software.amazon.awssdk.protocols.json.BaseAwsJsonProtocolFactory;
@@ -119,8 +118,6 @@ private CodeBlock customErrorCodeFieldName() {
     private Class<?> protocolFactoryClass() {
         if (model.getMetadata().isCborProtocol()) {
             return AwsCborProtocolFactory.class;
-        } else if (model.getMetadata().isIonProtocol()) {
-            return AwsIonProtocolFactory.class;
         } else {
             return AwsJsonProtocolFactory.class;
         }
@@ -377,7 +374,6 @@ public Optional<MethodSpec> createErrorResponseHandler() {
     private String protocolEnumName(software.amazon.awssdk.codegen.model.intermediate.Protocol protocol) {
         switch (protocol) {
             case CBOR:
-            case ION:
             case AWS_JSON:
                 return AWS_JSON.name();
             default:

diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/MarshallerSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/MarshallerSpec.java
@@ -117,7 +117,6 @@ private MarshallerProtocolSpec getProtocolSpecs(software.amazon.awssdk.codegen.m
         switch (protocol) {
             case REST_JSON:
             case CBOR:
-            case ION:
             case AWS_JSON:
                 return getJsonMarshallerSpec();
 

diff --git a/core/annotations/pom.xml b/core/annotations/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.105-SNAPSHOT</version>
+        <version>2.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/arns/pom.xml b/core/arns/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.105-SNAPSHOT</version>
+        <version>2.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -74,4 +74,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,10 @@ @@
     # Maven
     target/
+    # JEnv
+    .java-version
+    # Shade
     **/dependency-reduced-pom.xml
     *.pyc
@@ Expand Down @@