Skip to content

Bump h2 version to 2.x, consistent with springboot#4745

Merged
nobodyiam merged 1 commit into
apolloconfig:masterfrom
hezhangjian:bump-h2-version
Feb 28, 2023
Merged

Bump h2 version to 2.x, consistent with springboot#4745
nobodyiam merged 1 commit into
apolloconfig:masterfrom
hezhangjian:bump-h2-version

Conversation

@hezhangjian
Copy link
Copy Markdown
Member

@hezhangjian hezhangjian commented Feb 26, 2023

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Read the Contributing Guide before making this pull request.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit tests to verify the code.
  • Run mvn clean test to make sure this pull request doesn't break anything.
  • Update the CHANGES log.

@nobodyiam
Copy link
Copy Markdown
Member

nobodyiam commented Feb 26, 2023

It looks like the tests need some changes to work with the latest version of h2.

@hezhangjian hezhangjian force-pushed the bump-h2-version branch 2 times, most recently from fdcf7b3 to e03a27c Compare February 27, 2023 08:34
@codecov
Copy link
Copy Markdown

codecov Bot commented Feb 27, 2023 •
edited
Loading

Codecov Report

Merging #4745 (4149870) into master (2dcbc1d) will increase coverage by 0.02%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master    #4745      +/-   ##
============================================
+ Coverage     47.17%   47.20%   +0.02%     
  Complexity     1658     1658              
============================================
  Files           349      349              
  Lines         10691    10691              
  Branches       1062     1062              
============================================
+ Hits           5044     5047       +3     
+ Misses         5339     5337       -2     
+ Partials        308      307       -1
Impacted Files Coverage Δ
...va/com/ctrip/framework/apollo/biz/entity/Item.java 86.36% <ø> (ø)
...trip/framework/apollo/biz/entity/ServerConfig.java 92.85% <ø> (ø)
...ramework/apollo/portal/entity/po/ServerConfig.java 72.72% <ø> (ø)
...mework/apollo/portal/component/PortalSettings.java 70.31% <0.00%> (+4.68%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@hezhangjian
Copy link
Copy Markdown
Member Author

hezhangjian commented Feb 27, 2023

@nobodyiam
My upcoming plans are:
Gradually removing these ALTER statements in the unit tests.
Adding support for running Apollo on top of H2.
Adding support for running Apollo on top of Postgre.

nobodyiam
nobodyiam reviewed Feb 28, 2023
View reviewed changes
Comment thread apollo-adminservice/src/test/resources/controller/test-release.sql
Comment thread apollo-adminservice/src/test/resources/data.sql Outdated
Comment thread apollo-adminservice/src/test/resources/filter/test-access-control-disabled.sql Outdated
Comment thread apollo-adminservice/src/test/resources/import.sql
Comment thread apollo-biz/src/test/resources/application.properties
nobodyiam
nobodyiam reviewed Feb 28, 2023
View reviewed changes
Comment thread apollo-biz/src/test/resources/data.sql Outdated
Comment thread apollo-configservice/src/test/resources/data.sql Outdated
Comment thread apollo-portal/src/test/resources/sql/permission/insert-test-consumerroles.sql Outdated
Comment thread apollo-portal/src/test/resources/sql/permission/insert-test-permissions.sql Outdated
Comment thread apollo-portal/src/test/resources/sql/permission/insert-test-rolepermissions.sql Outdated
Comment thread apollo-portal/src/test/resources/sql/permission/insert-test-roles.sql Outdated
Comment thread apollo-portal/src/test/resources/sql/permission/insert-test-userroles.sql Outdated
Comment thread apollo-adminservice/src/test/resources/application.properties
@hezhangjian hezhangjian force-pushed the bump-h2-version branch 2 times, most recently from 3bb862a to caab56f Compare February 28, 2023 01:27
nobodyiam
nobodyiam approved these changes Feb 28, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@nobodyiam nobodyiam left a comment

Choose a reason for hiding this comment

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

LGTM

@nobodyiam nobodyiam merged commit 78099b4 into apolloconfig:master Feb 28, 2023
@github-actions github-actions Bot locked and limited conversation to collaborators Feb 28, 2023
@hezhangjian hezhangjian deleted the bump-h2-version branch February 28, 2023 01:48
@nobodyiam nobodyiam added this to the 2.2.0 milestone Aug 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@nobodyiam nobodyiam nobodyiam approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

2.2.0

Development

Successfully merging this pull request may close these issues.

2 participants

@hezhangjian @nobodyiam