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

[4.5.x] fix: change field size for client #5259

Merged
merged 1 commit into from
Dec 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 12, 2024

This is an automatic copy of pull request #5250 done by Mergify.


Fixes AM-4549
Updating client column to 255 characters


Cherry-pick of d0b4f90 has failed:

On branch mergify/bp/4.5.x/pr-5250
Your branch is up to date with 'origin/4.5.x'.

You are currently cherry-picking commit d0b4f902f3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   gravitee-am-repository/gravitee-am-repository-jdbc/src/main/resources/liquibase/changelogs/v4_2_27/4.2.27-change-client-column-size.yml
	modified:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/oauth2/api/AccessTokenRepositoryTest.java
	modified:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/oauth2/api/AuthorizationCodeRepositoryTest.java
	modified:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/oauth2/api/CibaAuthRequestRepositoryTest.java
	modified:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/oauth2/api/PushedAuthorizationRequestRepositoryTest.java
	modified:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/oauth2/api/RefreshTokenRepositoryTest.java
	new file:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/oauth2/api/ScopeApprovalRepositoryTest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-am-repository/gravitee-am-repository-jdbc/src/main/resources/liquibase/master.yml
	both modified:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/management/api/DeviceRepositoryTest.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from a team as a code owner December 12, 2024 17:45
@mergify mergify bot added the conflicts label Dec 12, 2024
Copy link
Contributor Author

mergify bot commented Dec 12, 2024

Cherry-pick of d0b4f90 has failed:

On branch mergify/bp/4.5.x/pr-5250
Your branch is up to date with 'origin/4.5.x'.

You are currently cherry-picking commit d0b4f902f3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   gravitee-am-repository/gravitee-am-repository-jdbc/src/main/resources/liquibase/changelogs/v4_2_27/4.2.27-change-client-column-size.yml
	modified:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/oauth2/api/AccessTokenRepositoryTest.java
	modified:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/oauth2/api/AuthorizationCodeRepositoryTest.java
	modified:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/oauth2/api/CibaAuthRequestRepositoryTest.java
	modified:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/oauth2/api/PushedAuthorizationRequestRepositoryTest.java
	modified:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/oauth2/api/RefreshTokenRepositoryTest.java
	new file:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/oauth2/api/ScopeApprovalRepositoryTest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-am-repository/gravitee-am-repository-jdbc/src/main/resources/liquibase/master.yml
	both modified:   gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/management/api/DeviceRepositoryTest.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@podlesrafal podlesrafal force-pushed the mergify/bp/4.5.x/pr-5250 branch 2 times, most recently from 617bfbe to 553f290 Compare December 13, 2024 16:12
Copy link
Contributor

@leleueri leleueri left a comment

Choose a reason for hiding this comment

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

minor type in the changeset id but good for me

(cherry picked from commit d0b4f90)

# Conflicts:
#	gravitee-am-repository/gravitee-am-repository-jdbc/src/main/resources/liquibase/master.yml
#	gravitee-am-repository/gravitee-am-repository-tests/src/test/java/io/gravitee/am/repository/management/api/DeviceRepositoryTest.java
@podlesrafal podlesrafal force-pushed the mergify/bp/4.5.x/pr-5250 branch from 553f290 to 8e797b4 Compare December 16, 2024 08:56
@podlesrafal podlesrafal merged commit df1ada0 into 4.5.x Dec 16, 2024
25 checks passed
@podlesrafal podlesrafal deleted the mergify/bp/4.5.x/pr-5250 branch December 16, 2024 13:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants