Skip to content

Commit 3b0687d

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #1547 from aws/staging/24af5921-1815-473f-b159-30d16855bc47
Pull request: release <- staging/24af5921-1815-473f-b159-30d16855bc47
2 parents 5fdf87a + 6ae9660 commit 3b0687d

File tree

416 files changed

+3048
-5358
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

416 files changed

+3048
-5358
lines changed

‎.brazil.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"modules": {
3+
"third-party-jackson-core": {
4+
"artifactType": "JAR",
5+
"includes": ["target/aws-sdk-java-third-party-jackson-core-*.jar"]
6+
},
7+
"third-party-jackson-dataformat-cbor": {
8+
"artifactType": "JAR",
9+
"includes": ["target/aws-sdk-java-third-party-jackson-dataformat-cbor-*.jar"]
10+
}
11+
}
12+
}

‎.changes/2.17.0.json

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"version": "2.17.0",
3+
"date": "2021-07-19",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "AWS RoboMaker",
8+
"contributor": "",
9+
"description": "This release allows customers to create a new version of WorldTemplates with support for Doors."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "Amazon Location Service",
14+
"contributor": "",
15+
"description": "Add five new API operations: UpdateGeofenceCollection, UpdateMap, UpdatePlaceIndex, UpdateRouteCalculator, UpdateTracker."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "Amazon EMR Containers",
20+
"contributor": "",
21+
"description": "Updated DescribeManagedEndpoint and ListManagedEndpoints to return failureReason and stateDetails in API response."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "AWS SDK for Java v2",
26+
"contributor": "",
27+
"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/"
28+
},
29+
{
30+
"type": "feature",
31+
"category": "AWS Health APIs and Notifications",
32+
"contributor": "",
33+
"description": "In the Health API, the maximum number of entities for the EventFilter and EntityFilter data types has changed from 100 to 99. This change is related to an internal optimization of the AWS Health service."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "AWS Direct Connect",
38+
"contributor": "",
39+
"description": "Documentation updates for directconnect"
40+
},
41+
{
42+
"type": "feature",
43+
"category": "EC2 Image Builder",
44+
"contributor": "",
45+
"description": "Documentation updates for reversal of default value for additional instance configuration SSM switch, plus improved descriptions for semantic versioning."
46+
}
47+
]
48+
}

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
# Maven
1515
target/
1616

17+
# JEnv
18+
.java-version
19+
20+
# Shade
1721
**/dependency-reduced-pom.xml
1822

1923
*.pyc

‎CHANGELOG.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
1+
# __2.17.0__ __2021-07-19__
2+
## __AWS Direct Connect__
3+
- ### Features
4+
- Documentation updates for directconnect
5+
6+
## __AWS Health APIs and Notifications__
7+
- ### Features
8+
- In the Health API, the maximum number of entities for the EventFilter and EntityFilter data types has changed from 100 to 99. This change is related to an internal optimization of the AWS Health service.
9+
10+
## __AWS RoboMaker__
11+
- ### Features
12+
- This release allows customers to create a new version of WorldTemplates with support for Doors.
13+
14+
## __AWS SDK for Java v2__
15+
- ### Features
16+
- 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/
17+
18+
## __Amazon EMR Containers__
19+
- ### Features
20+
- Updated DescribeManagedEndpoint and ListManagedEndpoints to return failureReason and stateDetails in API response.
21+
22+
## __Amazon Location Service__
23+
- ### Features
24+
- Add five new API operations: UpdateGeofenceCollection, UpdateMap, UpdatePlaceIndex, UpdateRouteCalculator, UpdateTracker.
25+
26+
## __EC2 Image Builder__
27+
- ### Features
28+
- Documentation updates for reversal of default value for additional instance configuration SSM switch, plus improved descriptions for semantic versioning.
29+
130
# __2.16.104__ __2021-07-16__
231
## __AWS Audit Manager__
332
- ### Features

‎NOTICE.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ This software includes third party software subject to the following copyrights:
1212
- PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc.
1313
- Apache Commons Lang - https://github.com/apache/commons-lang
1414
- Netty Reactive Streams - https://github.com/playframework/netty-reactive-streams
15+
- Jackson-core - https://github.com/FasterXML/jackson-core
16+
- Jackson-dataformat-cbor - https://github.com/FasterXML/jackson-dataformats-binary
1517

