Sync code from upstream/develop #4399
Merged
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
…#4273) * fix public namespace permission problem * move NamespaceUtilTest to common module
…v operation (alibaba#4281) * use EnvUtil to replace ApplicationUtils about env operation * remove unuse import * remove unuse import * remove profile usage
…onUtils.injectEnvironment (alibaba#4295) * use EnvUtils.setEnvironment to replace ApplicationUtils.injectEnvironment. * remove unuseful import * remove unuseful import
…tionRunListener (alibaba#4257) * just inject environment in StartingSpringApplicationRunListener * make nacosStartingListener is decoupling with springApplicationRunListener. * add api doc * refactor. transfer nacos listeners to SpringApplicationRunListener. * remove unuseful import * add doc info
alibaba#4313) * for alibaba#4311，Fixed Derby data source related SQL LIMIT exception. * fix code style. * code format.
…tart in cluster mode (alibaba#4321) * refactor: refactor issue alibaba#4291 * fix: fixing the Naming consistency module could not start in cluster mode
* fix service list can not search by groupName only * fix service list can not search by groupName only * fix checkStyle * add ut for NamingUtils
… set (alibaba#4259) * fix spring.config.location is nullapplication.properties when -Dspring.config.location is not set in env * fix wrong path when -Dspring.config.location not set * modify default file resource method name * fix "/" magic value * change the way of get file * not judge pathSplit by self, use Paths.get(a, b); * when spring.config.location is not set, use {nacos.home}/conf/application.properties to cover it. * refactor code * code quality enhance * just use two level to load conf. {spring.config.location}/application.properties -> classpath:/application.properties * code clean
* 升级jraft到1.3.5以支持IPv6, 调整 NamingUtilsTest 代码格式以解决checkstyle问题 * 删除测试类的类注释
…e isn't effect (alibaba#4343) * fix nacos.core.protocol.raft.data.read_index_type=ReadOnlyLeaseBased isn't effect and enhance log hint * define ReadOnlyOption param name just by self
* for alibaba#4311，Fixed Derby data source related SQL LIMIT exception. * Revert "for alibaba#4311，Fixed Derby data source related SQL LIMIT exception." This reverts commit 49188f1 * fix alibaba#4333. * Remove case conversion.
…aba#4326) * [ISSUE-alibaba#4181] Just use ContextPathUtil normalize ContextPath value * [ISSUE-alibaba#4181] add some test cases
* remove import.* * transfer first_pre to final static variable * use NamingBase.Xxx to replace constant
…grpc_core # Conflicts: # client/src/main/java/com/alibaba/nacos/client/config/http/ServerHttpAgent.java # client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingMaintainService.java # client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java # config/src/main/java/com/alibaba/nacos/config/server/auth/ConfigResourceParser.java # config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java # config/src/main/java/com/alibaba/nacos/config/server/result/ResultBuilder.java # core/src/main/java/com/alibaba/nacos/core/listener/StartingApplicationListener.java # naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java # naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTask.java # naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckCommon.java # naming/src/main/java/com/alibaba/nacos/naming/web/NamingResourceParser.java # sys/src/main/java/com/alibaba/nacos/sys/utils/ApplicationUtils.java # test/src/test/java/com/alibaba/nacos/test/naming/AutoDeregisterInstance_ITCase.java
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.
Please do not create a Pull Request without creating an issue first.
What is the purpose of the change
XXXXX
Brief changelog
XX
Verifying this change
XXXX
Follow this checklist to help us incorporate your contribution quickly and easily:
[ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=trueto make sure basic checks pass. Runmvn clean install -DskipITsto make sure unit-test pass. Runmvn clean test-compile failsafe:integration-testto make sure integration-test pass.