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

Merge main changes to release 6.3.z #206

Merged

Conversation

kthatipally
Copy link
Collaborator

Update from main to release-6.3.z branch

This pull request incorporates the latest changes from the main branch into the release-6.3.z branch. The integration ensures that the release-6.3.z branch stays up-to-date with the latest developments in the main branch.

Reverted Changes:

Reverted the changes and re-applied which are introduced in PR #188 due to the use of squash-commits, which resulted in the loss of valuable commit history. This decision was made to maintain a clear and comprehensive version history for better traceability and understanding of the codebase.

agoncal and others added 30 commits August 16, 2023 16:09
* config server usage should be reported on for spring boot apps

* Bump to WindUp 6.3.0.Final (#143)

* Create a GitHub workflow to add a triage label (#145)

* Bump Maven dependency plugin and SLF4J (#147)

* Change the messages

* Fix URL
…nrich

override to enrich message for spring cloud config usage
add restricted config rule for azure spring apps
add oAuth2 and openid usage check, enrich spring security message
This reverts commit 5d25b32.
kaiqianyang and others added 23 commits October 23, 2023 17:23
…lated-rules

move active mq usage rule, revise mq-config rule
revise feign rule and move to overriden tech-usage
…nfig-server-rules

refine rules about redis, eureka, config server
refine spring boot/cloud version message
Co-authored-by: kaiqianyang <kaiqianyang@microsoftcom>
Co-authored-by: kaiqianyang <kaiqianyang@microsoftcom>
* Fix #160
* Create rule to discover Alibaba - Nacos
* Typo
…kthatipally/merge-main-changes-to-release-6.3.z
@joe-braley
Copy link
Collaborator

LGTM. But I am not familiar with the code changes. If someone wants to review those then they can.

Copy link
Collaborator

@joe-braley joe-braley left a comment

Choose a reason for hiding this comment

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

LGTM

@karianna
Copy link
Contributor

@kthatipally Approved, I'll let you merge as you want to choose the merge strategy.

@kthatipally kthatipally merged commit 5be6549 into release-6.3.z Mar 13, 2024
1 check passed
@agoncal
Copy link
Member

agoncal commented Mar 14, 2024

@kthatipally Kaiqian just merged a PR about a noisy rule. Can you also take it into account: #207

@kthatipally kthatipally deleted the kthatipally/merge-main-changes-to-release-6.3.z branch March 14, 2024 14:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants