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.

Sign up for GitHub

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

Jump to bottom

CORE-18306: Merging network 5.2 feature branch into the release branch #1339

Closed
wants to merge 5 commits into from
Closed

CORE-18306: Merging network 5.2 feature branch into the release branch #1339

wants to merge 5 commits into from

Conversation

yift-r3
Copy link
Contributor

@yift-r3 yift-r3 commented Nov 14, 2023

There were conflicts in:

  • .github/CODEOWNERS - reverted to the release branch version
  • gradle.properties - API version was changed into 2.

Do not squash

charlieR3 and others added 5 commits November 3, 2023 11:16
@charlieR3
CORE-0 Set up network team 5.2 branch
899f476
@charlieR3
CORE-18229 Set code owners on feature branch (#1329)
b356d32 
Set the code owners on the platform network branch to just the platform network team. Not to be merged to the 5.2 branch once it is created.
@charlieR3
Merge branch 'release/os/5.1' into charlie/network_5_2-merge-nov-10
c43a1b3
@charlieR3
Merge pull request #1333 from corda/charlie/network_5_2-merge-nov-10
bb2d022 
CORE-18278 Merge the release 5.1 branch into the network team 5.2 feature branch
@yift-r3
Merge branch 'feature/network_5_2' into yift/core-18306/merge-feature…
c30a877 
…-branch-to-release-branch

# Conflicts:
#	.github/CODEOWNERS
#	gradle.properties
github-actions[bot]
github-actions bot previously requested changes Nov 14, 2023
View reviewed changes
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR title failed to match regex -> ^((CORDA|EG|ENT|INFRA|CORE|DOC|ES)-\d+)(.*)

@sonarqubecloud SonarQubeCloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@yift-r3 yift-r3 changed the title 18306: Merging network 5.2 feature branch into the release branch CORE-18306: Merging network 5.2 feature branch into the release branch Nov 14, 2023
@github-actions github-actions bot dismissed their stale review November 14, 2023 11:43

All good!

@corda-jenkins-ci02
Copy link
Contributor

Scanning for breaking API changes introduced by this PR

Scan Failed: https://ci02.dev.r3.com/job/Corda5/job/corda-api-compatibility/job/PR-1339/1/

If the breaking changes are intentional, run ./gradlew cementApi and get approval from the Corda team leads.

@corda-jenkins-ci02
Copy link
Contributor

Non-blocking downstream job failed for corda-non-functional-test

https://ci02.dev.r3.com/job/Corda5/job/corda-api-compatibility/job/PR-1339/1/ has failed for PR 1339 build 1

Please investigate if your changes may have broken compilation on https://github.com/corda/corda-non-functional-test

@corda-jenkins-ci02
Copy link
Contributor

Non-blocking downstream job failed for corda-e2e-test

https://ci02.dev.r3.com/job/Corda5/job/corda-api-compatibility/job/PR-1339/1/ has failed for PR 1339 build 1

Please investigate if your changes may have broken compilation on https://github.com/corda/corda-e2e-tests

@corda-jenkins-ci02
Copy link
Contributor

Jenkins build for PR 1339 build 1

Build Successful:
Jar artifact version produced by this PR: 5.2.0.2-alpha-1699962168302

@yift-r3 yift-r3 closed this Nov 14, 2023
@yift-r3 yift-r3 deleted the yift/core-18306/merge-feature-branch-to-release-branch branch November 14, 2023 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@jasonbyrner3 jasonbyrner3 Awaiting requested review from jasonbyrner3 jasonbyrner3 will be requested when the pull request is marked ready for review jasonbyrner3 is a code owner

@ronanbrowne ronanbrowne Awaiting requested review from ronanbrowne ronanbrowne will be requested when the pull request is marked ready for review ronanbrowne is a code owner

@rick-r3 rick-r3 Awaiting requested review from rick-r3 rick-r3 will be requested when the pull request is marked ready for review rick-r3 is a code owner

@simon-johnson-r3 simon-johnson-r3 Awaiting requested review from simon-johnson-r3 simon-johnson-r3 will be requested when the pull request is marked ready for review simon-johnson-r3 is a code owner

@blsemo blsemo Awaiting requested review from blsemo blsemo will be requested when the pull request is marked ready for review blsemo is a code owner

@Omar-awad Omar-awad Awaiting requested review from Omar-awad Omar-awad will be requested when the pull request is marked ready for review Omar-awad is a code owner

@aditisdesai aditisdesai Awaiting requested review from aditisdesai aditisdesai will be requested when the pull request is marked ready for review aditisdesai is a code owner

@vinir3 vinir3 Awaiting requested review from vinir3 vinir3 will be requested when the pull request is marked ready for review vinir3 is a code owner

@vkolomeyko vkolomeyko Awaiting requested review from vkolomeyko vkolomeyko will be requested when the pull request is marked ready for review vkolomeyko is a code owner

@Sakpal Sakpal Awaiting requested review from Sakpal Sakpal will be requested when the pull request is marked ready for review Sakpal is a code owner

@owenstanford owenstanford Awaiting requested review from owenstanford owenstanford will be requested when the pull request is marked ready for review owenstanford is a code owner

@davidcurrie davidcurrie Awaiting requested review from davidcurrie davidcurrie will be requested when the pull request is marked ready for review davidcurrie is a code owner

@conalsmith-r3 conalsmith-r3 Awaiting requested review from conalsmith-r3 conalsmith-r3 will be requested when the pull request is marked ready for review conalsmith-r3 is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@yift-r3 @charlieR3