1618
The licenses for these third party components are included in LICENSE.txt
1719

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ To automatically manage module versions (currently all modules have the same ver
5252
<dependency>
5353
<groupId>software.amazon.awssdk</groupId>
5454
<artifactId>bom</artifactId>
55-
<version>2.16.104</version>
55+
<version>2.17.0</version>
5656
<type>pom</type>
5757
<scope>import</scope>
5858
</dependency>
@@ -86,12 +86,12 @@ Alternatively you can add dependencies for the specific services you use only:
8686
<dependency>
8787
<groupId>software.amazon.awssdk</groupId>
8888
<artifactId>ec2</artifactId>
89-
<version>2.16.104</version>
89+
<version>2.17.0</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.16.104</version>
94+
<version>2.17.0</version>
9595
</dependency>
9696
```
9797

@@ -103,7 +103,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
103103
<dependency>
104104
<groupId>software.amazon.awssdk</groupId>
105105
<artifactId>aws-sdk-java</artifactId>
106-
<version>2.16.104</version>
106+
<version>2.17.0</version>
107107
</dependency>
108108
```
109109

‎archetypes/archetype-app-quickstart/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>archetypes</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.16.104</version>
23+
<version>2.17.0</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

@@ -171,4 +171,4 @@
171171
</plugins>
172172
</build>
173173

174-
</project>
174+
</project>

‎archetypes/archetype-lambda/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>archetypes</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.16.104</version>
23+
<version>2.17.0</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetype-lambda</artifactId>
@@ -169,4 +169,4 @@
169169
</plugin>
170170
</plugins>
171171
</build>
172-
</project>
172+
</project>

‎archetypes/archetype-tools/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>archetypes</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.16.104</version>
23+
<version>2.17.0</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

@@ -59,4 +59,4 @@
5959
</plugins>
6060
</build>
6161

62-
</project>
62+
</project>

‎archetypes/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>aws-sdk-java-pom</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.16.104</version>
23+
<version>2.17.0</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetypes</artifactId>
@@ -34,4 +34,4 @@
3434
<description>
3535
Maven Archetypes for applications using Java SDK 2.x
3636
</description>
37-
</project>
37+
</project>

‎aws-sdk-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>software.amazon.awssdk</groupId>
1919
<artifactId>aws-sdk-java-pom</artifactId>
20-
<version>2.16.104</version>
20+
<version>2.17.0</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>aws-sdk-java</artifactId>

‎bom-internal/pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>aws-sdk-java-pom</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.16.104</version>
23+
<version>2.17.0</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

@@ -84,11 +84,6 @@
8484
<artifactId>jackson-datatype-jsr310</artifactId>
8585
<version>${jackson.version}</version>
8686
</dependency>
87-
<dependency>
88-
<groupId>software.amazon.ion</groupId>
89-
<artifactId>ion-java</artifactId>
90-
<version>${ion.java.version}</version>
91-
</dependency>
9287
<dependency>
9388
<groupId>org.apache.httpcomponents</groupId>
9489
<artifactId>httpclient</artifactId>

‎bom/pom.xml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>software.amazon.awssdk</groupId>
1919
<artifactId>aws-sdk-java-pom</artifactId>
20-
<version>2.16.104</version>
20+
<version>2.17.0</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>
@@ -64,27 +64,37 @@
6464
</dependency>
6565
<dependency>
6666
<groupId>software.amazon.awssdk</groupId>
67-
<artifactId>auth</artifactId>
67+
<artifactId>json-utils</artifactId>
6868
<version>${awsjavasdk.version}</version>
6969
</dependency>
7070
<dependency>
7171
<groupId>software.amazon.awssdk</groupId>
72-
<artifactId>aws-core</artifactId>
72+
<artifactId>third-party-jackson-core</artifactId>
7373
<version>${awsjavasdk.version}</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>software.amazon.awssdk</groupId>
77-
<artifactId>profiles</artifactId>
77+
<artifactId>third-party-jackson-dataformat-cbor</artifactId>
7878
<version>${awsjavasdk.version}</version>
7979
</dependency>
8080
<dependency>
8181
<groupId>software.amazon.awssdk</groupId>
82-
<artifactId>aws-cbor-protocol</artifactId>
82+
<artifactId>auth</artifactId>
83+
<version>${awsjavasdk.version}</version>
84+
</dependency>
85+
<dependency>
86+
<groupId>software.amazon.awssdk</groupId>
87+
<artifactId>aws-core</artifactId>
88+
<version>${awsjavasdk.version}</version>
89+
</dependency>
90+
<dependency>
91+
<groupId>software.amazon.awssdk</groupId>
92+
<artifactId>profiles</artifactId>
8393
<version>${awsjavasdk.version}</version>
8494
</dependency>
8595
<dependency>
8696
<groupId>software.amazon.awssdk</groupId>
87-
<artifactId>aws-ion-protocol</artifactId>
97+
<artifactId>aws-cbor-protocol</artifactId>
8898
<version>${awsjavasdk.version}</version>
8999
</dependency>
90100
<dependency>

‎bundle/pom.xml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.16.104</version>
24+
<version>2.17.0</version>
2525
</parent>
2626
<artifactId>bundle</artifactId>
2727
<packaging>jar</packaging>
@@ -70,31 +70,20 @@
7070
<include>com.fasterxml.jackson.jr:*</include>
7171
<include>io.netty:*</include>
7272
<include>com.typesafe.netty:*</include>
73-
<include>com.fasterxml.jackson.core:*</include>
74-
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-cbor</include>
7573
<include>org.apache.httpcomponents:*</include>
7674
<include>org.reactivestreams:*</include>
7775
<include>org.slf4j:*</include>
7876
<include>commons-codec:commons-codec</include>
79-
<include>software.amazon.ion:ion-java</include>
8077
<include>software.amazon.awssdk:*</include>
8178
<include>software.amazon:*</include>
8279
<include>commons-logging:*</include>
8380
</includes>
8481
</artifactSet>
8582
<relocations>
86-
<relocation>
87-
<pattern>com.fasterxml.jackson</pattern>
88-
<shadedPattern>software.amazon.awssdk.thirdparty.com.fasterxml.jackson</shadedPattern>
89-
</relocation>
9083
<relocation>
9184
<pattern>org.apache</pattern>
9285
<shadedPattern>software.amazon.awssdk.thirdparty.org.apache</shadedPattern>
9386
</relocation>
94-
<relocation>
95-
<pattern>software.amazon.ion</pattern>
96-
<shadedPattern>software.amazon.awssdk.thirdparty.ion</shadedPattern>
97-
</relocation>
9887
<relocation>
9988
<pattern>io.netty</pattern>
10089
<shadedPattern>software.amazon.awssdk.thirdparty.io.netty</shadedPattern>

‎change

Whitespace-only changes.

‎codegen-lite-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>aws-sdk-java-pom</artifactId>
25-
<version>2.16.104</version>
25+
<version>2.17.0</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-lite-maven-plugin</artifactId>

‎codegen-lite/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.16.104</version>
24+
<version>2.17.0</version>
2525
</parent>
2626
<artifactId>codegen-lite</artifactId>
2727
<name>AWS Java SDK :: Code Generator Lite</name>

‎codegen-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>aws-sdk-java-pom</artifactId>
25-
<version>2.16.104</version>
25+
<version>2.17.0</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-maven-plugin</artifactId>

‎codegen/pom.xml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.16.104</version>
24+
<version>2.17.0</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>
@@ -102,11 +102,6 @@
102102
<artifactId>aws-cbor-protocol</artifactId>
103103
<version>${awsjavasdk.version}</version>
104104
</dependency>
105-
<dependency>
106-
<groupId>software.amazon.awssdk</groupId>
107-
<artifactId>aws-ion-protocol</artifactId>
108-
<version>${awsjavasdk.version}</version>
109-
</dependency>
110105
<dependency>
111106
<groupId>software.amazon.awssdk</groupId>
112107
<artifactId>aws-query-protocol</artifactId>
@@ -143,6 +138,14 @@
143138
<groupId>com.fasterxml.jackson.jr</groupId>
144139
<artifactId>jackson-jr-stree</artifactId>
145140
</dependency>
141+
<dependency>
142+
<groupId>com.fasterxml.jackson.core</groupId>
143+
<artifactId>jackson-annotations</artifactId>
144+
</dependency>
145+
<dependency>
146+
<groupId>com.fasterxml.jackson.core</groupId>
147+
<artifactId>jackson-databind</artifactId>
148+
</dependency>
146149
<dependency>
147150
<groupId>org.slf4j</groupId>
148151
<artifactId>slf4j-api</artifactId>

0 commit comments

Comments
 (0)