-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release' into master (#5707)
* v1.20.0 * chore(cli): fix Java dist integ tests (#5695) (#5699) The Java integ test which is run against the dist is failing because the local `cdk-cx-api` Maven artifact cannot be found. Error message: ``` [ERROR] Failed to execute goal on project cdk-init-test: Could not resolve dependencies for project com.myorg:cdk-init-test:jar:0.1: Failed to collect dependencies at software.amazon.awscdk:core:jar:1.20.0 -> software.amazon.awscdk:cdk-cx-api:jar:[1.20.0]: No versions available for software.amazon.awscdk:cdk-cx-api:jar:[1.20.0] within specified range -> [Help 1] ``` It is not clear to me why just this artifact cannot be found while for example `core` can be found correctly, or why this problem only shows up on the `release` branch, but after some reading of the Maven source and local experimentation I have concluded that the proper filename of the Maven metadata file should be `maven-metadata-local.xml` (instead of just `maven-metadata.xml`), so we rename the files before rsync'ing them into the repository now. * remove breaking change that didn't really happen * chore: fixup entries in the CHANGELOG (#5706) Co-authored-by: Rico Huijbers <rix0rrr@gmail.com> Co-authored-by: Elad Ben-Israel <benisrae@amazon.com>
- Loading branch information
1 parent
0f02dad
commit a4e2353
Showing
148 changed files
with
2,013 additions
and
1,949 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,5 +9,5 @@ | |
"tools/*" | ||
], | ||
"rejectCycles": "true", | ||
"version": "1.19.0" | ||
"version": "1.20.0" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.