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

Additions to Couchbase transactions example. #651

Closed
wants to merge 24 commits into from
Closed

Additions to Couchbase transactions example. #651

wants to merge 24 commits into from

Conversation

mikereiche
Copy link
Contributor

Closes #650.

  • You have read the Spring Data contribution guidelines.
  • You use the code formatters provided here and have them applied to your changes. Don’t submit any formatting related changes.
  • You submit test cases (unit or integration tests) that back your changes.
  • You added yourself as author in the headers of the classes you touched. Amend the date range in the Apache license header if needed. For new types, add the license header (copy from another file and set the current year only).

christophstrobl and others added 17 commits October 12, 2022 07:53
@christophstrobl
Upgrade to FW6 & Boot3 snapshots
58a2d5b
@christophstrobl
Switch mongodb to testcontainers
f0abc45
@christophstrobl
Fix broken tests
f58d87b
@christophstrobl
Add native data-jdbc sample
0e36621
@christophstrobl
Add native jpa sample
76861fa
@mp911de
Adopt to migrated Cassandra property names.
484073b
@christophstrobl
must not assert exception message
8755569
@christophstrobl
java16 -> java17
e976dcf
@christophstrobl
Check if redis available before looking up its version.
39dbea7
@mp911de
Adopt to updated LDAP base property.
99aa7ac
@mp911de
Remove Geode examples.
be7396c
@mp911de
Polishing.
b19f0d3 
Cleanup superfluous declarations.
@mikereiche @christophstrobl
Add Couchbase Transactions Example.
1f50e84 
Closes #646.
@christophstrobl
Polishing.
4d78e1f 
Update readme with instructions how to run the sample and safeguard execution with junit extension.
@christophstrobl
Update Readme.
66db980
@christophstrobl
Bump version to 3.0.0-SNAPSHOT
2d4e7fe
@mikereiche
Additions to Couchbase transactions example.
99ddcf0 
Closes #650.
@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged label Nov 18, 2022
@mp911de mp911de changed the base branch from boot-3 to main February 2, 2023 13:12
@mp911de
Copy link
Member

mp911de commented Feb 2, 2023

We finally merged the upgrade to Spring Boot 3.0.2. Can you sort out this and #649 in terms of rebasing and which one of these two we should merge.

Also, please refrain from sysouts in the tests.

@mp911de
Copy link
Member

mp911de commented Apr 24, 2023

Care to rebase your PR?

@mp911de mp911de assigned mp911de and unassigned mikereiche Apr 24, 2023
@mikereiche
Copy link
Contributor Author

I just resolved the conflicts - I didn't "git rebase". Let me know if that is not sufficient. Thanks.

@mp911de
Copy link
Member

mp911de commented Apr 28, 2023

Please use indeed git rebase and force-push as we keep a linear git history without merge commits.

mikereiche and others added 3 commits May 2, 2023 10:49
@mikereiche
Merge branch 'sdex_650_additions_to_couchbase_transactions_example' o…
9f0b577 
…f github.com:mikereiche/spring-data-examples into sdex_650_additions_to_couchbase_transactions_example
@mikereiche
Use correct version for parent.
1508a9c
@mikereiche
Merge branch 'spring-projects:main' into sdex_650_additions_to_couchb…
b32cf00 
…ase_transactions_example
@mikereiche mikereiche closed this by deleting the head repository May 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@mp911de mp911de

Labels
status: waiting-for-triage An issue we've not yet triaged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Additions to couchbase transactions example
4 participants
@mikereiche @mp911de @spring-projects-issues @christophstrobl