Fixes merge to 1.6.x #564
Merged
Fixes merge to 1.6.x #564
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cherry-pick 2638299 Feat/#502 consul integrate test (#503) * Fixed the scope caching error * Added dependence of container test into pom * Moved the test cases to server module * Enhanced the registry test with testContainer. * Migrate consul container test to integration folder * Reverted unnecessary change * Changed name * Disable the integration test for mvn clean install * Removed unused line * -now integration test will copy the config under its own integration folder to the target folder -CURD some config files due to fix test cases (those were not configured correctly in previous versions) * -move integration plugins to integration-test profile -test configs will be generated either from integration folder or under test folder depends on the profile, cannot include both because file with same name will have only one copy under config directory in phase "generate-test-sources". -when run mvn clean install will as usual, when run mvn clean install -P integration-test will execute integration tests * fixes the typo # Conflicts: # pom.xml
DSchrupert
approved these changes
Jun 27, 2019
stevehu
approved these changes
Jul 10, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
merged changes:
Feat/#502 consul integrate test (#503) #503
Fix/#519 keystore fall back (#525) #525