Sync develop branch into skill pipeline branch#14644
Merged
KomachiSion merged 11 commits intoMar 19, 2026
Merged
Conversation
* test(core-utils): remove unused method and add comprehensive unit tests. * test(web): add unit tests for NacosCoreWebConfiguration and NacosWebServerListener。 * test(core): add unit tests for parts of remote package.
* test(core): add unit tests for plugin forms and prompt request extractor. * test(core): add unit tests for remote param check and connection ejector.
- 在实例列表查询接口中增加 pageForm.validate() 验证调用 - 确保分页参数在处理前进行有效性检查
…pe-core to resolve NoClassDefFoundError (#14625) agentscope-core:1.0.7 directly depends on json-schema-validator:3.0.0 (Jackson 3), which overrides the 1.5.7 version required by mcp-json-jackson2:0.14.1 (Jackson 2). This causes NoClassDefFoundError for SpecVersion$VersionFlag when using the 'Auto import from MCP Server' feature, since SpecVersion.VersionFlag was renamed to SpecificationVersion in json-schema-validator 2.0.0+. Excluding json-schema-validator from agentscope-core allows mcp's transitive dependency (1.5.7) to take effect, resolving the conflict.
* refactor(plugin): Refactor default database plugin, split database plugins and move depend jdbc to plugins dir. * fix(ci): update JaCoCo report paths for datasource plugins in CI workflow * fix(pom): update maven-antrun-plugin version and correct task tags
…op-skill-pipeline-sync-develop # Conflicts: # ai/src/test/java/com/alibaba/nacos/ai/service/prompt/PromptAdminOperationServiceImplTest.java # config/src/main/resources/META-INF/mysql-schema.sql # console/src/main/resources/META-INF/derby-schema.sql # plugin-default-impl/nacos-default-datasource-plugin/nacos-datasource-plugin-derby/src/main/java/com/alibaba/nacos/plugin/datasource/impl/derby/AiResourceMapperByDerby.java # plugin-default-impl/nacos-default-datasource-plugin/nacos-datasource-plugin-derby/src/main/java/com/alibaba/nacos/plugin/datasource/impl/derby/AiResourceVersionMapperByDerby.java # plugin-default-impl/nacos-default-datasource-plugin/nacos-datasource-plugin-mysql/src/main/java/com/alibaba/nacos/plugin/datasource/impl/mysql/AiResourceMapperByMySql.java # plugin-default-impl/nacos-default-datasource-plugin/nacos-datasource-plugin-mysql/src/main/java/com/alibaba/nacos/plugin/datasource/impl/mysql/AiResourceVersionMapperByMySql.java # plugin-default-impl/nacos-default-datasource-plugin/nacos-datasource-plugin-oracle/src/main/java/com/alibaba/nacos/plugin/datasource/impl/oracle/AiResourceMapperByOracle.java # plugin-default-impl/nacos-default-datasource-plugin/nacos-datasource-plugin-oracle/src/main/java/com/alibaba/nacos/plugin/datasource/impl/oracle/AiResourceVersionMapperByOracle.java # plugin-default-impl/nacos-default-datasource-plugin/nacos-datasource-plugin-postgresql/src/main/java/com/alibaba/nacos/plugin/datasource/impl/postgresql/AiResourceMapperByPostgresql.java # plugin-default-impl/nacos-default-datasource-plugin/nacos-datasource-plugin-postgresql/src/main/java/com/alibaba/nacos/plugin/datasource/impl/postgresql/AiResourceVersionMapperByPostgresql.java # plugin-default-impl/nacos-default-datasource-plugin/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.Mapper
…ine' into develop-skill-pipeline-sync-develop # Conflicts: # config/src/main/resources/META-INF/derby-schema.sql # console/src/main/resources/META-INF/derby-schema.sql
|
Thanks for your this PR. 🙏 感谢您提交的PR。 🙏 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 spotbugs:check -DskipTeststo 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.