Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: record merge from 'release' to master #5726

Merged
merged 7 commits into from
Jan 9, 2020
Merged

Conversation

rix0rrr
Copy link
Contributor

@rix0rrr rix0rrr commented Jan 9, 2020

a4e2353 was a squash commit. Record the merge so that future releases will work correctly.


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

Niranjan Jayakar and others added 7 commits January 7, 2020 13:30
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.
@rix0rrr rix0rrr requested a review from nija-at January 9, 2020 08:38
@rix0rrr rix0rrr self-assigned this Jan 9, 2020
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Jan 9, 2020
@rix0rrr rix0rrr added the pr/do-not-merge This PR should not be merged at this time. label Jan 9, 2020
@nija-at nija-at merged commit c34e872 into master Jan 9, 2020
@nija-at nija-at deleted the huijbers/merge-release branch January 9, 2020 09:13
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contribution/core This is a PR that came from AWS. pr/do-not-merge This PR should not be merged at this time.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants