From 2d16adc7d779ff4dec3bab8b6748085b3f0b24dd Mon Sep 17 00:00:00 2001 From: noear Date: Tue, 2 Jan 2024 10:55:15 +0800 Subject: [PATCH] 2.6.4 --- README.md | 4 +- README_CN.md | 4 +- README_EN.md | 4 +- README_JP.md | 4 +- README_RU.md | 4 +- UPDATE_LOG.md | 11 ++++- __hatch/metrics-solon-plugin/pom.xml | 2 +- __hatch/nami.coder.thrift/pom.xml | 6 +-- __hatch/nanoxlsx4j-solon-plugin/pom.xml | 2 +- __hatch/pom.xml | 2 +- __hatch/solon.boot.reactor-netty/pom.xml | 2 +- __hatch/solon.serialization.avro/pom.xml | 2 +- __hatch/solon.serialization.thrift/pom.xml | 2 +- __release/nami-bundle/pom.xml | 2 +- __release/solon-base-bundle1/pom.xml | 2 +- __release/solon-base-bundle2/pom.xml | 2 +- __release/solon-base-bundle3/pom.xml | 2 +- __release/solon-base-bundle4/pom.xml | 2 +- __release/solon-base-bundle5/pom.xml | 2 +- __release/solon-base-bundle6/pom.xml | 2 +- __release/solon-cloud-bundle1/pom.xml | 2 +- __release/solon-cloud-bundle2/pom.xml | 2 +- __release/solon-shortcuts-bundle/pom.xml | 2 +- __test/pom.xml | 7 ++- .../webapp/demo2_mvc/HeaderController.java | 2 + .../webapp/demo2_mvc/Param4Controller.java | 7 +++ .../test/java/features/HttpParam4Test.java | 11 +++++ __test/src/test/java/features/RouteTest.java | 48 +++++++++++++++++++ solon-parent/pom.xml | 24 +++++----- .../guava-solon-cloud-plugin/pom.xml | 2 +- .../semaphore-solon-cloud-plugin/pom.xml | 2 +- .../sentinel-solon-cloud-plugin/pom.xml | 2 +- .../kubernetes-solon-cloud-plugin/pom.xml | 2 +- .../jmdns-solon-cloud-plugin/pom.xml | 2 +- .../activemq-solon-cloud-plugin/pom.xml | 2 +- .../aliyun-ons-solon-cloud-plugin/pom.xml | 2 +- .../folkmq-solon-cloud-plugin/pom.xml | 2 +- .../jedis-solon-cloud-plugin/pom.xml | 2 +- .../kafka-solon-cloud-plugin/pom.xml | 2 +- .../mqtt-solon-cloud-plugin/pom.xml | 2 +- .../mqtt5-solon-cloud-plugin/pom.xml | 2 +- .../pulsar-solon-cloud-plugin/pom.xml | 2 +- .../rabbitmq-solon-cloud-plugin/pom.xml | 2 +- .../rocketmq-solon-cloud-plugin/pom.xml | 2 +- .../rocketmq5-solon-cloud-plugin/pom.xml | 2 +- .../aliyun-oss-solon-cloud-plugin/pom.xml | 2 +- .../aws-s3-solon-cloud-plugin/pom.xml | 2 +- .../fastdfs-solon-cloud-plugin/pom.xml | 2 +- .../file-s3-solon-cloud-plugin/pom.xml | 2 +- .../minio-solon-cloud-plugin/pom.xml | 2 +- .../minio7-solon-cloud-plugin/pom.xml | 2 +- .../qcloud-cos-solon-cloud-plugin/pom.xml | 2 +- .../qiniu-kodo-solon-cloud-plugin/pom.xml | 2 +- .../snowflake-id-solon-cloud-plugin/pom.xml | 2 +- .../powerjob-solon-cloud-plugin/pom.xml | 2 +- .../quartz-solon-cloud-plugin/pom.xml | 2 +- .../xxl-job-solon-cloud-plugin/pom.xml | 2 +- .../grpc-solon-cloud-plugin/pom.xml | 2 +- .../thrift-solon-cloud-plugin/pom.xml | 2 +- .../jaeger-solon-cloud-plugin/pom.xml | 2 +- .../opentracing-solon-cloud-plugin/pom.xml | 2 +- .../zipkin-solon-cloud-plugin/pom.xml | 2 +- .../consul-solon-cloud-plugin/pom.xml | 2 +- .../etcd-solon-cloud-plugin/pom.xml | 2 +- .../local-solon-cloud-plugin/pom.xml | 2 +- .../nacos-solon-cloud-plugin/pom.xml | 2 +- .../nacos2-solon-cloud-plugin/pom.xml | 2 +- .../polaris-solon-cloud-plugin/pom.xml | 2 +- .../water-solon-cloud-plugin/pom.xml | 2 +- .../zookeeper-solon-cloud-plugin/pom.xml | 2 +- .../zuul-solon-cloud-plugin/pom.xml | 2 +- .../nami/nami.channel.http.hutool/pom.xml | 2 +- .../nami/nami.channel.http.okhttp/pom.xml | 2 +- .../nami/nami.channel.socketd/pom.xml | 2 +- .../nami/nami.coder.fastjson/pom.xml | 2 +- .../nami/nami.coder.fastjson2/pom.xml | 2 +- solon-projects/nami/nami.coder.fury/pom.xml | 2 +- .../nami/nami.coder.hessian/pom.xml | 2 +- .../nami/nami.coder.jackson/pom.xml | 2 +- .../nami/nami.coder.protostuff/pom.xml | 2 +- solon-projects/nami/nami.coder.snack3/pom.xml | 2 +- solon-projects/nami/nami/pom.xml | 4 +- solon-projects/solon-base/solon.auth/pom.xml | 2 +- .../solon-base/solon.banner/pom.xml | 2 +- .../solon-base/solon.config.yaml/pom.xml | 2 +- .../solon-base/solon.hotplug/pom.xml | 2 +- solon-projects/solon-base/solon.i18n/pom.xml | 2 +- solon-projects/solon-base/solon.mvc/pom.xml | 2 +- solon-projects/solon-base/solon.net/pom.xml | 2 +- solon-projects/solon-base/solon.proxy/pom.xml | 2 +- .../solon-base/solon.validation/pom.xml | 2 +- solon-projects/solon-base/solon.vault/pom.xml | 2 +- .../solon-boot/solon.boot.jdkhttp/pom.xml | 2 +- .../solon.boot.jetty.add.jsp/pom.xml | 2 +- .../solon.boot.jetty.add.websocket/pom.xml | 2 +- .../solon-boot/solon.boot.jetty/pom.xml | 2 +- .../solon-boot/solon.boot.jlhttp/pom.xml | 2 +- .../solon-boot/solon.boot.nettyhttp/pom.xml | 2 +- .../solon-boot/solon.boot.smarthttp/pom.xml | 2 +- .../solon-boot/solon.boot.socketd/pom.xml | 2 +- .../solon.boot.tomcat.add.jsp/pom.xml | 2 +- .../solon-boot/solon.boot.tomcat/pom.xml | 2 +- .../solon.boot.undertow.add.jsp/pom.xml | 2 +- .../solon-boot/solon.boot.undertow/pom.xml | 2 +- .../solon-boot/solon.boot.vertx/pom.xml | 2 +- .../solon.boot.websocket.netty/pom.xml | 2 +- .../solon-boot/solon.boot.websocket/pom.xml | 2 +- solon-projects/solon-boot/solon.boot/pom.xml | 2 +- .../solon-cloud/solon.cloud.eventplus/pom.xml | 2 +- .../solon-cloud/solon.cloud.httputils/pom.xml | 2 +- .../solon-cloud/solon.cloud.metrics/pom.xml | 2 +- .../solon-cloud/solon.cloud.tracing/pom.xml | 2 +- .../solon-cloud/solon.cloud/pom.xml | 2 +- .../solon-data/solon.cache.caffeine/pom.xml | 2 +- .../solon-data/solon.cache.jedis/pom.xml | 2 +- .../solon-data/solon.cache.redisson/pom.xml | 2 +- .../solon.cache.spymemcached/pom.xml | 2 +- .../solon-data/solon.data.dynamicds/pom.xml | 2 +- .../solon-data/solon.data.shardingds/pom.xml | 2 +- solon-projects/solon-data/solon.data/pom.xml | 2 +- .../solon/data/cache/LocalCacheService.java | 2 +- .../detector-solon-plugin/pom.xml | 2 +- .../solon-detector/solon-admin-client/pom.xml | 2 +- .../solon-admin-server-ui/pom.xml | 2 +- .../solon-detector/solon-admin-server/pom.xml | 2 +- .../solon.health.detector/pom.xml | 2 +- .../solon-detector/solon.health/pom.xml | 2 +- .../solon-docs/solon-openapi2-knife4j/pom.xml | 2 +- .../solon-docs/solon-swagger2-knife4j/pom.xml | 2 +- .../solon-docs/solon.docs.openapi2/pom.xml | 2 +- .../solon-docs/solon.docs.openapi3/pom.xml | 2 +- solon-projects/solon-docs/solon.docs/pom.xml | 2 +- solon-projects/solon-faas/solon.luffy/pom.xml | 2 +- .../solon-logging/log4j2-solon-plugin/pom.xml | 2 +- .../logback-solon-plugin/pom.xml | 2 +- .../solon.logging.log4j2/pom.xml | 2 +- .../solon.logging.logback/pom.xml | 2 +- .../solon.logging.simple/pom.xml | 2 +- .../solon-logging/solon.logging/pom.xml | 2 +- solon-projects/solon-native/solon.aot/pom.xml | 2 +- .../solon.serialization.fastjson/pom.xml | 2 +- .../solon.serialization.fastjson2/pom.xml | 2 +- .../solon.serialization.fury/pom.xml | 2 +- .../solon.serialization.gson/pom.xml | 2 +- .../solon.serialization.hessian/pom.xml | 2 +- .../solon.serialization.jackson/pom.xml | 2 +- .../solon.serialization.protostuff/pom.xml | 2 +- .../solon.serialization.snack3/pom.xml | 2 +- .../solon-render/solon.serialization/pom.xml | 2 +- .../solon-render/solon.view.beetl/pom.xml | 2 +- .../solon-render/solon.view.enjoy/pom.xml | 2 +- .../solon.view.freemarker/pom.xml | 2 +- .../solon-render/solon.view.jsp/pom.xml | 2 +- .../solon-render/solon.view.thymeleaf/pom.xml | 2 +- .../solon-render/solon.view.velocity/pom.xml | 2 +- .../solon-render/solon.view/pom.xml | 2 +- .../solon.extend.schedule/pom.xml | 2 +- .../solon.scheduling.quartz/pom.xml | 2 +- .../solon.scheduling.simple/pom.xml | 2 +- .../solon-scheduling/solon.scheduling/pom.xml | 2 +- .../solon-testing/solon-test-junit4/pom.xml | 2 +- .../solon-testing/solon-test-junit5/pom.xml | 2 +- .../solon-testing/solon-test/pom.xml | 2 +- .../solon-testing/solon.test/pom.xml | 2 +- .../solon-tool/solon-maven-plugin/pom.xml | 2 +- .../solon-springboot-starter/pom.xml | 2 +- .../solon.sessionstate.jedis/pom.xml | 2 +- .../solon-web/solon.sessionstate.jwt/pom.xml | 2 +- .../solon.sessionstate.local/pom.xml | 2 +- .../solon.sessionstate.redisson/pom.xml | 2 +- .../solon-web/solon.web.cors/pom.xml | 2 +- .../solon-web/solon.web.flux/pom.xml | 2 +- .../solon-web/solon.web.sdl/pom.xml | 2 +- .../solon.web.servlet.jakarta/pom.xml | 2 +- .../solon-web/solon.web.servlet/pom.xml | 2 +- .../solon-web/solon.web.sse/pom.xml | 2 +- .../solon-web/solon.web.staticfiles/pom.xml | 2 +- .../solon-web/solon.web.stop/pom.xml | 2 +- .../solon-web/solon.web.webdav/pom.xml | 2 +- solon-shortcuts/solon-api/pom.xml | 2 +- solon-shortcuts/solon-beetl-web/pom.xml | 2 +- solon-shortcuts/solon-cloud-alibaba/pom.xml | 2 +- solon-shortcuts/solon-cloud-water/pom.xml | 2 +- solon-shortcuts/solon-cloud/pom.xml | 2 +- solon-shortcuts/solon-enjoy-web/pom.xml | 2 +- solon-shortcuts/solon-job/pom.xml | 2 +- solon-shortcuts/solon-lib/pom.xml | 2 +- solon-shortcuts/solon-rpc/pom.xml | 2 +- solon-shortcuts/solon-web-beetl/pom.xml | 2 +- solon-shortcuts/solon-web-enjoy/pom.xml | 2 +- solon-shortcuts/solon-web/pom.xml | 2 +- solon/pom.xml | 2 +- .../src/main/java/org/noear/solon/Solon.java | 2 +- 193 files changed, 289 insertions(+), 209 deletions(-) create mode 100644 __test/src/test/java/features/RouteTest.java diff --git a/README.md b/README.md index 2d7046f6a1..4c8217c8e0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@


-Solon v2.6.4-SNAPSHOT +Solon v2.6.4

Java's new application development framework, smaller, faster, and easier! @@ -65,7 +65,7 @@ Build from scratch. It has its own standards and norms and open ecology. Combina * Supports Web, Data, Job, Remoting, Cloud, and other development scenarios * The two architecture modes are Handler + Context and Listener + Message * Emphasizes plug-in extensibility, expandable and swappable, adaptable to different application scenarios -* Supports GraalVm Native Image packaging +* Supports GraalVm Native Image packaging. Support FaaS pattern development * Allow service plug-ins to hot-plug, hot-swap, and hot-manage. ## Ecosystem Architecture Diagram: diff --git a/README_CN.md b/README_CN.md index a2f45644a4..dccf755f19 100644 --- a/README_CN.md +++ b/README_CN.md @@ -1,7 +1,7 @@


-Solon v2.6.4-SNAPSHOT +Solon v2.6.4

Java 新的应用开发框架，更小、更快、更简单！ @@ -65,7 +65,7 @@ Solon v2.6.4-SNAPSHOT * 支持 Web、Data、Job、Remoting、Cloud 等任何开发场景 * 兼顾 Handler + Context 和 Listener + Message 两种架构模式 * 强调插件式扩展，可扩展可切换；适应不同的应用场景 -* 支持 GraalVm Native Image 打包 +* 支持 GraalVm Native Image 打包。支持 FaaS 模式开发 * 允许业务插件“热插”、“热拔”、“热管理” diff --git a/README_EN.md b/README_EN.md index 2d7046f6a1..4c8217c8e0 100644 --- a/README_EN.md +++ b/README_EN.md @@ -1,7 +1,7 @@


-Solon v2.6.4-SNAPSHOT +Solon v2.6.4

Java's new application development framework, smaller, faster, and easier! @@ -65,7 +65,7 @@ Build from scratch. It has its own standards and norms and open ecology. Combina * Supports Web, Data, Job, Remoting, Cloud, and other development scenarios * The two architecture modes are Handler + Context and Listener + Message * Emphasizes plug-in extensibility, expandable and swappable, adaptable to different application scenarios -* Supports GraalVm Native Image packaging +* Supports GraalVm Native Image packaging. Support FaaS pattern development * Allow service plug-ins to hot-plug, hot-swap, and hot-manage. ## Ecosystem Architecture Diagram: diff --git a/README_JP.md b/README_JP.md index a8e6f18c30..7ba110ef60 100644 --- a/README_JP.md +++ b/README_JP.md @@ -1,7 +1,7 @@


-Solon v2.6.4-SNAPSHOT +Solon v2.6.4

Javaの新しいアプリケーション開発フレームワーク、より小さく、より速く、より簡単です! @@ -65,7 +65,7 @@ Solon v2.6.4-SNAPSHOT * Web、Data、Job、Remoting、Cloudなどの開発シナリオをサポート * Handler+ContextとListener+Messageの2つのイベントモデルを両立 * プラグイン式の拡張を強調し、異なるアプリケーションシーンに対応可能 -* GraalVm Native Imageパッケージをサポート +* GraalVm Native Imageパッケージに対応しています。FaaSモデルの開発を支援します * サービスプラグインには「ホットプラグ」「ホットプラグ」「ホットマネジメント」ができます。 diff --git a/README_RU.md b/README_RU.md index 0a39d81383..11306b7ed5 100644 --- a/README_RU.md +++ b/README_RU.md @@ -1,7 +1,7 @@


-Solon v2.6.4-SNAPSHOT +Solon v2.6.4

Новая структура разработки приложений Java, меньше, быстрее и проще! @@ -65,7 +65,7 @@ Solon v2.6.4-SNAPSHOT * Поддерживаем любые сценарии развития, такие как Web, Data, Job, Remoting, Cloud и т.д * Совместить архитектурные модели Handler + Context и Listener + Message * Подчеркивает расширение плагина, расширяемое и переключаемое; Адаптация к различным параметрам применения -* В поддержку "GraalVm Native Image" +* Поддерживаем пакование "GraalVm Native Image". Поддержка разработки фаас модели * Позволяет бизнес-плагины "включать", "вырывать", "управление теплом" diff --git a/UPDATE_LOG.md b/UPDATE_LOG.md index 8b705183fe..d78d710381 100644 --- a/UPDATE_LOG.md +++ b/UPDATE_LOG.md @@ -20,11 +20,18 @@ * 新增 graphql-solon-plugin 插件 ### 2.6.4 +* 新增 graphql-solon-plugin 插件（欢迎试用） * 修复 @Header 与 @Body 同时注入时，@Header 会失效的问题 +* 修复 LocalCacheService 时间过大时会超界的问题 * 添加 local-solon-cloud-plugin 对描述信息的获取 * fastjson2 升为 2.0.44 -* log4j 升为 2.22.0 -* socket.d 升为 2.2.1 +* log4j 升为 2.22.1 +* logback 升为 1.3.14 +* sqltoy 升为 5.2.88 +* mybatis-flex 升为 1.7.6 +* beetlsql 升为 3.27.4-RELEASE +* fastmybatis 升为 2.10.0 +* socket.d 升为 2.2.2 * folkmq 升为 1.0.26 ### 2.6.3 diff --git a/__hatch/metrics-solon-plugin/pom.xml b/__hatch/metrics-solon-plugin/pom.xml index f46dd47c9c..1805bf16af 100644 --- a/__hatch/metrics-solon-plugin/pom.xml +++ b/__hatch/metrics-solon-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/__hatch/nami.coder.thrift/pom.xml b/__hatch/nami.coder.thrift/pom.xml index b178d670e8..7af65c848e 100644 --- a/__hatch/nami.coder.thrift/pom.xml +++ b/__hatch/nami.coder.thrift/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml @@ -19,13 +19,13 @@ org.noear solon - 2.6.4-SNAPSHOT + 2.6.4 org.noear nami - 2.6.4-SNAPSHOT + 2.6.4 diff --git a/__hatch/nanoxlsx4j-solon-plugin/pom.xml b/__hatch/nanoxlsx4j-solon-plugin/pom.xml index 2b53033126..5533fbfd21 100644 --- a/__hatch/nanoxlsx4j-solon-plugin/pom.xml +++ b/__hatch/nanoxlsx4j-solon-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/__hatch/pom.xml b/__hatch/pom.xml index 06d06e5588..3381f7e275 100644 --- a/__hatch/pom.xml +++ b/__hatch/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../solon-parent/pom.xml diff --git a/__hatch/solon.boot.reactor-netty/pom.xml b/__hatch/solon.boot.reactor-netty/pom.xml index bb4cb756f0..c4bd565094 100644 --- a/__hatch/solon.boot.reactor-netty/pom.xml +++ b/__hatch/solon.boot.reactor-netty/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/__hatch/solon.serialization.avro/pom.xml b/__hatch/solon.serialization.avro/pom.xml index 738eb923b3..a83ba80bbd 100644 --- a/__hatch/solon.serialization.avro/pom.xml +++ b/__hatch/solon.serialization.avro/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/__hatch/solon.serialization.thrift/pom.xml b/__hatch/solon.serialization.thrift/pom.xml index 855d27a30e..088be38be7 100644 --- a/__hatch/solon.serialization.thrift/pom.xml +++ b/__hatch/solon.serialization.thrift/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/__release/nami-bundle/pom.xml b/__release/nami-bundle/pom.xml index 0228885762..8983caf85a 100644 --- a/__release/nami-bundle/pom.xml +++ b/__release/nami-bundle/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/__release/solon-base-bundle1/pom.xml b/__release/solon-base-bundle1/pom.xml index 701e1ecc08..099013988d 100644 --- a/__release/solon-base-bundle1/pom.xml +++ b/__release/solon-base-bundle1/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/__release/solon-base-bundle2/pom.xml b/__release/solon-base-bundle2/pom.xml index ddc45d94b0..4568a37049 100644 --- a/__release/solon-base-bundle2/pom.xml +++ b/__release/solon-base-bundle2/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/__release/solon-base-bundle3/pom.xml b/__release/solon-base-bundle3/pom.xml index ba38a54c16..b291d553b2 100644 --- a/__release/solon-base-bundle3/pom.xml +++ b/__release/solon-base-bundle3/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/__release/solon-base-bundle4/pom.xml b/__release/solon-base-bundle4/pom.xml index dfaa8a86a2..ad29996730 100644 --- a/__release/solon-base-bundle4/pom.xml +++ b/__release/solon-base-bundle4/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/__release/solon-base-bundle5/pom.xml b/__release/solon-base-bundle5/pom.xml index 188f298a17..d24fb2361d 100644 --- a/__release/solon-base-bundle5/pom.xml +++ b/__release/solon-base-bundle5/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/__release/solon-base-bundle6/pom.xml b/__release/solon-base-bundle6/pom.xml index 4cb63bdaec..1fe4a61496 100644 --- a/__release/solon-base-bundle6/pom.xml +++ b/__release/solon-base-bundle6/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/__release/solon-cloud-bundle1/pom.xml b/__release/solon-cloud-bundle1/pom.xml index d0a1c049d4..b077a30817 100644 --- a/__release/solon-cloud-bundle1/pom.xml +++ b/__release/solon-cloud-bundle1/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/__release/solon-cloud-bundle2/pom.xml b/__release/solon-cloud-bundle2/pom.xml index 9bdc79223b..170f746715 100644 --- a/__release/solon-cloud-bundle2/pom.xml +++ b/__release/solon-cloud-bundle2/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/__release/solon-shortcuts-bundle/pom.xml b/__release/solon-shortcuts-bundle/pom.xml index d1e1dfb4a4..cc7b0a1a30 100644 --- a/__release/solon-shortcuts-bundle/pom.xml +++ b/__release/solon-shortcuts-bundle/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/__test/pom.xml b/__test/pom.xml index fa68eaad7d..df78435abe 100644 --- a/__test/pom.xml +++ b/__test/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../solon-parent/pom.xml @@ -224,6 +224,11 @@ solon.data + + org.noear + solon.auth + + org.noear solon.validation diff --git a/__test/src/main/java/webapp/demo2_mvc/HeaderController.java b/__test/src/main/java/webapp/demo2_mvc/HeaderController.java index c0669ec614..3bdeacb806 100644 --- a/__test/src/main/java/webapp/demo2_mvc/HeaderController.java +++ b/__test/src/main/java/webapp/demo2_mvc/HeaderController.java @@ -1,6 +1,8 @@ package webapp.demo2_mvc; +import org.noear.solon.annotation.Body; import org.noear.solon.annotation.Controller; +import org.noear.solon.annotation.Header; import org.noear.solon.annotation.Mapping; import org.noear.solon.core.handle.Context; diff --git a/__test/src/main/java/webapp/demo2_mvc/Param4Controller.java b/__test/src/main/java/webapp/demo2_mvc/Param4Controller.java index f21df6464c..0ff9c0f0dc 100644 --- a/__test/src/main/java/webapp/demo2_mvc/Param4Controller.java +++ b/__test/src/main/java/webapp/demo2_mvc/Param4Controller.java @@ -35,6 +35,13 @@ public Object test_json_2(@Body Map user) throws IOException { return user; } + @Mapping("json_2/header/t") + public Object test_json_2_header(@Header String id, @Body Map user) throws IOException { + asyncTask.test(); + + return id + user; + } + @Mapping("json_2/{id}") public Object test_json_2_path(@Path String id ,@Body Map user) throws IOException { asyncTask.test(); diff --git a/__test/src/test/java/features/HttpParam4Test.java b/__test/src/test/java/features/HttpParam4Test.java index 6e63fbbb3a..2e37124e15 100644 --- a/__test/src/test/java/features/HttpParam4Test.java +++ b/__test/src/test/java/features/HttpParam4Test.java @@ -43,6 +43,17 @@ public void json_2() throws IOException { assert new Datetime(oNode2.get("date").getDate()).getYear() > 2000; } + @Test + public void json_2_header() throws IOException { + //走json通过，这个格式会有问题 + String json = "{id:1,name:'noear',date:'2021-12-12'}"; + + String json2 = path("/demo2/param4/json_2/header/t").header("id", "1").bodyJson(json).post(); + + assert json2 != null; + assert json2.startsWith("1{"); + } + @Test public void json_2_path() throws IOException { //走json通过，这个格式会有问题 diff --git a/__test/src/test/java/features/RouteTest.java b/__test/src/test/java/features/RouteTest.java new file mode 100644 index 0000000000..90a86ef4f1 --- /dev/null +++ b/__test/src/test/java/features/RouteTest.java @@ -0,0 +1,48 @@ +package features; + +import org.junit.Test; +import org.noear.solon.auth.impl.AuthRuleImpl; +import org.noear.solon.core.handle.MethodType; +import org.noear.solon.core.route.PathRule; +import org.noear.solon.core.route.RoutingDefault; + +/** + * @author noear 2024/1/2 created + */ +public class RouteTest { + @Test + public void routingDefault() { + //Mvc 里用的 Mapping 路由记录 + RoutingDefault routingDefault = new RoutingDefault("/captchaImage", MethodType.GET, null); + assert routingDefault.matches(MethodType.GET, "/captchaImage"); + assert routingDefault.matches(MethodType.GET, "/captchaimage") == false; + + routingDefault = new RoutingDefault("/captchaimage", MethodType.GET, null); + assert routingDefault.matches(MethodType.GET, "/captchaImage") == false; + assert routingDefault.matches(MethodType.GET, "/captchaimage"); + } + + @Test + public void authRuleImpl() { + //AuthRuleImpl 内用的路由规则 + PathRule pathRule = new PathRule(); + pathRule.exclude("/captchaImage"); + assert pathRule.test("/captchaImage") == false; + assert pathRule.test("/captchaimage"); + + pathRule = new PathRule(); + pathRule.exclude("/captchaimage"); + assert pathRule.test("/captchaImage"); + assert pathRule.test("/captchaimage") == false; + + pathRule = new PathRule(); + pathRule.include("/captchaImage"); + assert pathRule.test("/captchaImage"); + assert pathRule.test("/captchaimage") == false; + + pathRule = new PathRule(); + pathRule.include("/captchaimage"); + assert pathRule.test("/captchaImage") == false; + assert pathRule.test("/captchaimage"); + } +} diff --git a/solon-parent/pom.xml b/solon-parent/pom.xml index 49878489c9..880407681b 100644 --- a/solon-parent/pom.xml +++ b/solon-parent/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 pom ${project.artifactId} @@ -23,9 +23,9 @@ ${java.version} ${java.version} - 2.6.4-SNAPSHOT - 2.6.3 - 2.6.3 + 2.6.4 + 2.6.4 + 2.6.4 3.2.84 3.4.33 @@ -33,7 +33,7 @@ 2.12.0 1.7.2 1.6.2 - 2.2.1 + 2.2.2 1.0.26 3.23.3 6.2.5.RELEASE @@ -54,7 +54,7 @@ 13.4.0.Final 2.0.0.Final 9.0.64 - 1.5.39 + 1.5.41 1.3.6 4.4.1 @@ -94,8 +94,8 @@ 32.1.3-jre 2.0.9 - 2.22.0 - 1.3.11 + 2.22.1 + 1.3.14 2.4.0 4.1.101.Final @@ -142,10 +142,10 @@ 2.3.31 5.1.2 - 3.27.3-RELEASE - 5.2.86 - 1.7.5 - 2.9.7 + 3.27.4-RELEASE + 5.2.88 + 1.7.6 + 2.10.0 5.4.0 4.2.4 diff --git a/solon-projects-cloud/solon-cloud-breaker/guava-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-breaker/guava-solon-cloud-plugin/pom.xml index 975900044a..b1b94d0bdf 100644 --- a/solon-projects-cloud/solon-cloud-breaker/guava-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-breaker/guava-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-breaker/semaphore-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-breaker/semaphore-solon-cloud-plugin/pom.xml index 2193b62fec..086036d2e2 100644 --- a/solon-projects-cloud/solon-cloud-breaker/semaphore-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-breaker/semaphore-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-breaker/sentinel-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-breaker/sentinel-solon-cloud-plugin/pom.xml index c45f80b5fe..c313cba559 100644 --- a/solon-projects-cloud/solon-cloud-breaker/sentinel-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-breaker/sentinel-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-config/kubernetes-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-config/kubernetes-solon-cloud-plugin/pom.xml index 2dc52bcd50..906cd4c9c1 100644 --- a/solon-projects-cloud/solon-cloud-config/kubernetes-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-config/kubernetes-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-discovery/jmdns-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-discovery/jmdns-solon-cloud-plugin/pom.xml index bcc8c4c5c0..d33cbc7c62 100644 --- a/solon-projects-cloud/solon-cloud-discovery/jmdns-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-discovery/jmdns-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-event/activemq-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-event/activemq-solon-cloud-plugin/pom.xml index c2f348bef5..31120a33ca 100644 --- a/solon-projects-cloud/solon-cloud-event/activemq-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-event/activemq-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-event/aliyun-ons-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-event/aliyun-ons-solon-cloud-plugin/pom.xml index 9fcc5616e8..dd5f23685b 100644 --- a/solon-projects-cloud/solon-cloud-event/aliyun-ons-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-event/aliyun-ons-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-event/folkmq-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-event/folkmq-solon-cloud-plugin/pom.xml index e6e3c31cd4..ebb494a523 100644 --- a/solon-projects-cloud/solon-cloud-event/folkmq-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-event/folkmq-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-event/jedis-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-event/jedis-solon-cloud-plugin/pom.xml index 1433bd3bec..835f7bc719 100644 --- a/solon-projects-cloud/solon-cloud-event/jedis-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-event/jedis-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-event/kafka-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-event/kafka-solon-cloud-plugin/pom.xml index b711dd67b5..9a53ab8a50 100644 --- a/solon-projects-cloud/solon-cloud-event/kafka-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-event/kafka-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-event/mqtt-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-event/mqtt-solon-cloud-plugin/pom.xml index 7324c9f812..e8516ace96 100644 --- a/solon-projects-cloud/solon-cloud-event/mqtt-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-event/mqtt-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-event/mqtt5-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-event/mqtt5-solon-cloud-plugin/pom.xml index b7cf1709a2..9b774bbe32 100644 --- a/solon-projects-cloud/solon-cloud-event/mqtt5-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-event/mqtt5-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-event/pulsar-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-event/pulsar-solon-cloud-plugin/pom.xml index 511c545c26..724f8affd8 100644 --- a/solon-projects-cloud/solon-cloud-event/pulsar-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-event/pulsar-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-event/rabbitmq-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-event/rabbitmq-solon-cloud-plugin/pom.xml index 81f18a42aa..11741f75a0 100644 --- a/solon-projects-cloud/solon-cloud-event/rabbitmq-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-event/rabbitmq-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-event/rocketmq-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-event/rocketmq-solon-cloud-plugin/pom.xml index 34524b84da..4a9698bb2d 100644 --- a/solon-projects-cloud/solon-cloud-event/rocketmq-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-event/rocketmq-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-event/rocketmq5-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-event/rocketmq5-solon-cloud-plugin/pom.xml index 2b6ea0d1bc..3110c21538 100644 --- a/solon-projects-cloud/solon-cloud-event/rocketmq5-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-event/rocketmq5-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-file/aliyun-oss-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-file/aliyun-oss-solon-cloud-plugin/pom.xml index b41f812bc8..bca50a0d27 100644 --- a/solon-projects-cloud/solon-cloud-file/aliyun-oss-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-file/aliyun-oss-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-file/aws-s3-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-file/aws-s3-solon-cloud-plugin/pom.xml index 94517189b1..632bd68d21 100644 --- a/solon-projects-cloud/solon-cloud-file/aws-s3-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-file/aws-s3-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-file/fastdfs-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-file/fastdfs-solon-cloud-plugin/pom.xml index c200b7f862..1ed34e76d5 100644 --- a/solon-projects-cloud/solon-cloud-file/fastdfs-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-file/fastdfs-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-file/file-s3-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-file/file-s3-solon-cloud-plugin/pom.xml index 41c7dbb7a1..c7b0977957 100644 --- a/solon-projects-cloud/solon-cloud-file/file-s3-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-file/file-s3-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-file/minio-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-file/minio-solon-cloud-plugin/pom.xml index b02d06f674..2f7776d290 100644 --- a/solon-projects-cloud/solon-cloud-file/minio-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-file/minio-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-file/minio7-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-file/minio7-solon-cloud-plugin/pom.xml index 9e7c25ab4d..4a146a5e4d 100644 --- a/solon-projects-cloud/solon-cloud-file/minio7-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-file/minio7-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-file/qcloud-cos-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-file/qcloud-cos-solon-cloud-plugin/pom.xml index 0cf96e320e..c6c01f87a9 100644 --- a/solon-projects-cloud/solon-cloud-file/qcloud-cos-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-file/qcloud-cos-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-file/qiniu-kodo-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-file/qiniu-kodo-solon-cloud-plugin/pom.xml index 5950813e52..873075a94e 100644 --- a/solon-projects-cloud/solon-cloud-file/qiniu-kodo-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-file/qiniu-kodo-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-id/snowflake-id-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-id/snowflake-id-solon-cloud-plugin/pom.xml index 395458e2d2..5c1e0a4502 100644 --- a/solon-projects-cloud/solon-cloud-id/snowflake-id-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-id/snowflake-id-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-job/powerjob-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-job/powerjob-solon-cloud-plugin/pom.xml index cb0b0c8f93..65f4dca428 100644 --- a/solon-projects-cloud/solon-cloud-job/powerjob-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-job/powerjob-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-job/quartz-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-job/quartz-solon-cloud-plugin/pom.xml index f0e1c2abb8..32d682b518 100644 --- a/solon-projects-cloud/solon-cloud-job/quartz-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-job/quartz-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-job/xxl-job-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-job/xxl-job-solon-cloud-plugin/pom.xml index 545c6ece23..0b48d4be12 100644 --- a/solon-projects-cloud/solon-cloud-job/xxl-job-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-job/xxl-job-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-rpc/grpc-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-rpc/grpc-solon-cloud-plugin/pom.xml index 9b6412b242..cab78bd8c4 100644 --- a/solon-projects-cloud/solon-cloud-rpc/grpc-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-rpc/grpc-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-rpc/thrift-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-rpc/thrift-solon-cloud-plugin/pom.xml index 630f93ad40..5cb5e45e25 100644 --- a/solon-projects-cloud/solon-cloud-rpc/thrift-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-rpc/thrift-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-trace/jaeger-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-trace/jaeger-solon-cloud-plugin/pom.xml index d4009bba05..115efcc4aa 100644 --- a/solon-projects-cloud/solon-cloud-trace/jaeger-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-trace/jaeger-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-trace/opentracing-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-trace/opentracing-solon-cloud-plugin/pom.xml index 035488257e..de6061cd11 100644 --- a/solon-projects-cloud/solon-cloud-trace/opentracing-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-trace/opentracing-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud-trace/zipkin-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud-trace/zipkin-solon-cloud-plugin/pom.xml index 591232a87a..7154b40421 100644 --- a/solon-projects-cloud/solon-cloud-trace/zipkin-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud-trace/zipkin-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud/consul-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud/consul-solon-cloud-plugin/pom.xml index 1243a6e343..e1502f897b 100644 --- a/solon-projects-cloud/solon-cloud/consul-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud/consul-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud/etcd-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud/etcd-solon-cloud-plugin/pom.xml index 236e29df50..1acda75076 100644 --- a/solon-projects-cloud/solon-cloud/etcd-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud/etcd-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud/local-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud/local-solon-cloud-plugin/pom.xml index 622f3baef0..e19cc488c0 100644 --- a/solon-projects-cloud/solon-cloud/local-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud/local-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud/nacos-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud/nacos-solon-cloud-plugin/pom.xml index 8be6a649f4..f92c82d262 100644 --- a/solon-projects-cloud/solon-cloud/nacos-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud/nacos-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud/nacos2-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud/nacos2-solon-cloud-plugin/pom.xml index f885071a69..23bf39f9b9 100644 --- a/solon-projects-cloud/solon-cloud/nacos2-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud/nacos2-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud/polaris-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud/polaris-solon-cloud-plugin/pom.xml index 714d88bbee..7f9efb437d 100644 --- a/solon-projects-cloud/solon-cloud/polaris-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud/polaris-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud/water-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud/water-solon-cloud-plugin/pom.xml index 3c78c56fec..722fe8b7da 100644 --- a/solon-projects-cloud/solon-cloud/water-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud/water-solon-cloud-plugin/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud/zookeeper-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud/zookeeper-solon-cloud-plugin/pom.xml index a5be7f125e..770a3d843f 100644 --- a/solon-projects-cloud/solon-cloud/zookeeper-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud/zookeeper-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects-cloud/solon-cloud/zuul-solon-cloud-plugin/pom.xml b/solon-projects-cloud/solon-cloud/zuul-solon-cloud-plugin/pom.xml index a7700ddbf8..c680e6e394 100644 --- a/solon-projects-cloud/solon-cloud/zuul-solon-cloud-plugin/pom.xml +++ b/solon-projects-cloud/solon-cloud/zuul-solon-cloud-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/nami/nami.channel.http.hutool/pom.xml b/solon-projects/nami/nami.channel.http.hutool/pom.xml index b7c1599397..9894dc2d90 100644 --- a/solon-projects/nami/nami.channel.http.hutool/pom.xml +++ b/solon-projects/nami/nami.channel.http.hutool/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/nami/nami.channel.http.okhttp/pom.xml b/solon-projects/nami/nami.channel.http.okhttp/pom.xml index 84dd210911..e6d6e5a21a 100644 --- a/solon-projects/nami/nami.channel.http.okhttp/pom.xml +++ b/solon-projects/nami/nami.channel.http.okhttp/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/nami/nami.channel.socketd/pom.xml b/solon-projects/nami/nami.channel.socketd/pom.xml index 527a22c9b8..403825401d 100644 --- a/solon-projects/nami/nami.channel.socketd/pom.xml +++ b/solon-projects/nami/nami.channel.socketd/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/nami/nami.coder.fastjson/pom.xml b/solon-projects/nami/nami.coder.fastjson/pom.xml index 723f145ebe..bc2890b1f4 100644 --- a/solon-projects/nami/nami.coder.fastjson/pom.xml +++ b/solon-projects/nami/nami.coder.fastjson/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/nami/nami.coder.fastjson2/pom.xml b/solon-projects/nami/nami.coder.fastjson2/pom.xml index 8433b2bde5..8874fbd508 100644 --- a/solon-projects/nami/nami.coder.fastjson2/pom.xml +++ b/solon-projects/nami/nami.coder.fastjson2/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/nami/nami.coder.fury/pom.xml b/solon-projects/nami/nami.coder.fury/pom.xml index 783caeb05c..d401a22814 100644 --- a/solon-projects/nami/nami.coder.fury/pom.xml +++ b/solon-projects/nami/nami.coder.fury/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/nami/nami.coder.hessian/pom.xml b/solon-projects/nami/nami.coder.hessian/pom.xml index cee255571d..19a057b945 100644 --- a/solon-projects/nami/nami.coder.hessian/pom.xml +++ b/solon-projects/nami/nami.coder.hessian/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/nami/nami.coder.jackson/pom.xml b/solon-projects/nami/nami.coder.jackson/pom.xml index a1948c27c6..995ecf9a3d 100644 --- a/solon-projects/nami/nami.coder.jackson/pom.xml +++ b/solon-projects/nami/nami.coder.jackson/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/nami/nami.coder.protostuff/pom.xml b/solon-projects/nami/nami.coder.protostuff/pom.xml index 94aeb144eb..42c0683c46 100644 --- a/solon-projects/nami/nami.coder.protostuff/pom.xml +++ b/solon-projects/nami/nami.coder.protostuff/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/nami/nami.coder.snack3/pom.xml b/solon-projects/nami/nami.coder.snack3/pom.xml index 2deb979363..82ea614b1d 100644 --- a/solon-projects/nami/nami.coder.snack3/pom.xml +++ b/solon-projects/nami/nami.coder.snack3/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/nami/nami/pom.xml b/solon-projects/nami/nami/pom.xml index f130812f48..af1b367c13 100644 --- a/solon-projects/nami/nami/pom.xml +++ b/solon-projects/nami/nami/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml @@ -22,7 +22,7 @@ org.noear solon - 2.6.4-SNAPSHOT + 2.6.4 provided diff --git a/solon-projects/solon-base/solon.auth/pom.xml b/solon-projects/solon-base/solon.auth/pom.xml index 2e39a4cfd6..dc5b3a469a 100644 --- a/solon-projects/solon-base/solon.auth/pom.xml +++ b/solon-projects/solon-base/solon.auth/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-base/solon.banner/pom.xml b/solon-projects/solon-base/solon.banner/pom.xml index 03dc9bfa2a..be8401994d 100644 --- a/solon-projects/solon-base/solon.banner/pom.xml +++ b/solon-projects/solon-base/solon.banner/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-base/solon.config.yaml/pom.xml b/solon-projects/solon-base/solon.config.yaml/pom.xml index 8795f810bd..bea71676b7 100644 --- a/solon-projects/solon-base/solon.config.yaml/pom.xml +++ b/solon-projects/solon-base/solon.config.yaml/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-base/solon.hotplug/pom.xml b/solon-projects/solon-base/solon.hotplug/pom.xml index 54ded06239..309edfb3ed 100644 --- a/solon-projects/solon-base/solon.hotplug/pom.xml +++ b/solon-projects/solon-base/solon.hotplug/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-base/solon.i18n/pom.xml b/solon-projects/solon-base/solon.i18n/pom.xml index c77ee1d210..6a39d0e71b 100644 --- a/solon-projects/solon-base/solon.i18n/pom.xml +++ b/solon-projects/solon-base/solon.i18n/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-base/solon.mvc/pom.xml b/solon-projects/solon-base/solon.mvc/pom.xml index 1ff4df522c..9ffb472464 100644 --- a/solon-projects/solon-base/solon.mvc/pom.xml +++ b/solon-projects/solon-base/solon.mvc/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-base/solon.net/pom.xml b/solon-projects/solon-base/solon.net/pom.xml index ac9c2e5237..3b075cccef 100644 --- a/solon-projects/solon-base/solon.net/pom.xml +++ b/solon-projects/solon-base/solon.net/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-base/solon.proxy/pom.xml b/solon-projects/solon-base/solon.proxy/pom.xml index 8c758d5529..3d5fa9a74d 100644 --- a/solon-projects/solon-base/solon.proxy/pom.xml +++ b/solon-projects/solon-base/solon.proxy/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-base/solon.validation/pom.xml b/solon-projects/solon-base/solon.validation/pom.xml index 50b6c0784a..a601291de2 100644 --- a/solon-projects/solon-base/solon.validation/pom.xml +++ b/solon-projects/solon-base/solon.validation/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-base/solon.vault/pom.xml b/solon-projects/solon-base/solon.vault/pom.xml index 7b2ff46551..3c3cbb4ea5 100644 --- a/solon-projects/solon-base/solon.vault/pom.xml +++ b/solon-projects/solon-base/solon.vault/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot/solon.boot.jdkhttp/pom.xml b/solon-projects/solon-boot/solon.boot.jdkhttp/pom.xml index cbd15abd86..f409f454cb 100644 --- a/solon-projects/solon-boot/solon.boot.jdkhttp/pom.xml +++ b/solon-projects/solon-boot/solon.boot.jdkhttp/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot/solon.boot.jetty.add.jsp/pom.xml b/solon-projects/solon-boot/solon.boot.jetty.add.jsp/pom.xml index 98e761ebe6..4b410e9e5e 100644 --- a/solon-projects/solon-boot/solon.boot.jetty.add.jsp/pom.xml +++ b/solon-projects/solon-boot/solon.boot.jetty.add.jsp/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot/solon.boot.jetty.add.websocket/pom.xml b/solon-projects/solon-boot/solon.boot.jetty.add.websocket/pom.xml index 2c85a69df8..9ea094f344 100644 --- a/solon-projects/solon-boot/solon.boot.jetty.add.websocket/pom.xml +++ b/solon-projects/solon-boot/solon.boot.jetty.add.websocket/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot/solon.boot.jetty/pom.xml b/solon-projects/solon-boot/solon.boot.jetty/pom.xml index bf9b5de7ad..c69efdbf5d 100644 --- a/solon-projects/solon-boot/solon.boot.jetty/pom.xml +++ b/solon-projects/solon-boot/solon.boot.jetty/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot/solon.boot.jlhttp/pom.xml b/solon-projects/solon-boot/solon.boot.jlhttp/pom.xml index daa6914e5c..f1b05b685a 100644 --- a/solon-projects/solon-boot/solon.boot.jlhttp/pom.xml +++ b/solon-projects/solon-boot/solon.boot.jlhttp/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot/solon.boot.nettyhttp/pom.xml b/solon-projects/solon-boot/solon.boot.nettyhttp/pom.xml index fc2bd70687..7334a4e1e5 100644 --- a/solon-projects/solon-boot/solon.boot.nettyhttp/pom.xml +++ b/solon-projects/solon-boot/solon.boot.nettyhttp/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot/solon.boot.smarthttp/pom.xml b/solon-projects/solon-boot/solon.boot.smarthttp/pom.xml index 30ef8877af..af4538e560 100644 --- a/solon-projects/solon-boot/solon.boot.smarthttp/pom.xml +++ b/solon-projects/solon-boot/solon.boot.smarthttp/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot/solon.boot.socketd/pom.xml b/solon-projects/solon-boot/solon.boot.socketd/pom.xml index 421b1426d8..04f68ab9b9 100644 --- a/solon-projects/solon-boot/solon.boot.socketd/pom.xml +++ b/solon-projects/solon-boot/solon.boot.socketd/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot/solon.boot.tomcat.add.jsp/pom.xml b/solon-projects/solon-boot/solon.boot.tomcat.add.jsp/pom.xml index 5849aa9e88..e4f3988d29 100644 --- a/solon-projects/solon-boot/solon.boot.tomcat.add.jsp/pom.xml +++ b/solon-projects/solon-boot/solon.boot.tomcat.add.jsp/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot/solon.boot.tomcat/pom.xml b/solon-projects/solon-boot/solon.boot.tomcat/pom.xml index ce02fb2ae1..7b4fe9bfc0 100644 --- a/solon-projects/solon-boot/solon.boot.tomcat/pom.xml +++ b/solon-projects/solon-boot/solon.boot.tomcat/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot/solon.boot.undertow.add.jsp/pom.xml b/solon-projects/solon-boot/solon.boot.undertow.add.jsp/pom.xml index e81e0ee6e1..fe38c17da5 100644 --- a/solon-projects/solon-boot/solon.boot.undertow.add.jsp/pom.xml +++ b/solon-projects/solon-boot/solon.boot.undertow.add.jsp/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot/solon.boot.undertow/pom.xml b/solon-projects/solon-boot/solon.boot.undertow/pom.xml index 6215c6fad2..4a37fc0568 100644 --- a/solon-projects/solon-boot/solon.boot.undertow/pom.xml +++ b/solon-projects/solon-boot/solon.boot.undertow/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot/solon.boot.vertx/pom.xml b/solon-projects/solon-boot/solon.boot.vertx/pom.xml index 114c058ae9..d3f6308d03 100644 --- a/solon-projects/solon-boot/solon.boot.vertx/pom.xml +++ b/solon-projects/solon-boot/solon.boot.vertx/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot/solon.boot.websocket.netty/pom.xml b/solon-projects/solon-boot/solon.boot.websocket.netty/pom.xml index 29383509a4..eff96e6ba5 100644 --- a/solon-projects/solon-boot/solon.boot.websocket.netty/pom.xml +++ b/solon-projects/solon-boot/solon.boot.websocket.netty/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot/solon.boot.websocket/pom.xml b/solon-projects/solon-boot/solon.boot.websocket/pom.xml index 4c91718f85..64fd8936f6 100644 --- a/solon-projects/solon-boot/solon.boot.websocket/pom.xml +++ b/solon-projects/solon-boot/solon.boot.websocket/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot/solon.boot/pom.xml b/solon-projects/solon-boot/solon.boot/pom.xml index 78ffe60a8c..a190493878 100644 --- a/solon-projects/solon-boot/solon.boot/pom.xml +++ b/solon-projects/solon-boot/solon.boot/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-cloud/solon.cloud.eventplus/pom.xml b/solon-projects/solon-cloud/solon.cloud.eventplus/pom.xml index e4c4a4bd5e..68b22ad56c 100644 --- a/solon-projects/solon-cloud/solon.cloud.eventplus/pom.xml +++ b/solon-projects/solon-cloud/solon.cloud.eventplus/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-cloud/solon.cloud.httputils/pom.xml b/solon-projects/solon-cloud/solon.cloud.httputils/pom.xml index 210ff2b0aa..f3d5d8e261 100644 --- a/solon-projects/solon-cloud/solon.cloud.httputils/pom.xml +++ b/solon-projects/solon-cloud/solon.cloud.httputils/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-cloud/solon.cloud.metrics/pom.xml b/solon-projects/solon-cloud/solon.cloud.metrics/pom.xml index 35d3cc606a..2145346d68 100644 --- a/solon-projects/solon-cloud/solon.cloud.metrics/pom.xml +++ b/solon-projects/solon-cloud/solon.cloud.metrics/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-cloud/solon.cloud.tracing/pom.xml b/solon-projects/solon-cloud/solon.cloud.tracing/pom.xml index c820bff9fd..5e311f77f9 100644 --- a/solon-projects/solon-cloud/solon.cloud.tracing/pom.xml +++ b/solon-projects/solon-cloud/solon.cloud.tracing/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-cloud/solon.cloud/pom.xml b/solon-projects/solon-cloud/solon.cloud/pom.xml index 1e019b801d..b26c45b49e 100644 --- a/solon-projects/solon-cloud/solon.cloud/pom.xml +++ b/solon-projects/solon-cloud/solon.cloud/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-data/solon.cache.caffeine/pom.xml b/solon-projects/solon-data/solon.cache.caffeine/pom.xml index fd0e0cd4c5..7d434b258a 100644 --- a/solon-projects/solon-data/solon.cache.caffeine/pom.xml +++ b/solon-projects/solon-data/solon.cache.caffeine/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-data/solon.cache.jedis/pom.xml b/solon-projects/solon-data/solon.cache.jedis/pom.xml index bbfaead4c1..750f8a3183 100644 --- a/solon-projects/solon-data/solon.cache.jedis/pom.xml +++ b/solon-projects/solon-data/solon.cache.jedis/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-data/solon.cache.redisson/pom.xml b/solon-projects/solon-data/solon.cache.redisson/pom.xml index 10f5aa2572..598382b682 100644 --- a/solon-projects/solon-data/solon.cache.redisson/pom.xml +++ b/solon-projects/solon-data/solon.cache.redisson/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-data/solon.cache.spymemcached/pom.xml b/solon-projects/solon-data/solon.cache.spymemcached/pom.xml index a6a04b2697..43fc4816aa 100644 --- a/solon-projects/solon-data/solon.cache.spymemcached/pom.xml +++ b/solon-projects/solon-data/solon.cache.spymemcached/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-data/solon.data.dynamicds/pom.xml b/solon-projects/solon-data/solon.data.dynamicds/pom.xml index 6a291b17ee..55497cbb84 100644 --- a/solon-projects/solon-data/solon.data.dynamicds/pom.xml +++ b/solon-projects/solon-data/solon.data.dynamicds/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-data/solon.data.shardingds/pom.xml b/solon-projects/solon-data/solon.data.shardingds/pom.xml index 7f5e5f8f0c..8c5e2d452f 100644 --- a/solon-projects/solon-data/solon.data.shardingds/pom.xml +++ b/solon-projects/solon-data/solon.data.shardingds/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-data/solon.data/pom.xml b/solon-projects/solon-data/solon.data/pom.xml index e0f457aee2..ef18904946 100644 --- a/solon-projects/solon-data/solon.data/pom.xml +++ b/solon-projects/solon-data/solon.data/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-data/solon.data/src/main/java/org/noear/solon/data/cache/LocalCacheService.java b/solon-projects/solon-data/solon.data/src/main/java/org/noear/solon/data/cache/LocalCacheService.java index 963611e95e..f26a7edfe3 100644 --- a/solon-projects/solon-data/solon.data/src/main/java/org/noear/solon/data/cache/LocalCacheService.java +++ b/solon-projects/solon-data/solon.data/src/main/java/org/noear/solon/data/cache/LocalCacheService.java @@ -69,7 +69,7 @@ public void store(String key, Object obj, int seconds) { //设定新的超时 ent.future = RunUtil.delay(() -> { _data.remove(key); - }, seconds * 1000); + }, seconds * 1000L); } } } diff --git a/solon-projects/solon-detector/detector-solon-plugin/pom.xml b/solon-projects/solon-detector/detector-solon-plugin/pom.xml index f51b8d10c8..f7651d51dc 100644 --- a/solon-projects/solon-detector/detector-solon-plugin/pom.xml +++ b/solon-projects/solon-detector/detector-solon-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-detector/solon-admin-client/pom.xml b/solon-projects/solon-detector/solon-admin-client/pom.xml index aa7ba73087..3edcb0341b 100644 --- a/solon-projects/solon-detector/solon-admin-client/pom.xml +++ b/solon-projects/solon-detector/solon-admin-client/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-detector/solon-admin-server-ui/pom.xml b/solon-projects/solon-detector/solon-admin-server-ui/pom.xml index dd3d0eee36..a074d53319 100644 --- a/solon-projects/solon-detector/solon-admin-server-ui/pom.xml +++ b/solon-projects/solon-detector/solon-admin-server-ui/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-detector/solon-admin-server/pom.xml b/solon-projects/solon-detector/solon-admin-server/pom.xml index 7ff28ce836..65987b1217 100644 --- a/solon-projects/solon-detector/solon-admin-server/pom.xml +++ b/solon-projects/solon-detector/solon-admin-server/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-detector/solon.health.detector/pom.xml b/solon-projects/solon-detector/solon.health.detector/pom.xml index 8edf3ca30a..446842e754 100644 --- a/solon-projects/solon-detector/solon.health.detector/pom.xml +++ b/solon-projects/solon-detector/solon.health.detector/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-detector/solon.health/pom.xml b/solon-projects/solon-detector/solon.health/pom.xml index 4b1f2da24d..03c162923f 100644 --- a/solon-projects/solon-detector/solon.health/pom.xml +++ b/solon-projects/solon-detector/solon.health/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-docs/solon-openapi2-knife4j/pom.xml b/solon-projects/solon-docs/solon-openapi2-knife4j/pom.xml index 2c2f6539e4..cf387e5a48 100644 --- a/solon-projects/solon-docs/solon-openapi2-knife4j/pom.xml +++ b/solon-projects/solon-docs/solon-openapi2-knife4j/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-docs/solon-swagger2-knife4j/pom.xml b/solon-projects/solon-docs/solon-swagger2-knife4j/pom.xml index f722293677..3fd4aa048b 100644 --- a/solon-projects/solon-docs/solon-swagger2-knife4j/pom.xml +++ b/solon-projects/solon-docs/solon-swagger2-knife4j/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-docs/solon.docs.openapi2/pom.xml b/solon-projects/solon-docs/solon.docs.openapi2/pom.xml index c9f7c90b50..5386101fff 100644 --- a/solon-projects/solon-docs/solon.docs.openapi2/pom.xml +++ b/solon-projects/solon-docs/solon.docs.openapi2/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-docs/solon.docs.openapi3/pom.xml b/solon-projects/solon-docs/solon.docs.openapi3/pom.xml index 486bfb464b..2b2ee7ed6c 100644 --- a/solon-projects/solon-docs/solon.docs.openapi3/pom.xml +++ b/solon-projects/solon-docs/solon.docs.openapi3/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-docs/solon.docs/pom.xml b/solon-projects/solon-docs/solon.docs/pom.xml index 670ae5c9f7..3929968708 100644 --- a/solon-projects/solon-docs/solon.docs/pom.xml +++ b/solon-projects/solon-docs/solon.docs/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-faas/solon.luffy/pom.xml b/solon-projects/solon-faas/solon.luffy/pom.xml index 809dfc5271..31cececae6 100644 --- a/solon-projects/solon-faas/solon.luffy/pom.xml +++ b/solon-projects/solon-faas/solon.luffy/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-logging/log4j2-solon-plugin/pom.xml b/solon-projects/solon-logging/log4j2-solon-plugin/pom.xml index 93508b35f9..860675b913 100644 --- a/solon-projects/solon-logging/log4j2-solon-plugin/pom.xml +++ b/solon-projects/solon-logging/log4j2-solon-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-logging/logback-solon-plugin/pom.xml b/solon-projects/solon-logging/logback-solon-plugin/pom.xml index 9d62aa9092..09a94a18ab 100644 --- a/solon-projects/solon-logging/logback-solon-plugin/pom.xml +++ b/solon-projects/solon-logging/logback-solon-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-logging/solon.logging.log4j2/pom.xml b/solon-projects/solon-logging/solon.logging.log4j2/pom.xml index 4b68cb2d75..12cb92e2f8 100644 --- a/solon-projects/solon-logging/solon.logging.log4j2/pom.xml +++ b/solon-projects/solon-logging/solon.logging.log4j2/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-logging/solon.logging.logback/pom.xml b/solon-projects/solon-logging/solon.logging.logback/pom.xml index 7dd5c7d100..fb7e942f86 100644 --- a/solon-projects/solon-logging/solon.logging.logback/pom.xml +++ b/solon-projects/solon-logging/solon.logging.logback/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-logging/solon.logging.simple/pom.xml b/solon-projects/solon-logging/solon.logging.simple/pom.xml index 085635cc81..042a42f3ad 100644 --- a/solon-projects/solon-logging/solon.logging.simple/pom.xml +++ b/solon-projects/solon-logging/solon.logging.simple/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-logging/solon.logging/pom.xml b/solon-projects/solon-logging/solon.logging/pom.xml index 6480d40d50..cb1fa48205 100644 --- a/solon-projects/solon-logging/solon.logging/pom.xml +++ b/solon-projects/solon-logging/solon.logging/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-native/solon.aot/pom.xml b/solon-projects/solon-native/solon.aot/pom.xml index 81feaa63c9..eb54820026 100644 --- a/solon-projects/solon-native/solon.aot/pom.xml +++ b/solon-projects/solon-native/solon.aot/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-render/solon.serialization.fastjson/pom.xml b/solon-projects/solon-render/solon.serialization.fastjson/pom.xml index d844e7fb1b..ed415a2e1a 100644 --- a/solon-projects/solon-render/solon.serialization.fastjson/pom.xml +++ b/solon-projects/solon-render/solon.serialization.fastjson/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-render/solon.serialization.fastjson2/pom.xml b/solon-projects/solon-render/solon.serialization.fastjson2/pom.xml index df820088e1..56586e07b9 100644 --- a/solon-projects/solon-render/solon.serialization.fastjson2/pom.xml +++ b/solon-projects/solon-render/solon.serialization.fastjson2/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-render/solon.serialization.fury/pom.xml b/solon-projects/solon-render/solon.serialization.fury/pom.xml index ecc948ca53..6ac669e03a 100644 --- a/solon-projects/solon-render/solon.serialization.fury/pom.xml +++ b/solon-projects/solon-render/solon.serialization.fury/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-render/solon.serialization.gson/pom.xml b/solon-projects/solon-render/solon.serialization.gson/pom.xml index a3da09cf2d..3aed53d140 100644 --- a/solon-projects/solon-render/solon.serialization.gson/pom.xml +++ b/solon-projects/solon-render/solon.serialization.gson/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-render/solon.serialization.hessian/pom.xml b/solon-projects/solon-render/solon.serialization.hessian/pom.xml index 20f2d42cd2..9002f57573 100644 --- a/solon-projects/solon-render/solon.serialization.hessian/pom.xml +++ b/solon-projects/solon-render/solon.serialization.hessian/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-render/solon.serialization.jackson/pom.xml b/solon-projects/solon-render/solon.serialization.jackson/pom.xml index ebbf61186e..6347ed65d1 100644 --- a/solon-projects/solon-render/solon.serialization.jackson/pom.xml +++ b/solon-projects/solon-render/solon.serialization.jackson/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-render/solon.serialization.protostuff/pom.xml b/solon-projects/solon-render/solon.serialization.protostuff/pom.xml index 323c624039..eb1299055e 100644 --- a/solon-projects/solon-render/solon.serialization.protostuff/pom.xml +++ b/solon-projects/solon-render/solon.serialization.protostuff/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-render/solon.serialization.snack3/pom.xml b/solon-projects/solon-render/solon.serialization.snack3/pom.xml index ade50a5293..85b9b9156c 100644 --- a/solon-projects/solon-render/solon.serialization.snack3/pom.xml +++ b/solon-projects/solon-render/solon.serialization.snack3/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-render/solon.serialization/pom.xml b/solon-projects/solon-render/solon.serialization/pom.xml index c87176b054..b42b156100 100644 --- a/solon-projects/solon-render/solon.serialization/pom.xml +++ b/solon-projects/solon-render/solon.serialization/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-render/solon.view.beetl/pom.xml b/solon-projects/solon-render/solon.view.beetl/pom.xml index 06edea3bb2..5196de5428 100644 --- a/solon-projects/solon-render/solon.view.beetl/pom.xml +++ b/solon-projects/solon-render/solon.view.beetl/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-render/solon.view.enjoy/pom.xml b/solon-projects/solon-render/solon.view.enjoy/pom.xml index 0583223c09..ba40287c16 100644 --- a/solon-projects/solon-render/solon.view.enjoy/pom.xml +++ b/solon-projects/solon-render/solon.view.enjoy/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-render/solon.view.freemarker/pom.xml b/solon-projects/solon-render/solon.view.freemarker/pom.xml index 2cd16b728c..7a43dffa96 100644 --- a/solon-projects/solon-render/solon.view.freemarker/pom.xml +++ b/solon-projects/solon-render/solon.view.freemarker/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-render/solon.view.jsp/pom.xml b/solon-projects/solon-render/solon.view.jsp/pom.xml index d26a7b224f..f923c85c8e 100644 --- a/solon-projects/solon-render/solon.view.jsp/pom.xml +++ b/solon-projects/solon-render/solon.view.jsp/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-render/solon.view.thymeleaf/pom.xml b/solon-projects/solon-render/solon.view.thymeleaf/pom.xml index 64f93731a1..81a7b54a0c 100644 --- a/solon-projects/solon-render/solon.view.thymeleaf/pom.xml +++ b/solon-projects/solon-render/solon.view.thymeleaf/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-render/solon.view.velocity/pom.xml b/solon-projects/solon-render/solon.view.velocity/pom.xml index c37b3f0e4f..ea6f8a42d7 100644 --- a/solon-projects/solon-render/solon.view.velocity/pom.xml +++ b/solon-projects/solon-render/solon.view.velocity/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-render/solon.view/pom.xml b/solon-projects/solon-render/solon.view/pom.xml index d706bcf71c..2c8cd8e1d7 100644 --- a/solon-projects/solon-render/solon.view/pom.xml +++ b/solon-projects/solon-render/solon.view/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-scheduling/solon.extend.schedule/pom.xml b/solon-projects/solon-scheduling/solon.extend.schedule/pom.xml index 19fcd8bb84..06535cd0ed 100644 --- a/solon-projects/solon-scheduling/solon.extend.schedule/pom.xml +++ b/solon-projects/solon-scheduling/solon.extend.schedule/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-scheduling/solon.scheduling.quartz/pom.xml b/solon-projects/solon-scheduling/solon.scheduling.quartz/pom.xml index 1db46aba2e..90c4099d4a 100644 --- a/solon-projects/solon-scheduling/solon.scheduling.quartz/pom.xml +++ b/solon-projects/solon-scheduling/solon.scheduling.quartz/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-scheduling/solon.scheduling.simple/pom.xml b/solon-projects/solon-scheduling/solon.scheduling.simple/pom.xml index 8a9d688834..3e45cbbaa8 100644 --- a/solon-projects/solon-scheduling/solon.scheduling.simple/pom.xml +++ b/solon-projects/solon-scheduling/solon.scheduling.simple/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-scheduling/solon.scheduling/pom.xml b/solon-projects/solon-scheduling/solon.scheduling/pom.xml index f1fe40d57d..43f28a2b8a 100644 --- a/solon-projects/solon-scheduling/solon.scheduling/pom.xml +++ b/solon-projects/solon-scheduling/solon.scheduling/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-testing/solon-test-junit4/pom.xml b/solon-projects/solon-testing/solon-test-junit4/pom.xml index 053cb62061..b7f0bc26e7 100644 --- a/solon-projects/solon-testing/solon-test-junit4/pom.xml +++ b/solon-projects/solon-testing/solon-test-junit4/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-testing/solon-test-junit5/pom.xml b/solon-projects/solon-testing/solon-test-junit5/pom.xml index fd8d0cbcde..559520d03c 100644 --- a/solon-projects/solon-testing/solon-test-junit5/pom.xml +++ b/solon-projects/solon-testing/solon-test-junit5/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-testing/solon-test/pom.xml b/solon-projects/solon-testing/solon-test/pom.xml index a5df53f8ba..aaa2d35939 100644 --- a/solon-projects/solon-testing/solon-test/pom.xml +++ b/solon-projects/solon-testing/solon-test/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-testing/solon.test/pom.xml b/solon-projects/solon-testing/solon.test/pom.xml index e519ffc4f8..af3d0113fc 100644 --- a/solon-projects/solon-testing/solon.test/pom.xml +++ b/solon-projects/solon-testing/solon.test/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-tool/solon-maven-plugin/pom.xml b/solon-projects/solon-tool/solon-maven-plugin/pom.xml index 4c07b160a5..fdfc80d77b 100644 --- a/solon-projects/solon-tool/solon-maven-plugin/pom.xml +++ b/solon-projects/solon-tool/solon-maven-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-tool/solon-springboot-starter/pom.xml b/solon-projects/solon-tool/solon-springboot-starter/pom.xml index ed3c08ba1b..2bbe2d0d77 100644 --- a/solon-projects/solon-tool/solon-springboot-starter/pom.xml +++ b/solon-projects/solon-tool/solon-springboot-starter/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web/solon.sessionstate.jedis/pom.xml b/solon-projects/solon-web/solon.sessionstate.jedis/pom.xml index 2acf98586f..f347b6d601 100644 --- a/solon-projects/solon-web/solon.sessionstate.jedis/pom.xml +++ b/solon-projects/solon-web/solon.sessionstate.jedis/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web/solon.sessionstate.jwt/pom.xml b/solon-projects/solon-web/solon.sessionstate.jwt/pom.xml index b67e59cfae..c794bdf9e7 100644 --- a/solon-projects/solon-web/solon.sessionstate.jwt/pom.xml +++ b/solon-projects/solon-web/solon.sessionstate.jwt/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web/solon.sessionstate.local/pom.xml b/solon-projects/solon-web/solon.sessionstate.local/pom.xml index 782b628a14..6b14c4c73c 100644 --- a/solon-projects/solon-web/solon.sessionstate.local/pom.xml +++ b/solon-projects/solon-web/solon.sessionstate.local/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web/solon.sessionstate.redisson/pom.xml b/solon-projects/solon-web/solon.sessionstate.redisson/pom.xml index 9093cdf1b5..7d26d406a1 100644 --- a/solon-projects/solon-web/solon.sessionstate.redisson/pom.xml +++ b/solon-projects/solon-web/solon.sessionstate.redisson/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web/solon.web.cors/pom.xml b/solon-projects/solon-web/solon.web.cors/pom.xml index bcd7dc91e0..c472d25f8d 100644 --- a/solon-projects/solon-web/solon.web.cors/pom.xml +++ b/solon-projects/solon-web/solon.web.cors/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web/solon.web.flux/pom.xml b/solon-projects/solon-web/solon.web.flux/pom.xml index 810d29e20f..68b463b6ac 100644 --- a/solon-projects/solon-web/solon.web.flux/pom.xml +++ b/solon-projects/solon-web/solon.web.flux/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web/solon.web.sdl/pom.xml b/solon-projects/solon-web/solon.web.sdl/pom.xml index 9f39d3d162..aacd4c38a2 100644 --- a/solon-projects/solon-web/solon.web.sdl/pom.xml +++ b/solon-projects/solon-web/solon.web.sdl/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web/solon.web.servlet.jakarta/pom.xml b/solon-projects/solon-web/solon.web.servlet.jakarta/pom.xml index 2f1ba5dcd2..4fb049ae74 100644 --- a/solon-projects/solon-web/solon.web.servlet.jakarta/pom.xml +++ b/solon-projects/solon-web/solon.web.servlet.jakarta/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web/solon.web.servlet/pom.xml b/solon-projects/solon-web/solon.web.servlet/pom.xml index 69096dd0a9..7b82734fcc 100644 --- a/solon-projects/solon-web/solon.web.servlet/pom.xml +++ b/solon-projects/solon-web/solon.web.servlet/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web/solon.web.sse/pom.xml b/solon-projects/solon-web/solon.web.sse/pom.xml index 535f1b8129..fa38b6321c 100644 --- a/solon-projects/solon-web/solon.web.sse/pom.xml +++ b/solon-projects/solon-web/solon.web.sse/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web/solon.web.staticfiles/pom.xml b/solon-projects/solon-web/solon.web.staticfiles/pom.xml index 2f6c0e7b3c..a0768dd3de 100644 --- a/solon-projects/solon-web/solon.web.staticfiles/pom.xml +++ b/solon-projects/solon-web/solon.web.staticfiles/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web/solon.web.stop/pom.xml b/solon-projects/solon-web/solon.web.stop/pom.xml index 2cac1362f7..deb99ca543 100644 --- a/solon-projects/solon-web/solon.web.stop/pom.xml +++ b/solon-projects/solon-web/solon.web.stop/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web/solon.web.webdav/pom.xml b/solon-projects/solon-web/solon.web.webdav/pom.xml index 28ea2b2cdf..76d1c80041 100644 --- a/solon-projects/solon-web/solon.web.webdav/pom.xml +++ b/solon-projects/solon-web/solon.web.webdav/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../../solon-parent/pom.xml diff --git a/solon-shortcuts/solon-api/pom.xml b/solon-shortcuts/solon-api/pom.xml index a144dc0a2c..561232841e 100644 --- a/solon-shortcuts/solon-api/pom.xml +++ b/solon-shortcuts/solon-api/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/solon-shortcuts/solon-beetl-web/pom.xml b/solon-shortcuts/solon-beetl-web/pom.xml index d88239069f..3d3706e6ea 100644 --- a/solon-shortcuts/solon-beetl-web/pom.xml +++ b/solon-shortcuts/solon-beetl-web/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/solon-shortcuts/solon-cloud-alibaba/pom.xml b/solon-shortcuts/solon-cloud-alibaba/pom.xml index faf8916ef8..ea8d34ae3e 100644 --- a/solon-shortcuts/solon-cloud-alibaba/pom.xml +++ b/solon-shortcuts/solon-cloud-alibaba/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/solon-shortcuts/solon-cloud-water/pom.xml b/solon-shortcuts/solon-cloud-water/pom.xml index 99050cca28..4ecbb6452e 100644 --- a/solon-shortcuts/solon-cloud-water/pom.xml +++ b/solon-shortcuts/solon-cloud-water/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/solon-shortcuts/solon-cloud/pom.xml b/solon-shortcuts/solon-cloud/pom.xml index 93704fbf8c..fa858ce2bd 100644 --- a/solon-shortcuts/solon-cloud/pom.xml +++ b/solon-shortcuts/solon-cloud/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/solon-shortcuts/solon-enjoy-web/pom.xml b/solon-shortcuts/solon-enjoy-web/pom.xml index cdd38110a1..efebc7b86a 100644 --- a/solon-shortcuts/solon-enjoy-web/pom.xml +++ b/solon-shortcuts/solon-enjoy-web/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/solon-shortcuts/solon-job/pom.xml b/solon-shortcuts/solon-job/pom.xml index cb21e8f3ff..2ca932acb5 100644 --- a/solon-shortcuts/solon-job/pom.xml +++ b/solon-shortcuts/solon-job/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/solon-shortcuts/solon-lib/pom.xml b/solon-shortcuts/solon-lib/pom.xml index 0d204d5e97..0c68e235b2 100644 --- a/solon-shortcuts/solon-lib/pom.xml +++ b/solon-shortcuts/solon-lib/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/solon-shortcuts/solon-rpc/pom.xml b/solon-shortcuts/solon-rpc/pom.xml index 0b9839d935..0d1b8e0a26 100644 --- a/solon-shortcuts/solon-rpc/pom.xml +++ b/solon-shortcuts/solon-rpc/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/solon-shortcuts/solon-web-beetl/pom.xml b/solon-shortcuts/solon-web-beetl/pom.xml index 8c4d55a591..ed5ab95e4c 100644 --- a/solon-shortcuts/solon-web-beetl/pom.xml +++ b/solon-shortcuts/solon-web-beetl/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/solon-shortcuts/solon-web-enjoy/pom.xml b/solon-shortcuts/solon-web-enjoy/pom.xml index 2eb9844f3d..0441d98edf 100644 --- a/solon-shortcuts/solon-web-enjoy/pom.xml +++ b/solon-shortcuts/solon-web-enjoy/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/solon-shortcuts/solon-web/pom.xml b/solon-shortcuts/solon-web/pom.xml index e1dc060b62..c4afdd2c64 100644 --- a/solon-shortcuts/solon-web/pom.xml +++ b/solon-shortcuts/solon-web/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../../solon-parent/pom.xml diff --git a/solon/pom.xml b/solon/pom.xml index 4a0dff17aa..33bfed67ce 100644 --- a/solon/pom.xml +++ b/solon/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.6.4-SNAPSHOT + 2.6.4 ../solon-parent/pom.xml diff --git a/solon/src/main/java/org/noear/solon/Solon.java b/solon/src/main/java/org/noear/solon/Solon.java index 6aea747812..5a9f066771 100644 --- a/solon/src/main/java/org/noear/solon/Solon.java +++ b/solon/src/main/java/org/noear/solon/Solon.java @@ -40,7 +40,7 @@ public class Solon { * 框架版本号 */ public static String version() { - return "2.6.4-SNAPSHOT"; + return "2.6.4"; } /**