diff --git a/README.md b/README.md index e6527672046415791e2a9564a392e901ffaca95d..1409d56dcc77944768d7e0abfe623f4053b17e0d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@


-Solon v3.3.1 +Solon v3.3.2-SNAPSHOT

Java enterprise application development framework for full scenario: Restrained, Efficient, Open, Ecological diff --git a/README_CN.md b/README_CN.md index ca6c330a6b252c59457eaa1c40d87bd2280b96c1..166931320ad2adc0a2b2c138d75fc052e9905f60 100644 --- a/README_CN.md +++ b/README_CN.md @@ -1,7 +1,7 @@


-Solon v3.3.1 +Solon v3.3.2-SNAPSHOT

面向全场景的 Java 企业级应用开发框架：克制、高效、开放、生态 diff --git a/README_EN.md b/README_EN.md index b85831c23070d862bf7c9b8e7358bcfa6d4e8b54..a6cb0532634769f8cfea6b5e69ee4c2a197edb4a 100644 --- a/README_EN.md +++ b/README_EN.md @@ -1,7 +1,7 @@


-Solon v3.3.1 +Solon v3.3.2-SNAPSHOT

Java enterprise application development framework for full scenario: Restrained, Efficient, Open, Ecological diff --git a/README_JP.md b/README_JP.md index 8c263a6c658f2c731fb6171414efdbe801952b6c..825968f923f95b27f21ce9a257364fc958fd7fc1 100644 --- a/README_JP.md +++ b/README_JP.md @@ -1,7 +1,7 @@


-Solon v3.3.1 +Solon v3.3.2-SNAPSHOT

全シーンに向けたJava企業向けアプリケーション開発フレームワーク:抑制、効率、オープン、エコ diff --git a/README_RU.md b/README_RU.md index b4795ba80c31b8a7276d5bc4b8a1205d92564deb..1da7f1e0d0f4a4301869058a81a7f98bd22f3efd 100644 --- a/README_RU.md +++ b/README_RU.md @@ -1,7 +1,7 @@


-Solon v3.3.1 +Solon v3.3.2-SNAPSHOT

Структура разработки приложений на бизнес-уровне, ориентированная на полную сцену: сдержанность, эффективность, открытость, экология diff --git a/UPDATE_LOG.md b/UPDATE_LOG.md index 4920bd26a4bb6796aa23085c2ceb4e12528d7c10..5b8f81640a9293907ebdcc7a7ab58746427704a3 100644 --- a/UPDATE_LOG.md +++ b/UPDATE_LOG.md @@ -21,6 +21,16 @@ * 优化 拦截体系与 rx 的兼容？ +### 3.4.0 + +* 调整 solon-boot-* 更名为 solon-server-* + +### 3.3.2 + +* 添加 solon 接口版本 version 支持？？？ +* 优化 solon 属性默认值处理策略 +* sa-token 升为 1.43.0 + ### 3.3.1 * 新增 solon-ai-flow 插件 diff --git a/__hatch/nami-coder-thrift/pom.xml b/__hatch/nami-coder-thrift/pom.xml index 20d76550dba4f1cdbf5111a55ba7ebc03d318185..b1271b45909b2c5d82eb9ff75da74df224c93366 100644 --- a/__hatch/nami-coder-thrift/pom.xml +++ b/__hatch/nami-coder-thrift/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../solon-parent/pom.xml @@ -19,13 +19,13 @@ org.noear solon - 3.3.1 + 3.3.2-SNAPSHOT org.noear nami - 3.3.1 + 3.3.2-SNAPSHOT diff --git a/__hatch/nanoxlsx4j-solon-plugin/pom.xml b/__hatch/nanoxlsx4j-solon-plugin/pom.xml index eabc2e59bef42d3693e424ca3d9c1d389f8c6d3c..e8fa037691afd90240abe29b3d821d06171f5395 100644 --- a/__hatch/nanoxlsx4j-solon-plugin/pom.xml +++ b/__hatch/nanoxlsx4j-solon-plugin/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../solon-parent/pom.xml diff --git a/__hatch/pom.xml b/__hatch/pom.xml index c0116c233fdfe286e465096611a498491add116a..a231251908695c65c250a6b86ea87386f6aeab54 100644 --- a/__hatch/pom.xml +++ b/__hatch/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../solon-parent/pom.xml diff --git a/__hatch/solon-boot-nettyhttp/pom.xml b/__hatch/solon-boot-nettyhttp/pom.xml index 7a6189de9d717248bc4e074850501408d8098f12..9eb5a77f23b860c5dc1d011e3bc6deaa153eb1a5 100644 --- a/__hatch/solon-boot-nettyhttp/pom.xml +++ b/__hatch/solon-boot-nettyhttp/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../solon-parent/pom.xml diff --git a/__hatch/solon-boot-reactor-netty/pom.xml b/__hatch/solon-boot-reactor-netty/pom.xml index 3e1ef76bd361eaf366bb4d063b48ee9bd4e87ac9..9612371745461da6d094854a8e8fe978ba401e45 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../solon-parent/pom.xml diff --git a/__hatch/solon-boot-tomcat-add-jsp/pom.xml b/__hatch/solon-boot-tomcat-add-jsp/pom.xml index 66de7b2a22220114b3200c0a22516bac943b2861..eba717a5bd1c89a7c7e19f018a24d3f8d99a6410 100644 --- a/__hatch/solon-boot-tomcat-add-jsp/pom.xml +++ b/__hatch/solon-boot-tomcat-add-jsp/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../solon-parent/pom.xml diff --git a/__hatch/solon-boot-tomcat/pom.xml b/__hatch/solon-boot-tomcat/pom.xml index 4951399e9ed83c3732e550fd44df6fbc48e0c3fa..640b78d247b1e0d73b70997e9466b2a35e673c2c 100644 --- a/__hatch/solon-boot-tomcat/pom.xml +++ b/__hatch/solon-boot-tomcat/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../solon-parent/pom.xml diff --git a/__hatch/solon-serialization-avro/pom.xml b/__hatch/solon-serialization-avro/pom.xml index 1f25721ba5f3a6a8338c5e904935fb4ccd30e817..e357b633d8f214e9cfcdaba38069e546770acb29 100644 --- a/__hatch/solon-serialization-avro/pom.xml +++ b/__hatch/solon-serialization-avro/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../solon-parent/pom.xml diff --git a/__hatch/solon-serialization-thrift/pom.xml b/__hatch/solon-serialization-thrift/pom.xml index 5d3860a5bfa5ba7b4b9baa6f6d3e788490fd55e9..527c54cbac16a07141c781c28d8398682b166ed3 100644 --- a/__hatch/solon-serialization-thrift/pom.xml +++ b/__hatch/solon-serialization-thrift/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../solon-parent/pom.xml diff --git a/__release/nami-bundle/pom.xml b/__release/nami-bundle/pom.xml index d1a742a03fa986c75d90957f1782130da772a2a3..e188190dff29405c184997de8055de6489353271 100644 --- a/__release/nami-bundle/pom.xml +++ b/__release/nami-bundle/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../solon-parent/pom.xml diff --git a/__release/solon-base-bundle1/pom.xml b/__release/solon-base-bundle1/pom.xml index fc24133be1bf62c4213ee68d6ec8a039c63cab0a..5c592098de6c1ba237ec12b8d2c9550f4ecd7c72 100644 --- a/__release/solon-base-bundle1/pom.xml +++ b/__release/solon-base-bundle1/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../solon-parent/pom.xml diff --git a/__release/solon-base-bundle2/pom.xml b/__release/solon-base-bundle2/pom.xml index 7d86dc09f164db67033f67e2a3cae0b8d34b86c6..ca043f345f38206f76c34c93811ca1e1582e5e65 100644 --- a/__release/solon-base-bundle2/pom.xml +++ b/__release/solon-base-bundle2/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../solon-parent/pom.xml diff --git a/__release/solon-base-bundle3/pom.xml b/__release/solon-base-bundle3/pom.xml index 0c31ee87ef362999102e514ed789929a2d2d54d2..d9bf5413476824d9050433e2faf8b799da17e2bf 100644 --- a/__release/solon-base-bundle3/pom.xml +++ b/__release/solon-base-bundle3/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../solon-parent/pom.xml diff --git a/__release/solon-base-bundle4/pom.xml b/__release/solon-base-bundle4/pom.xml index a61513667c215d42058fac6d9449180ff170323c..8b5d26f898df9885942627e472e8be1a1fc3ef00 100644 --- a/__release/solon-base-bundle4/pom.xml +++ b/__release/solon-base-bundle4/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../solon-parent/pom.xml diff --git a/__release/solon-base-bundle5/pom.xml b/__release/solon-base-bundle5/pom.xml index 1409d6f5f0b8704fcba1e3ccf6464f645badb9f8..05926685bd08664e82066f83a3156522dd555664 100644 --- a/__release/solon-base-bundle5/pom.xml +++ b/__release/solon-base-bundle5/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../solon-parent/pom.xml diff --git a/__release/solon-base-bundle6/pom.xml b/__release/solon-base-bundle6/pom.xml index d7500def85063f3a2b15e0143cff3c0fd32f58be..80b5e0055fa3d7fa0545e009b3bd2428c7a0def9 100644 --- a/__release/solon-base-bundle6/pom.xml +++ b/__release/solon-base-bundle6/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../solon-parent/pom.xml diff --git a/__release/solon-shortcuts-bundle/pom.xml b/__release/solon-shortcuts-bundle/pom.xml index b706995c8bbdaa33ac95950da6311d1d37c55760..9df4b38d112f9d033255819fa06d9c50318e629b 100644 --- a/__release/solon-shortcuts-bundle/pom.xml +++ b/__release/solon-shortcuts-bundle/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../solon-parent/pom.xml diff --git a/__test/pom.xml b/__test/pom.xml index 28637d88e497cd79c93a5f7b7a3d33d858f51b8d..c471ac653b2d4619a4b39a20cab9a02e6d72f45d 100644 --- a/__test/pom.xml +++ b/__test/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../solon-parent/pom.xml diff --git a/solon-parent/pom.xml b/solon-parent/pom.xml index f57f1f587242dc766e04d2f599a8237f3653ca1f..7dc9ba2da2ca9529511e0f237d974b9874e8ad99 100644 --- a/solon-parent/pom.xml +++ b/solon-parent/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT pom ${project.artifactId} @@ -30,13 +30,13 @@ 3.4.0 - 3.3.1 - 3.3.1 + 3.3.2-SNAPSHOT + 3.3.2-SNAPSHOT 3.3.1 - 3.3.1 + 3.3.2-SNAPSHOT 3.3.1 3.3.1 - 3.3.1 + 3.3.2-SNAPSHOT 3.3.1 1.1.3 @@ -159,7 +159,7 @@ 2.3.2 5.1.0 - 1.42.0 + 1.43.0 3.3.3 1.5.5.Final diff --git a/solon-projects/nami/nami-channel-http-hutool/pom.xml b/solon-projects/nami/nami-channel-http-hutool/pom.xml index 9193962620814958fd7a7ed36f36877c448246a7..838aaa622450b1d5afce97b868a977064f442e5b 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 43d7f11739b942de2a33d529303442e56d40c8d6..210437501e0509ef5235e5af62dce24abbc7131b 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/nami/nami-channel-http/pom.xml b/solon-projects/nami/nami-channel-http/pom.xml index 63e60e2973abab6d9c2b0ac1910fe1a96031e079..ceafdae9cae7ce047cd1ed98adf5b52408445ce1 100644 --- a/solon-projects/nami/nami-channel-http/pom.xml +++ b/solon-projects/nami/nami-channel-http/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 48a8a0162960d143dcb6e1833e79e903c172b778..3c7eb5958f1fd145eb5f226a5c4f5fb55b5345b2 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/nami/nami-coder-abc/pom.xml b/solon-projects/nami/nami-coder-abc/pom.xml index 1f478eb092d5f5f68e11433bd6150d5e1c2a63ce..e957714d6cd7f86bbac1e6892e7a7d9eede2d5b2 100644 --- a/solon-projects/nami/nami-coder-abc/pom.xml +++ b/solon-projects/nami/nami-coder-abc/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 dc36d1151976968b0fc00602d70441383d33dbc6..fb6620d830fbb4e4444c0386e059ad6ec3e7a881 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 f279ccfe5309f2f976c0245a38bcadb43a306d4e..402fdb5070806c995c396f7f302eceac1ba68245 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 57a414393a18d1565878c473d8027bf7e8ac1ebb..7daa3e9d7bacfdd0d417bfe789c288a8e5cb725e 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 b7882fa86fc16808116b4b034c7dbf7be9bea2d1..1e25587d8f683781946f1a2b28d06b13c717aedb 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 c36799e1709e4ee70d2b9e733097b8bb459fccb7..dc8cdd7404585060ef5842290844502359a5b88b 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/nami/nami-coder-kryo/pom.xml b/solon-projects/nami/nami-coder-kryo/pom.xml index b8f8481650a01abce4146c4168654aa2f22f98b8..2e4732fd1142a5eccf87c144edbb407d48271a70 100644 --- a/solon-projects/nami/nami-coder-kryo/pom.xml +++ b/solon-projects/nami/nami-coder-kryo/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 5ed1dc7cde574925006374d00edb40b986d8cc17..278ea7577e4e8b451b33a47a0079b39e7d501e4a 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 e27ff9097b644eed98336eb195475021e57321f7..edf7a9320ccf4d82537d5f85f52692b3e5a135f7 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/nami/nami/pom.xml b/solon-projects/nami/nami/pom.xml index f46cfb3094366c17c2e695a75fc6db25974e6bf5..4e0c599d2170d95f9c55d8197c98c5bd34c69e09 100644 --- a/solon-projects/nami/nami/pom.xml +++ b/solon-projects/nami/nami/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/nami_old/nami.channel.http.hutool/pom.xml b/solon-projects/nami_old/nami.channel.http.hutool/pom.xml index 7527e97b5932d79825581f68765f621a8f587e03..70e7175f88f6a9976cd99e1688402dd60bcab69b 100644 --- a/solon-projects/nami_old/nami.channel.http.hutool/pom.xml +++ b/solon-projects/nami_old/nami.channel.http.hutool/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/nami_old/nami.channel.http.okhttp/pom.xml b/solon-projects/nami_old/nami.channel.http.okhttp/pom.xml index 026e09efddc6405abeb6b2f5c1d28dd5d18b38d5..91adbabbe8ae72144578d5ac4cafee639ba90cfe 100644 --- a/solon-projects/nami_old/nami.channel.http.okhttp/pom.xml +++ b/solon-projects/nami_old/nami.channel.http.okhttp/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/nami_old/nami.channel.socketd/pom.xml b/solon-projects/nami_old/nami.channel.socketd/pom.xml index a0b0f6de3c49f7f9e9d5ce2c83a844d6298607b8..339930ac20df481d9fd20c1c7b37e42c560e62c3 100644 --- a/solon-projects/nami_old/nami.channel.socketd/pom.xml +++ b/solon-projects/nami_old/nami.channel.socketd/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/nami_old/nami.coder.fastjson/pom.xml b/solon-projects/nami_old/nami.coder.fastjson/pom.xml index 4cda2f43e11caeefeaaab8c086782102b63f0e79..bf7fa9ed2ba7fd974765369e26184ca8a8b9a581 100644 --- a/solon-projects/nami_old/nami.coder.fastjson/pom.xml +++ b/solon-projects/nami_old/nami.coder.fastjson/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/nami_old/nami.coder.fastjson2/pom.xml b/solon-projects/nami_old/nami.coder.fastjson2/pom.xml index 374a52234cfc727728324218fdcb18a290459aeb..397255e0073e23432fff22567ea724b3a57dc4e4 100644 --- a/solon-projects/nami_old/nami.coder.fastjson2/pom.xml +++ b/solon-projects/nami_old/nami.coder.fastjson2/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/nami_old/nami.coder.fury/pom.xml b/solon-projects/nami_old/nami.coder.fury/pom.xml index dd23bb1e4c1282690c4512db4c2b62e57d18728a..d7f672cd37d9e9bad1b3189f3229077340bd7669 100644 --- a/solon-projects/nami_old/nami.coder.fury/pom.xml +++ b/solon-projects/nami_old/nami.coder.fury/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/nami_old/nami.coder.hessian/pom.xml b/solon-projects/nami_old/nami.coder.hessian/pom.xml index 4ce882e95564ab967c187f378c88c2d031e36d02..24d11ad1147aba0158a7bf31f54846be17cb9361 100644 --- a/solon-projects/nami_old/nami.coder.hessian/pom.xml +++ b/solon-projects/nami_old/nami.coder.hessian/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/nami_old/nami.coder.jackson/pom.xml b/solon-projects/nami_old/nami.coder.jackson/pom.xml index 0d6fce80d31b991c4ce8983e98740623f2caf921..78584d570bb762c23f87a994353e88969980c7ca 100644 --- a/solon-projects/nami_old/nami.coder.jackson/pom.xml +++ b/solon-projects/nami_old/nami.coder.jackson/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/nami_old/nami.coder.protostuff/pom.xml b/solon-projects/nami_old/nami.coder.protostuff/pom.xml index 34459d6488dcb5123d80571add925e81de93d2d3..67289fc470df6d6a28cd589a245306e95438c598 100644 --- a/solon-projects/nami_old/nami.coder.protostuff/pom.xml +++ b/solon-projects/nami_old/nami.coder.protostuff/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/nami_old/nami.coder.snack3/pom.xml b/solon-projects/nami_old/nami.coder.snack3/pom.xml index fb8fb3700ae6bb71d703619942f221cd0dbb0453..168cc50e5d47b6a2009314d74884941373c22aae 100644 --- a/solon-projects/nami_old/nami.coder.snack3/pom.xml +++ b/solon-projects/nami_old/nami.coder.snack3/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 0d059a04d74eb76f5e48f13f6ad9f434141277f6..821a3783d810c482900941fe4d5d39c83da55d23 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-base/solon-hotplug/src/main/java/org/noear/solon/hotplug/PluginClassLoader.java b/solon-projects/solon-base/solon-hotplug/src/main/java/org/noear/solon/hotplug/PluginClassLoader.java index 7efffd81e6ef84a6fa770f0b931f59164f1f2487..97762d0636533a2e3ee5729786cc41a627af880b 100644 --- a/solon-projects/solon-base/solon-hotplug/src/main/java/org/noear/solon/hotplug/PluginClassLoader.java +++ b/solon-projects/solon-base/solon-hotplug/src/main/java/org/noear/solon/hotplug/PluginClassLoader.java @@ -38,9 +38,10 @@ public class PluginClassLoader extends AppClassLoader { return findResources(name); } - @Override - public URL getResource(String name) { - //只获取本级资源 - return findResource(name); - } +// 具体查找不限，否则不能查找类资源文件 +// @Override +// public URL getResource(String name) { +// //只获取本级资源 +// return findResource(name); +// } } diff --git a/solon-projects/solon-base/solon-i18n/pom.xml b/solon-projects/solon-base/solon-i18n/pom.xml index 2abcd693c6f1048719f86cd50176c2c68245fc8f..1e0f6892f31060edc0c9c47b6fccf93e29ef6bfb 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 7f54e34b7f7af6243335a4479aae7a163fcb138f..458e4b6df54154644d107f9111faada05af56207 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 7341cdb15b714572948224bc3704f33c758a2b35..5ea9df0e710a3f7bc5a2e4dae7e581ccb98fff55 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-base/solon-proxy/src/main/java/org/noear/solon/proxy/asm/ClassCodeBuilder.java b/solon-projects/solon-base/solon-proxy/src/main/java/org/noear/solon/proxy/asm/ClassCodeBuilder.java index 8a9a9f5da62c2625ec95f8fa67e608c239133b85..979ff7cee8070457d3946bb1f6961d9ecbcd7de7 100644 --- a/solon-projects/solon-base/solon-proxy/src/main/java/org/noear/solon/proxy/asm/ClassCodeBuilder.java +++ b/solon-projects/solon-base/solon-proxy/src/main/java/org/noear/solon/proxy/asm/ClassCodeBuilder.java @@ -37,10 +37,10 @@ public class ClassCodeBuilder { return Opcodes.V11; } else if (JavaUtil.JAVA_MAJOR_VERSION < 21) { return Opcodes.V17; - } else if (JavaUtil.JAVA_MAJOR_VERSION < 23) { + } else if (JavaUtil.JAVA_MAJOR_VERSION < 24) { return Opcodes.V21; } else { - return Opcodes.V23; + return Opcodes.V24; } } diff --git a/solon-projects/solon-base_old/solon.banner/pom.xml b/solon-projects/solon-base_old/solon.banner/pom.xml index 3a3981851256ff4191c1501267cf9570e0c663e3..92f62948e6fa6567f6c81ccf9c9d7ca751bab959 100644 --- a/solon-projects/solon-base_old/solon.banner/pom.xml +++ b/solon-projects/solon-base_old/solon.banner/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-base_old/solon.config.yaml/pom.xml b/solon-projects/solon-base_old/solon.config.yaml/pom.xml index 3ef140bdbcabe9bccdd1f1665d5c8f02751ac281..016304ebe7ed24837d99a9ebd386c8c9565527c4 100644 --- a/solon-projects/solon-base_old/solon.config.yaml/pom.xml +++ b/solon-projects/solon-base_old/solon.config.yaml/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-base_old/solon.hotplug/pom.xml b/solon-projects/solon-base_old/solon.hotplug/pom.xml index 11c1d0ae4bf002368d0eaf3bf57802ac5a826065..9626a8235dc93bdcfc0bff57a86198bb35c21776 100644 --- a/solon-projects/solon-base_old/solon.hotplug/pom.xml +++ b/solon-projects/solon-base_old/solon.hotplug/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-base_old/solon.i18n/pom.xml b/solon-projects/solon-base_old/solon.i18n/pom.xml index 60b345c907f7c7474755f5bf76b09abe7b5fb377..256c5aa7c711439702394468603f649a6c182fa3 100644 --- a/solon-projects/solon-base_old/solon.i18n/pom.xml +++ b/solon-projects/solon-base_old/solon.i18n/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-base_old/solon.mvc/pom.xml b/solon-projects/solon-base_old/solon.mvc/pom.xml index a65e4759564a827629a067d377354b0fc19c448d..0ce18f953c420b72a7d463c40f08bf04aba18f01 100644 --- a/solon-projects/solon-base_old/solon.mvc/pom.xml +++ b/solon-projects/solon-base_old/solon.mvc/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-base_old/solon.proxy/pom.xml b/solon-projects/solon-base_old/solon.proxy/pom.xml index 44254286a7a336dd58045a9d914134d2970819ef..4819c2887bdc680461d1311c81a820d42af89fa6 100644 --- a/solon-projects/solon-base_old/solon.proxy/pom.xml +++ b/solon-projects/solon-base_old/solon.proxy/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 60c6730dc80611aa79da2118624f6abaa6b9169b..c2b22723bf2d5553a0458929a70b95f3378f7afc 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 5cc892df94940f3eb2b4d3fcd6ac345000a8a1f8..4c9dc50e6633938e088fcca9765d03283afaf264 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 5f8f4d0da951840dc7355839a4e6c3385350a0eb..fc3b03358b71320a336b28a826c097e4d34a1a7a 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 ea80273c716908e7d621f209b31ff02805b30737..675c128d2d464793df9a03a7bb6809c1b24ee9e7 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 8a2178292e6964bc478128b98f24fe96cca5c3cc..3857490c2555cd726db2920670f2991ec2581e7a 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 2c2e72ca9215383036a26f02bbf73a17e46c86db..23b486512e57f7582bd0a2c4010cf2ce9abc4f9a 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 3dc8410e48599086587572b2fe62dd7ffec31fee..fd0ed4ad9c25e876790f49d2ddca9fa8aaa3a4f7 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 ab33af8501e11fc514e133d444806845b779c505..f22cbec02b14c661ba2ff87a5224e7433bb3242c 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 aaebe69b291f749d5e051e5a7b826e2689e73922..f51cfff37d2fac00467d0cb7292bf411fa031691 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 dcf14f42bc5588eac5d2b39c364426ccb4fb27a1..48810039ac39456f935422c573b2878c26646775 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 b67f4392b650a1eeeb1460f6fb3b687d69f86809..cb9d0d855bda23c90237ce8f302c316e7101a835 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 33cca1758a549bfa838bc831feb8076d7a724cab..4fced4999ab8c69c8d060a97779417199208f927 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot_old/solon.boot.jdkhttp/pom.xml b/solon-projects/solon-boot_old/solon.boot.jdkhttp/pom.xml index 8ef50ceee6bf3deaab4aa4949c48af5a62f1d222..443588049088915a80e555ab750c8705d433096d 100644 --- a/solon-projects/solon-boot_old/solon.boot.jdkhttp/pom.xml +++ b/solon-projects/solon-boot_old/solon.boot.jdkhttp/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot_old/solon.boot.jetty.add.jsp/pom.xml b/solon-projects/solon-boot_old/solon.boot.jetty.add.jsp/pom.xml index 38ad446670237131802f8b9e39049225220a8231..76248da820d1a0d975a31a33549d68eee88d7cae 100644 --- a/solon-projects/solon-boot_old/solon.boot.jetty.add.jsp/pom.xml +++ b/solon-projects/solon-boot_old/solon.boot.jetty.add.jsp/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot_old/solon.boot.jetty.add.websocket/pom.xml b/solon-projects/solon-boot_old/solon.boot.jetty.add.websocket/pom.xml index 281d2ad0ad441705195784f65c53f502298efcb1..08fcb33cbd861da85ae22530b328a15131758a66 100644 --- a/solon-projects/solon-boot_old/solon.boot.jetty.add.websocket/pom.xml +++ b/solon-projects/solon-boot_old/solon.boot.jetty.add.websocket/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot_old/solon.boot.jetty/pom.xml b/solon-projects/solon-boot_old/solon.boot.jetty/pom.xml index 561a0f9915b3bd198c7d682d666455dc70307271..b28eb5405698c5ec8342606c6c9601db433732a4 100644 --- a/solon-projects/solon-boot_old/solon.boot.jetty/pom.xml +++ b/solon-projects/solon-boot_old/solon.boot.jetty/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot_old/solon.boot.smarthttp/pom.xml b/solon-projects/solon-boot_old/solon.boot.smarthttp/pom.xml index cf75b9af9975c2f60b6ddc1754306e0a68595ba9..0b5dc80f4207fd689f17ba67620fa02ad671ec46 100644 --- a/solon-projects/solon-boot_old/solon.boot.smarthttp/pom.xml +++ b/solon-projects/solon-boot_old/solon.boot.smarthttp/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot_old/solon.boot.socketd/pom.xml b/solon-projects/solon-boot_old/solon.boot.socketd/pom.xml index 01b79c8d135c420a7dfb89a67427bd43e3a7a2b6..8fc55341e1972a2dc85ade7ff4c66d954efcb9ac 100644 --- a/solon-projects/solon-boot_old/solon.boot.socketd/pom.xml +++ b/solon-projects/solon-boot_old/solon.boot.socketd/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot_old/solon.boot.undertow.add.jsp/pom.xml b/solon-projects/solon-boot_old/solon.boot.undertow.add.jsp/pom.xml index 49f9887494d90bc5201f02e9806bf26d179fe9a0..ac8f7cdde4b4482c6478984a0c5ab79b0dcdd929 100644 --- a/solon-projects/solon-boot_old/solon.boot.undertow.add.jsp/pom.xml +++ b/solon-projects/solon-boot_old/solon.boot.undertow.add.jsp/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot_old/solon.boot.undertow/pom.xml b/solon-projects/solon-boot_old/solon.boot.undertow/pom.xml index eacf053323aabdec48a289605d1aa1ce6dcde162..541f1368b8901f45388194dd88a5d554f659bda8 100644 --- a/solon-projects/solon-boot_old/solon.boot.undertow/pom.xml +++ b/solon-projects/solon-boot_old/solon.boot.undertow/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot_old/solon.boot.vertx/pom.xml b/solon-projects/solon-boot_old/solon.boot.vertx/pom.xml index ba530767e374565af036f1316a2299cc5383a08f..7f39f1908a203166bffbcc0f46f29860ce00f618 100644 --- a/solon-projects/solon-boot_old/solon.boot.vertx/pom.xml +++ b/solon-projects/solon-boot_old/solon.boot.vertx/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot_old/solon.boot.websocket.netty/pom.xml b/solon-projects/solon-boot_old/solon.boot.websocket.netty/pom.xml index 9394999b68a3d5c816801dda27804d926d3f8003..8f27356e7429298760b0070a35a4ea811015a2cc 100644 --- a/solon-projects/solon-boot_old/solon.boot.websocket.netty/pom.xml +++ b/solon-projects/solon-boot_old/solon.boot.websocket.netty/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot_old/solon.boot.websocket/pom.xml b/solon-projects/solon-boot_old/solon.boot.websocket/pom.xml index fc23ff0c2d1f555a16c38da0477bc5ad427fd4fa..3ff0a4a4d9e8129f4b41eeaea90eb4f1c19403ce 100644 --- a/solon-projects/solon-boot_old/solon.boot.websocket/pom.xml +++ b/solon-projects/solon-boot_old/solon.boot.websocket/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-boot_old/solon.boot/pom.xml b/solon-projects/solon-boot_old/solon.boot/pom.xml index 8df60697dd1514803b82b847efa015b0c2b09034..3beaae8af3abc2a113b308e0872ce775c8cf27d0 100644 --- a/solon-projects/solon-boot_old/solon.boot/pom.xml +++ b/solon-projects/solon-boot_old/solon.boot/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-config/solon-config-banner/pom.xml b/solon-projects/solon-config/solon-config-banner/pom.xml index be9a0ee6b89b707666ed4a4e7541719ec1626326..05c608df47f30393e302dbbb640e1f26b9a987c3 100644 --- a/solon-projects/solon-config/solon-config-banner/pom.xml +++ b/solon-projects/solon-config/solon-config-banner/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-config/solon-config-plus/pom.xml b/solon-projects/solon-config/solon-config-plus/pom.xml index a496d5a5673f0e9e8f9c9358cb0d6634f1ac2e6c..dd92b0373c9a458e3b3495dde4cbe0506da4c0cd 100644 --- a/solon-projects/solon-config/solon-config-plus/pom.xml +++ b/solon-projects/solon-config/solon-config-plus/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-config/solon-config-yaml/pom.xml b/solon-projects/solon-config/solon-config-yaml/pom.xml index 4f2809884fe739720a64fb12c943bbc4c69bebf6..82eb291b879f78d3eed4352336359ca83add7b15 100644 --- a/solon-projects/solon-config/solon-config-yaml/pom.xml +++ b/solon-projects/solon-config/solon-config-yaml/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml @@ -31,13 +31,11 @@ - org.noear - snack3 + org.junit.jupiter + junit-jupiter + ${junit5.version} + test - - - - diff --git a/solon-projects/solon-config/solon-config-yaml/src/main/java/org/noear/solon/config/yaml/PropertiesJson.java b/solon-projects/solon-config/solon-config-yaml/src/main/java/org/noear/solon/config/yaml/PropertiesJson.java deleted file mode 100644 index 14612816981a1e856124aa070c822ac9fe16e6f0..0000000000000000000000000000000000000000 --- a/solon-projects/solon-config/solon-config-yaml/src/main/java/org/noear/solon/config/yaml/PropertiesJson.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2017-2025 noear.org and authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.noear.solon.config.yaml; - -import org.noear.snack.ONode; - -import java.io.IOException; -import java.util.Properties; - -/** - * Json 属性 - * - * @author noear - * @since 1.5 - * */ -public class PropertiesJson extends Properties { - public void loadJson(String text) throws IOException { - ONode.loadStr(text).bindTo(this); - } -} diff --git a/solon-projects/solon-config/solon-config-yaml/src/main/java/org/noear/solon/extend/impl/PropsLoaderExt.java b/solon-projects/solon-config/solon-config-yaml/src/main/java/org/noear/solon/extend/impl/PropsLoaderExt.java index 23006d977b68fd578cc838d91a5869f7c74539d9..82434265bfeb17b47cdc7b9e2ff0b934446fd1a9 100644 --- a/solon-projects/solon-config/solon-config-yaml/src/main/java/org/noear/solon/extend/impl/PropsLoaderExt.java +++ b/solon-projects/solon-config/solon-config-yaml/src/main/java/org/noear/solon/extend/impl/PropsLoaderExt.java @@ -18,7 +18,6 @@ package org.noear.solon.extend.impl; import org.noear.solon.Solon; import org.noear.solon.core.PropsLoader; import org.noear.solon.core.util.LogUtil; -import org.noear.solon.config.yaml.PropertiesJson; import org.noear.solon.config.yaml.PropertiesYaml; import java.io.IOException; @@ -99,23 +98,22 @@ public class PropsLoaderExt extends PropsLoader { public Properties build(String text) throws IOException { text = text.trim(); - int idx1 = text.indexOf("="); - int idx2 = text.indexOf(":"); - //有{开头 if (text.startsWith("{") && text.endsWith("}")) { - PropertiesJson tmp = new PropertiesJson(); - tmp.loadJson(text); + PropertiesYaml tmp = new PropertiesYaml(); + tmp.loadYml(new StringReader(text)); return tmp; } //有[开头 if (text.startsWith("[") && text.endsWith("]")) { - PropertiesJson tmp = new PropertiesJson(); - tmp.loadJson(text); + PropertiesYaml tmp = new PropertiesYaml(); + tmp.loadYml(new StringReader(text)); return tmp; } + int idx1 = text.indexOf("="); + int idx2 = text.indexOf(":"); //有= if (idx1 > 0 && (idx1 < idx2 || idx2 < 0)) { @@ -124,13 +122,8 @@ public class PropsLoaderExt extends PropsLoader { return tmp; } - //有: - if (idx2 > 0 && (idx2 < idx1 || idx1 < 0)) { - PropertiesYaml tmp = new PropertiesYaml(); - tmp.loadYml(new StringReader(text)); - return tmp; - } - - return new Properties(); + PropertiesYaml tmp = new PropertiesYaml(); + tmp.loadYml(new StringReader(text)); + return tmp; } } diff --git a/solon-projects/solon-config/solon-config-yaml/src/test/java/features/yaml/PropAddLoadTest.java b/solon-projects/solon-config/solon-config-yaml/src/test/java/features/yaml/PropAddLoadTest.java new file mode 100644 index 0000000000000000000000000000000000000000..f0f5527ad83b6c9ecfedd0b055de73153b05d84e --- /dev/null +++ b/solon-projects/solon-config/solon-config-yaml/src/test/java/features/yaml/PropAddLoadTest.java @@ -0,0 +1,38 @@ +package features.yaml; + + +import org.junit.jupiter.api.Test; +import org.noear.solon.SimpleSolonApp; +import org.noear.solon.Solon; +import org.noear.solon.core.AppContext; +import org.noear.solon.core.Plugin; + +import java.util.Properties; + +/** + * @author noear 2025/5/29 created + */ +public class PropAddLoadTest { + @Test + public void case1() throws Throwable { + SimpleSolonApp app = new SimpleSolonApp(PropAddLoadTest.class, + "-cfg=app-cfg-test.yml", + "-testing=1"); + app.start(x -> { + x.enableScanning(false); + x.pluginAdd(990, new Plugin() { + @Override + public void start(AppContext context) throws Throwable { + Properties properties = new Properties(); + properties.put("demo2.datasource.driverClassName", "456"); + Solon.cfg().loadAdd(properties); + } + }); + }); + + Properties properties = app.cfg().getProp("app2.db"); + System.out.println(properties); + + assert "{driverClassName=123, driverClassName2=456, driverClassName1=456}".equals(properties.toString()); + } +} diff --git a/solon-projects/solon-config/solon-config-yaml/src/test/java/features/yaml/PropUtilTest.java b/solon-projects/solon-config/solon-config-yaml/src/test/java/features/yaml/PropUtilTest.java new file mode 100644 index 0000000000000000000000000000000000000000..3bef773351a0c26f5ae20a9b87a3e8e702c7023f --- /dev/null +++ b/solon-projects/solon-config/solon-config-yaml/src/test/java/features/yaml/PropUtilTest.java @@ -0,0 +1,57 @@ +package features.yaml; + +import org.junit.jupiter.api.Test; +import org.noear.solon.Utils; + +import java.util.Properties; + +/** + * @author noear 2025/5/29 created + */ +public class PropUtilTest { + @Test + public void jsonCase1() { + Properties properties = Utils.buildProperties("{\"a\":\"a\",\"b\":\"b\"}"); + System.out.println(properties); + assert "{b=b, a=a}".equals(properties.toString()); + } + + @Test + public void jsonCase2() { + Properties properties = Utils.buildProperties("[1,2]"); + System.out.println(properties); + assert "{[0]=1, [1]=2}".equals(properties.toString()); + } + + @Test + public void yamlCase1() { + Properties properties = Utils.buildProperties("a: a\n" + + "b: b"); + System.out.println(properties); + assert "{b=b, a=a}".equals(properties.toString()); + } + + @Test + public void yamlCase2() { + Properties properties = Utils.buildProperties("- 1\n" + + "- 2"); + System.out.println(properties); + assert "{[0]=1, [1]=2}".equals(properties.toString()); + } + + @Test + public void propCase1() { + Properties properties = Utils.buildProperties("a=a\n" + + "b=b"); + System.out.println(properties); + assert "{b=b, a=a}".equals(properties.toString()); + } + + @Test + public void propCase2() { + Properties properties = Utils.buildProperties("[0]=1\n" + + "[1]=2"); + System.out.println(properties); + assert "{[0]=1, [1]=2}".equals(properties.toString()); + } +} diff --git a/solon-projects/solon-config/solon-config-yaml/src/test/resources/app-cfg-test.yml b/solon-projects/solon-config/solon-config-yaml/src/test/resources/app-cfg-test.yml new file mode 100644 index 0000000000000000000000000000000000000000..f5932544e4d1268d3ee952241462081ac2da8e4b --- /dev/null +++ b/solon-projects/solon-config/solon-config-yaml/src/test/resources/app-cfg-test.yml @@ -0,0 +1,11 @@ +demo2: + datasource: + driverClassName1: 123 + +app2.db: + #从nacos取 + driverClassName1: ${demo2.datasource.driverClassName} + #从nacos取加默认值 + driverClassName2: ${demo2.datasource.driverClassName:} + #从本地取，且加默认值 + driverClassName: ${demo2.datasource.driverClassName1:} \ No newline at end of file diff --git a/solon-projects/solon-data/solon-cache-caffeine/pom.xml b/solon-projects/solon-data/solon-cache-caffeine/pom.xml index cedf6d25364235fab6cf5565b501664bd8a1914a..f5dc8dac72c358676243db2b310ad950b0ed0e24 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 1e10dd59da516ae77128e6d44c54b951c52e9042..7ab91ae413b1349b4872eec2bac8020c2560197b 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 8f58a921fa554d9d6b8ffa5d63c74a041847fabd..777f50a880e2fcea069b7b02af76d21510b10e45 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 8584c631a4a787e9480d7467435ee79c58b6e836..9aa98d7a5d467ab1cf4aefdd5d83abf8a3f3a2d0 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 8e6393f5cf9cf16e49bd6e25dbcc3951b58f0ea7..5dae5d4bf040fe525bbfb33c4cacce7684025a86 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 35b84fbaf7e9c56050addea33e52c1c74dac7a57..a5c3776cedf72aa4acb915563f4b3112bbe76bfe 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-data/solon-data-sqlink/pom.xml b/solon-projects/solon-data/solon-data-sqlink/pom.xml index ad9d51a055c2d6ac79c578fe225a8e639e0aadf7..9f6885382612483b7a8176e52a118221e8815817 100644 --- a/solon-projects/solon-data/solon-data-sqlink/pom.xml +++ b/solon-projects/solon-data/solon-data-sqlink/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-data/solon-data-sqlutils/pom.xml b/solon-projects/solon-data/solon-data-sqlutils/pom.xml index e173a9293ee306948953bd24e10bf23562d22f83..cfe1e4df1f0137ebc90c14632f5e10de3ca99ffe 100644 --- a/solon-projects/solon-data/solon-data-sqlutils/pom.xml +++ b/solon-projects/solon-data/solon-data-sqlutils/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 091907153366194a0498db4781918669af482a73..cd74073c65865b6a1125257f3d81882969902f7e 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-data_old/solon.cache.caffeine/pom.xml b/solon-projects/solon-data_old/solon.cache.caffeine/pom.xml index 54c922608b2bb1542a1890de7f6a3f20b7d5cc86..bffd8228afdc583d021f533ce48a57146aba74a3 100644 --- a/solon-projects/solon-data_old/solon.cache.caffeine/pom.xml +++ b/solon-projects/solon-data_old/solon.cache.caffeine/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-data_old/solon.cache.jedis/pom.xml b/solon-projects/solon-data_old/solon.cache.jedis/pom.xml index 6766ee21350e80ad95759e6f23aa28f8c44bfdcf..c559b6ccc280f37bde302d7d02e87bf6f20cc650 100644 --- a/solon-projects/solon-data_old/solon.cache.jedis/pom.xml +++ b/solon-projects/solon-data_old/solon.cache.jedis/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-data_old/solon.cache.redisson/pom.xml b/solon-projects/solon-data_old/solon.cache.redisson/pom.xml index 418e929802be930b5414c5988b390e467c657e20..42dacef9af6d5d2d0a09b28ee4b57fd21da33704 100644 --- a/solon-projects/solon-data_old/solon.cache.redisson/pom.xml +++ b/solon-projects/solon-data_old/solon.cache.redisson/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-data_old/solon.cache.spymemcached/pom.xml b/solon-projects/solon-data_old/solon.cache.spymemcached/pom.xml index 699b8bc9abff6213f107e281825c393acaf6ee7f..a220b80c60b85bdeed018edf1718e44e49cb5e31 100644 --- a/solon-projects/solon-data_old/solon.cache.spymemcached/pom.xml +++ b/solon-projects/solon-data_old/solon.cache.spymemcached/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-data_old/solon.data.dynamicds/pom.xml b/solon-projects/solon-data_old/solon.data.dynamicds/pom.xml index 2750105ecc865a7d560a7024ef5f8fe3fb65066a..2cb3e74108a5bf207fb8c18199baa9aaa3519144 100644 --- a/solon-projects/solon-data_old/solon.data.dynamicds/pom.xml +++ b/solon-projects/solon-data_old/solon.data.dynamicds/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-data_old/solon.data.shardingds/pom.xml b/solon-projects/solon-data_old/solon.data.shardingds/pom.xml index f1dcb08c6dea61ef1a3619f5bc7ec1c83c56d67d..8573f79f2f1467ddad626a7fb1bbb3cab92286c2 100644 --- a/solon-projects/solon-data_old/solon.data.shardingds/pom.xml +++ b/solon-projects/solon-data_old/solon.data.shardingds/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-data_old/solon.data/pom.xml b/solon-projects/solon-data_old/solon.data/pom.xml index 9e6a6a7cd40c5b732c0c317dad216938e8bcaa95..e89f61a59caf8637af79a047c838583573661345 100644 --- a/solon-projects/solon-data_old/solon.data/pom.xml +++ b/solon-projects/solon-data_old/solon.data/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 f4ebd358ca81508673503f14cdd092daa8b55ac6..9c4ce71e06244e76da70a63b11fc099f15c668ab 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 27d3ee9631e0142e4fd2f00058363f5409c8519f..26d63266b3223b72d04827c520caa7a6aa426532 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-detector_old/solon.health.detector/pom.xml b/solon-projects/solon-detector_old/solon.health.detector/pom.xml index e2f79f4bab0f1a3591dcb314d6d759bcdce5e022..aac899f7f8b2a0cb574cf2eda16d13a5441ebcd5 100644 --- a/solon-projects/solon-detector_old/solon.health.detector/pom.xml +++ b/solon-projects/solon-detector_old/solon.health.detector/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-detector_old/solon.health/pom.xml b/solon-projects/solon-detector_old/solon.health/pom.xml index 3e40a7e48ff017a63c2b344c1ec4eb872306fafb..11652442f6562b68570aeb758fff7d92913ead39 100644 --- a/solon-projects/solon-detector_old/solon.health/pom.xml +++ b/solon-projects/solon-detector_old/solon.health/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-docs/solon-docs-openapi2-javadoc/pom.xml b/solon-projects/solon-docs/solon-docs-openapi2-javadoc/pom.xml index 5cb1fe42765f295b7bd530ab024fd006ab88f436..690ad511fdf87ec17dc09feb1d2fa79f0b74d611 100644 --- a/solon-projects/solon-docs/solon-docs-openapi2-javadoc/pom.xml +++ b/solon-projects/solon-docs/solon-docs-openapi2-javadoc/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 90d6d6b06af8ef15da5e77412e90ce98482f38c3..dd4ee05486c17ffba27a8274492b2df4e9c13994 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 78c30b5d2c41a746aabd1569b44ad28d3286d3d6..c4f9477339be7150ac7117ff7957a8e521cb93b3 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 5ea76d9603bcb82701a1a6f25729f0b93ce546ea..59adb2f69ad3b5a0f66b0798ed75e569cb4a599b 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 cdfb0280c7999f4cc9f198d5107ec5aff9557cb7..d1f385483856f1f8a2dc5a88b7656a86e06a054c 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 9f666826abb94cee855fac00ab87a9e4e178e504..ad8034af11025147893eea69be5396d0a6ce5011 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-docs_old/solon.docs.openapi2/pom.xml b/solon-projects/solon-docs_old/solon.docs.openapi2/pom.xml index ad744259db06d115bc0fd228c6d84155662ea21f..b2a5cff4ee673284f41dc79c26e00e4752033149 100644 --- a/solon-projects/solon-docs_old/solon.docs.openapi2/pom.xml +++ b/solon-projects/solon-docs_old/solon.docs.openapi2/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-docs_old/solon.docs/pom.xml b/solon-projects/solon-docs_old/solon.docs/pom.xml index 7692fdf8c53005e985bd84f6e86d04bd4327b89a..25d0d730cb1dba95d45454513a90d9c206cfb105 100644 --- a/solon-projects/solon-docs_old/solon.docs/pom.xml +++ b/solon-projects/solon-docs_old/solon.docs/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-faas/solon-faas-luffy/pom.xml b/solon-projects/solon-faas/solon-faas-luffy/pom.xml index 06a4fb70f49f666db7b3f0e98c9a0cba1817bfe4..76ac4948bfde3c3e1d15ba0dd7bfb3c584e38a66 100644 --- a/solon-projects/solon-faas/solon-faas-luffy/pom.xml +++ b/solon-projects/solon-faas/solon-faas-luffy/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-faas/solon-faas-luffy/src/main/java/org/noear/solon/luffy/impl/JtExecutorAdapter.java b/solon-projects/solon-faas/solon-faas-luffy/src/main/java/org/noear/solon/luffy/impl/JtExecutorAdapter.java index 02909080e773d8d35ca9814412fc05370203c0c0..656e96ca41345e9765f12b9daed4461df17dbd4f 100644 --- a/solon-projects/solon-faas/solon-faas-luffy/src/main/java/org/noear/solon/luffy/impl/JtExecutorAdapter.java +++ b/solon-projects/solon-faas/solon-faas-luffy/src/main/java/org/noear/solon/luffy/impl/JtExecutorAdapter.java @@ -35,7 +35,7 @@ import java.util.Map; * * @author noear * @since 1.3 - * */ + */ public class JtExecutorAdapter implements IJtExecutorAdapter, IJtConfigAdapter { static Logger log = LoggerFactory.getLogger(JtExecutorAdapter.class); @@ -45,14 +45,14 @@ public class JtExecutorAdapter implements IJtExecutorAdapter, IJtConfigAdapter { private JtFunctionLoader forDebug; private JtFunctionLoader forRelease; + private String _nodeId; - - public JtExecutorAdapter(JtFunctionLoader resouceLoader) { + public JtExecutorAdapter(JtFunctionLoader resourceLoader) { _defaultExecutor = JtMapping.getActuator(""); _defLogTag = "luffy"; forDebug = new JtFunctionLoaderDebug(); - forRelease = resouceLoader; + forRelease = resourceLoader; } @Override @@ -90,7 +90,6 @@ public class JtExecutorAdapter implements IJtExecutorAdapter, IJtConfigAdapter { } } - @Override public AFileModel fileGet(String path) throws Exception { AFileModel file = null; @@ -111,8 +110,6 @@ public class JtExecutorAdapter implements IJtExecutorAdapter, IJtConfigAdapter { return Collections.emptyList(); } - private String _nodeId; - @Override public String nodeId() { if (_nodeId == null) { diff --git a/solon-projects/solon-faas/solon-faas-luffy/src/main/java/org/noear/solon/luffy/impl/JtFunctionLoaderManager.java b/solon-projects/solon-faas/solon-faas-luffy/src/main/java/org/noear/solon/luffy/impl/JtFunctionLoaderManager.java index 662fef44484c547117c319aa067f062ff4b115d1..dad9e15b4214821937ce846c3c262ede3a0fab10 100644 --- a/solon-projects/solon-faas/solon-faas-luffy/src/main/java/org/noear/solon/luffy/impl/JtFunctionLoaderManager.java +++ b/solon-projects/solon-faas/solon-faas-luffy/src/main/java/org/noear/solon/luffy/impl/JtFunctionLoaderManager.java @@ -25,26 +25,26 @@ import java.util.List; * @since 2.6 */ public class JtFunctionLoaderManager implements JtFunctionLoader { - private final List resouceLoaders = new ArrayList<>(); + private final List resourceLoaders = new ArrayList<>(); /** * 添加 */ - public void add(int index, JtFunctionLoader resouceLoader) { - resouceLoaders.add(index, resouceLoader); + public void add(int index, JtFunctionLoader resourceLoader) { + resourceLoaders.add(index, resourceLoader); } /** * 清空 */ public void clear() { - resouceLoaders.clear(); + resourceLoaders.clear(); } @Override public AFileModel fileGet(String path) throws Exception { AFileModel aFile = null; - for (JtFunctionLoader rl : resouceLoaders) { + for (JtFunctionLoader rl : resourceLoaders) { aFile = rl.fileGet(path); if (aFile != null && aFile.content != null) { diff --git a/solon-projects/solon-faas/solon-faas-luffy/src/main/java/org/noear/solon/luffy/impl/JtMapping.java b/solon-projects/solon-faas/solon-faas-luffy/src/main/java/org/noear/solon/luffy/impl/JtMapping.java index 286c48a9fb4b5b1fa00d483873cd7545ef772096..909ebb1015232388068f7077bb0b17cbe4e4bfb4 100644 --- a/solon-projects/solon-faas/solon-faas-luffy/src/main/java/org/noear/solon/luffy/impl/JtMapping.java +++ b/solon-projects/solon-faas/solon-faas-luffy/src/main/java/org/noear/solon/luffy/impl/JtMapping.java @@ -41,7 +41,7 @@ public class JtMapping { fileMapping.put("rb","ruby"); } - public static void addMaping(String suffix, String actuator) { + public static void addMapping(String suffix, String actuator) { fileMapping.put(suffix, actuator); } diff --git a/solon-projects/solon-faas/solon-faas-luffy/src/main/java/org/noear/solon/luffy/impl/JtRun.java b/solon-projects/solon-faas/solon-faas-luffy/src/main/java/org/noear/solon/luffy/impl/JtRun.java index 01b11dfbbe2bc270894002c20f1c1d3d3d7152d4..61081981a244ccdeee78ba9b66ff79a4d3db7fe5 100644 --- a/solon-projects/solon-faas/solon-faas-luffy/src/main/java/org/noear/solon/luffy/impl/JtRun.java +++ b/solon-projects/solon-faas/solon-faas-luffy/src/main/java/org/noear/solon/luffy/impl/JtRun.java @@ -34,19 +34,19 @@ import java.util.concurrent.CompletableFuture; public class JtRun { private static CompletableFuture initFuture = new CompletableFuture<>(); - private static final JtFunctionLoaderManager resouceLoader = new JtFunctionLoaderManager(); + private static final JtFunctionLoaderManager resourceLoader = new JtFunctionLoaderManager(); private static JtExecutorAdapter jtAdapter; public static void init() { if (jtAdapter == null) { - resouceLoader.add(0, new JtFunctionLoaderClasspath()); + resourceLoader.add(0, new JtFunctionLoaderClasspath()); //添加外部扩展的资源加载器 Solon.context().subBeansOfType(JtFunctionLoader.class, bean -> { - resouceLoader.add(0, bean); + resourceLoader.add(0, bean); }); - jtAdapter = new JtExecutorAdapter(resouceLoader); + jtAdapter = new JtExecutorAdapter(resourceLoader); JtBridge.executorAdapterSet(jtAdapter); JtBridge.configAdapterSet(jtAdapter); } @@ -55,8 +55,8 @@ public class JtRun { /** * 获取资源加载器（可以清空并替换为数据库的） */ - public static JtFunctionLoaderManager getResouceLoader() { - return resouceLoader; + public static JtFunctionLoaderManager getResourceLoader() { + return resourceLoader; } public static AFileModel fileGet(String path) throws Exception { diff --git a/solon-projects/solon-faas_old/solon.luffy/pom.xml b/solon-projects/solon-faas_old/solon.luffy/pom.xml index 61eea7bd14f2266b58947226fd20bf75362346c4..0094068ea623fcf8d42c48f0f19f03579eeb85e3 100644 --- a/solon-projects/solon-faas_old/solon.luffy/pom.xml +++ b/solon-projects/solon-faas_old/solon.luffy/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 f71434c4f1bcda85c4026105375b01ba58c6c5ba..9356347873fafdf71cc1c827046ab529db82778b 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 8b7ef07f6a3a940df157049cac17dfea4b2f7644..ef952e3b23afbfe8d11ebddc6a084031a45d6b5f 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 0cc9b3a742bdcf683bc0791133d1a2eb7283aae9..2e6d329c964540177f00ea9fefd575965d22f4d0 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 5d50a9f8d44730c09bc217c9a7251f10b9627b1f..97033264f01b42f59d93ac68408ce9446072297c 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-logging_old/solon.logging.log4j2/pom.xml b/solon-projects/solon-logging_old/solon.logging.log4j2/pom.xml index 1e92c58750bb483a25511d59f9860026a2a67d06..cd08a22359ce9dae9805c525ce8fd5c2729d6058 100644 --- a/solon-projects/solon-logging_old/solon.logging.log4j2/pom.xml +++ b/solon-projects/solon-logging_old/solon.logging.log4j2/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-logging_old/solon.logging.logback/pom.xml b/solon-projects/solon-logging_old/solon.logging.logback/pom.xml index 32bbe0210d11556dc43761687b7b2c32f007e13e..bd7e3f2e274f44eb073f199a9ad7bad8406ba89f 100644 --- a/solon-projects/solon-logging_old/solon.logging.logback/pom.xml +++ b/solon-projects/solon-logging_old/solon.logging.logback/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-logging_old/solon.logging.simple/pom.xml b/solon-projects/solon-logging_old/solon.logging.simple/pom.xml index 6165827baa2fb4152c0d5fc12888aec8d72bfeca..92e576827fb0655daa0cd63aac2b8e2f20e98dfd 100644 --- a/solon-projects/solon-logging_old/solon.logging.simple/pom.xml +++ b/solon-projects/solon-logging_old/solon.logging.simple/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-logging_old/solon.logging/pom.xml b/solon-projects/solon-logging_old/solon.logging/pom.xml index 229ff9c98800ec948534f11e6cc3820570cc16a9..baff820417e408e762bc6963386f71245123fe5d 100644 --- a/solon-projects/solon-logging_old/solon.logging/pom.xml +++ b/solon-projects/solon-logging_old/solon.logging/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 dc5e7926bedd0fa1216c1255799e6038c16c8bb8..d06edda55b2dc1551d209bbab050f27e2557dd48 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-native_old/solon.aot/pom.xml b/solon-projects/solon-native_old/solon.aot/pom.xml index a7cd862e205bf2f8ce3840c9e161870ff18d006b..059ff46871b0ecca54d7ba6f0187eac0bb72bffe 100644 --- a/solon-projects/solon-native_old/solon.aot/pom.xml +++ b/solon-projects/solon-native_old/solon.aot/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-net/solon-net-httputils/pom.xml b/solon-projects/solon-net/solon-net-httputils/pom.xml index 4087126e1a44cebfb375d9e2d97679ad83e22f1a..78f4a816f1f189f2451b78a8ca4674e0b5a34d36 100644 --- a/solon-projects/solon-net/solon-net-httputils/pom.xml +++ b/solon-projects/solon-net/solon-net-httputils/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-net/solon-net-stomp/pom.xml b/solon-projects/solon-net/solon-net-stomp/pom.xml index 25acc4a8468fe473512b4bf442ce60252524b40e..b32f5c11dc54ced61319513d9099f5082b0989d8 100644 --- a/solon-projects/solon-net/solon-net-stomp/pom.xml +++ b/solon-projects/solon-net/solon-net-stomp/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-net/solon-net/pom.xml b/solon-projects/solon-net/solon-net/pom.xml index 261620ca0e9201e3bb8c980b86933e703f8a3a56..eb0315e57f943666b218611eca01966f957cc0b5 100644 --- a/solon-projects/solon-net/solon-net/pom.xml +++ b/solon-projects/solon-net/solon-net/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-net_old/solon.net.httputils/pom.xml b/solon-projects/solon-net_old/solon.net.httputils/pom.xml index de7731535090cb79f5efc57b86ea3a045f7f0654..b26c6df24f6807b27d57725acbb05e0aeb2bbb50 100644 --- a/solon-projects/solon-net_old/solon.net.httputils/pom.xml +++ b/solon-projects/solon-net_old/solon.net.httputils/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-net_old/solon.net/pom.xml b/solon-projects/solon-net_old/solon.net/pom.xml index 44472e3320aa3618475630e397129cbdc000beda..0e256d9e2da3d33fd855422cc5604f25cbe9be47 100644 --- a/solon-projects/solon-net_old/solon.net/pom.xml +++ b/solon-projects/solon-net_old/solon.net/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-rx/solon-data-rx-sqlutils/pom.xml b/solon-projects/solon-rx/solon-data-rx-sqlutils/pom.xml index 06d93e1cd492baf40a6335cd37f65960577ab4bd..5ba6d7bf2f50d5b0e21533d9d273a740e6f0eb5b 100644 --- a/solon-projects/solon-rx/solon-data-rx-sqlutils/pom.xml +++ b/solon-projects/solon-rx/solon-data-rx-sqlutils/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-rx/solon-rx/pom.xml b/solon-projects/solon-rx/solon-rx/pom.xml index 94e87f460ce0b729320cb7703eb709b0b7048f0d..85362f39f2323c8c7d35f9b66ba8c5a8fdf86679 100644 --- a/solon-projects/solon-rx/solon-rx/pom.xml +++ b/solon-projects/solon-rx/solon-rx/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-rx/solon-web-rx/pom.xml b/solon-projects/solon-rx/solon-web-rx/pom.xml index bc9f9cb376e178205fab5ae219961e5ceed984cd..646a592f2a5d846ced798b247dc77772d3013cd2 100644 --- a/solon-projects/solon-rx/solon-web-rx/pom.xml +++ b/solon-projects/solon-rx/solon-web-rx/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 471b82256e0e7c6bbfc86322e50681f206256748..bbe0b94c8bcaefe0808e04737eb9924b32d9f15d 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 a56273c888da3fb4ed1d6154a08135b3fca8c303..87992e0d820657df2e796b1cd1132903aa99536b 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 4f83e99116ef17b327f3531b2a4999f2a82729b5..ccf6b5b7ef10781731b0aeb32728abc397a65598 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-scheduling_old/solon.scheduling.quartz/pom.xml b/solon-projects/solon-scheduling_old/solon.scheduling.quartz/pom.xml index dcbf0b20630d5b78501f8ede1ee9149cd12354ae..f471e90e1f7cc6903ecad3257f3ea6ac1d99f282 100644 --- a/solon-projects/solon-scheduling_old/solon.scheduling.quartz/pom.xml +++ b/solon-projects/solon-scheduling_old/solon.scheduling.quartz/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-scheduling_old/solon.scheduling.simple/pom.xml b/solon-projects/solon-scheduling_old/solon.scheduling.simple/pom.xml index 8234ab2d9407350827083c385cc5622b230325c0..11dbf2c653152359e476e22ef5da889c73637b91 100644 --- a/solon-projects/solon-scheduling_old/solon.scheduling.simple/pom.xml +++ b/solon-projects/solon-scheduling_old/solon.scheduling.simple/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-scheduling_old/solon.scheduling/pom.xml b/solon-projects/solon-scheduling_old/solon.scheduling/pom.xml index 317e9aad0281320bb53448b3c3357cf8663037e4..3db389b741a4094ad91ea8214dc909e826e69642 100644 --- a/solon-projects/solon-scheduling_old/solon.scheduling/pom.xml +++ b/solon-projects/solon-scheduling_old/solon.scheduling/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-security/solon-security-auth/pom.xml b/solon-projects/solon-security/solon-security-auth/pom.xml index 91fb87930b6d586e8fccabaf7463e9a687ac0f24..b9f44868eea73905787efa4a7f9820721bf73e64 100644 --- a/solon-projects/solon-security/solon-security-auth/pom.xml +++ b/solon-projects/solon-security/solon-security-auth/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-security/solon-security-validation/pom.xml b/solon-projects/solon-security/solon-security-validation/pom.xml index 814df3656575b174bbad37926caf137dcd103073..c0a03099c06828a4056fba6463cfcc894575d053 100644 --- a/solon-projects/solon-security/solon-security-validation/pom.xml +++ b/solon-projects/solon-security/solon-security-validation/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-security/solon-security-vault/pom.xml b/solon-projects/solon-security/solon-security-vault/pom.xml index 7cc03d35d0ca77df68101e0b690ad29ad88d6217..2a5a36b6496d1f27abf461b76d6f2e8834ab2170 100644 --- a/solon-projects/solon-security/solon-security-vault/pom.xml +++ b/solon-projects/solon-security/solon-security-vault/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-security/solon-security-web/pom.xml b/solon-projects/solon-security/solon-security-web/pom.xml index 40836834a24c6fd2a129dfcbf12261acee4e852b..f988c66e4099e214d213378ebda621746c243ea5 100644 --- a/solon-projects/solon-security/solon-security-web/pom.xml +++ b/solon-projects/solon-security/solon-security-web/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-security_old/solon.auth/pom.xml b/solon-projects/solon-security_old/solon.auth/pom.xml index 39ec5fa3dca77257dfa53a14527463540663ca99..1c6928339359615dd4e02b3d6b8f05e147347c27 100644 --- a/solon-projects/solon-security_old/solon.auth/pom.xml +++ b/solon-projects/solon-security_old/solon.auth/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-security_old/solon.security.auth/pom.xml b/solon-projects/solon-security_old/solon.security.auth/pom.xml index 2bae372e5c9b4bb422d5763ebe0960bf844b5e05..69d22b20f6950dc116a2d546a3c4abc12b5a1a4a 100644 --- a/solon-projects/solon-security_old/solon.security.auth/pom.xml +++ b/solon-projects/solon-security_old/solon.security.auth/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-security_old/solon.security.validation/pom.xml b/solon-projects/solon-security_old/solon.security.validation/pom.xml index 800fa03027767b352c93ab1e16a4afe0d7b63d2e..d53ca8989c8382ffbcfd1f616c381b6236f0e6f2 100644 --- a/solon-projects/solon-security_old/solon.security.validation/pom.xml +++ b/solon-projects/solon-security_old/solon.security.validation/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-security_old/solon.security.vault/pom.xml b/solon-projects/solon-security_old/solon.security.vault/pom.xml index b252e28518e2fc01b38c13126b347327a0a75ac7..6790fe9f0e762c1ac39f7dd350a2a5ca3985d0f9 100644 --- a/solon-projects/solon-security_old/solon.security.vault/pom.xml +++ b/solon-projects/solon-security_old/solon.security.vault/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-security_old/solon.validation/pom.xml b/solon-projects/solon-security_old/solon.validation/pom.xml index b1e0184d63454e1d8d3d8227681aa4090c6c55a9..a1f307fbb94385fb5f74195db1ba6f34f1286199 100644 --- a/solon-projects/solon-security_old/solon.validation/pom.xml +++ b/solon-projects/solon-security_old/solon.validation/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-security_old/solon.vault/pom.xml b/solon-projects/solon-security_old/solon.vault/pom.xml index b5594303d4f938af138ebfdcf26db5dffd028423..2eaece97843c5ec5e7cdd872b2db441996605c91 100644 --- a/solon-projects/solon-security_old/solon.vault/pom.xml +++ b/solon-projects/solon-security_old/solon.vault/pom.xml @@ -6,7 +6,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization/solon-serialization-abc/pom.xml b/solon-projects/solon-serialization/solon-serialization-abc/pom.xml index 7cd96ced5137ae942d29ea81920fac35e1aeb77f..d44e4fac600ea74740fc865300b29720a5b8cb4a 100644 --- a/solon-projects/solon-serialization/solon-serialization-abc/pom.xml +++ b/solon-projects/solon-serialization/solon-serialization-abc/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization/solon-serialization-fastjson/pom.xml b/solon-projects/solon-serialization/solon-serialization-fastjson/pom.xml index 3bdf02faa7186990b015b7ff4d50ec22c2031e5f..5f7c9e1a83d144f3db03c4e7919f3adaea9733b3 100644 --- a/solon-projects/solon-serialization/solon-serialization-fastjson/pom.xml +++ b/solon-projects/solon-serialization/solon-serialization-fastjson/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization/solon-serialization-fastjson2/pom.xml b/solon-projects/solon-serialization/solon-serialization-fastjson2/pom.xml index 9b9f4a460bdf84fe5ef873730d13f2a1f8b129b3..27643033e5d10d960513e6f9bbf6aeae6f18e243 100644 --- a/solon-projects/solon-serialization/solon-serialization-fastjson2/pom.xml +++ b/solon-projects/solon-serialization/solon-serialization-fastjson2/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization/solon-serialization-fury/pom.xml b/solon-projects/solon-serialization/solon-serialization-fury/pom.xml index efefa304a2a902caab94ce5cdcdd6713359dbcd6..8d21b62d6e208756e6bc19db2b7aca5a20ed9691 100644 --- a/solon-projects/solon-serialization/solon-serialization-fury/pom.xml +++ b/solon-projects/solon-serialization/solon-serialization-fury/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization/solon-serialization-gson/pom.xml b/solon-projects/solon-serialization/solon-serialization-gson/pom.xml index 94fa977de35da3eb0eefdf9311884173e69ce9bf..2fe4ab87cb24898614b8258c3baf6a367cc8deab 100644 --- a/solon-projects/solon-serialization/solon-serialization-gson/pom.xml +++ b/solon-projects/solon-serialization/solon-serialization-gson/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization/solon-serialization-hessian/pom.xml b/solon-projects/solon-serialization/solon-serialization-hessian/pom.xml index 7aef5d5b16aec051ebeb1cc39d078878f2c7ece7..8063c5f2bf4cd2fe80196b37696469cb487dee49 100644 --- a/solon-projects/solon-serialization/solon-serialization-hessian/pom.xml +++ b/solon-projects/solon-serialization/solon-serialization-hessian/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization/solon-serialization-jackson-xml/pom.xml b/solon-projects/solon-serialization/solon-serialization-jackson-xml/pom.xml index 898ad99a27f965a6989dd5109d695ed6ff8eef56..e3c959b7f221898d478b5d308c96d2eb32120aac 100644 --- a/solon-projects/solon-serialization/solon-serialization-jackson-xml/pom.xml +++ b/solon-projects/solon-serialization/solon-serialization-jackson-xml/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization/solon-serialization-jackson/pom.xml b/solon-projects/solon-serialization/solon-serialization-jackson/pom.xml index 9930c1415bcfceb5a1678349ea4284d200e949a6..64a0647c45e8a0da277e35b5544a29c81e6b5cf9 100644 --- a/solon-projects/solon-serialization/solon-serialization-jackson/pom.xml +++ b/solon-projects/solon-serialization/solon-serialization-jackson/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization/solon-serialization-kryo/pom.xml b/solon-projects/solon-serialization/solon-serialization-kryo/pom.xml index 57a6912fd397d50ebe6ec6346900db729a0b6ea2..dc5e2cc859de4ea1006c0ccf1cafef66f5e4dc8b 100644 --- a/solon-projects/solon-serialization/solon-serialization-kryo/pom.xml +++ b/solon-projects/solon-serialization/solon-serialization-kryo/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization/solon-serialization-properties/pom.xml b/solon-projects/solon-serialization/solon-serialization-properties/pom.xml index d5e6b0ae51ca8af65bfb756664099840e4f4381b..d69ecc373ac6e9d9d2947a01b3e22f058684e833 100644 --- a/solon-projects/solon-serialization/solon-serialization-properties/pom.xml +++ b/solon-projects/solon-serialization/solon-serialization-properties/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization/solon-serialization-protostuff/pom.xml b/solon-projects/solon-serialization/solon-serialization-protostuff/pom.xml index dda6fb1657b92be83f643d47eaed4e2356a2e411..ddec81b69da623b8d012165d7e73a9a995c433c0 100644 --- a/solon-projects/solon-serialization/solon-serialization-protostuff/pom.xml +++ b/solon-projects/solon-serialization/solon-serialization-protostuff/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization/solon-serialization-snack3/pom.xml b/solon-projects/solon-serialization/solon-serialization-snack3/pom.xml index 63ce93b57de3098db33ae6f1b42987d1de2a742f..2897c988987ea43f134e1766d223450986e22509 100644 --- a/solon-projects/solon-serialization/solon-serialization-snack3/pom.xml +++ b/solon-projects/solon-serialization/solon-serialization-snack3/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization/solon-serialization/pom.xml b/solon-projects/solon-serialization/solon-serialization/pom.xml index 436ed7ad58bb11fa1ff0b915e905617f4015dedd..0292dfc7f578997d053e176fd874859ee13a0b79 100644 --- a/solon-projects/solon-serialization/solon-serialization/pom.xml +++ b/solon-projects/solon-serialization/solon-serialization/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization_old/solon.serialization.fastjson/pom.xml b/solon-projects/solon-serialization_old/solon.serialization.fastjson/pom.xml index ded806eebf75e2ac0ae9d559ba059f815da8199a..af2d14a4def802a5eaf331782ff923cf73b3d1ad 100644 --- a/solon-projects/solon-serialization_old/solon.serialization.fastjson/pom.xml +++ b/solon-projects/solon-serialization_old/solon.serialization.fastjson/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization_old/solon.serialization.fastjson2/pom.xml b/solon-projects/solon-serialization_old/solon.serialization.fastjson2/pom.xml index 8cb830af90d38f463d8889a95c2cd598c3017c22..5665a25675c1689fba3e35b6ffe01b25a6eb1f0e 100644 --- a/solon-projects/solon-serialization_old/solon.serialization.fastjson2/pom.xml +++ b/solon-projects/solon-serialization_old/solon.serialization.fastjson2/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization_old/solon.serialization.fury/pom.xml b/solon-projects/solon-serialization_old/solon.serialization.fury/pom.xml index 9380f6be2ff8f87c6eef096d8f4684e83ce98933..d1877777614dbea421c42cd22341154903b25350 100644 --- a/solon-projects/solon-serialization_old/solon.serialization.fury/pom.xml +++ b/solon-projects/solon-serialization_old/solon.serialization.fury/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization_old/solon.serialization.gson/pom.xml b/solon-projects/solon-serialization_old/solon.serialization.gson/pom.xml index 32aba9056ae19531337390af413b2f314a17c96d..474b93525cf90f6ea1f51ec532369cad3784d546 100644 --- a/solon-projects/solon-serialization_old/solon.serialization.gson/pom.xml +++ b/solon-projects/solon-serialization_old/solon.serialization.gson/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization_old/solon.serialization.hessian/pom.xml b/solon-projects/solon-serialization_old/solon.serialization.hessian/pom.xml index 09131891c0aa086cf71ba0b903f5feae7e8f4128..d10904c698794b9705644152c3f7e486e110f3d8 100644 --- a/solon-projects/solon-serialization_old/solon.serialization.hessian/pom.xml +++ b/solon-projects/solon-serialization_old/solon.serialization.hessian/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization_old/solon.serialization.jackson.xml/pom.xml b/solon-projects/solon-serialization_old/solon.serialization.jackson.xml/pom.xml index a6169502309f1719e392acf52ba673c8b0bab580..f8a928abb79d541e976c868a4d06b4a357f42a5c 100644 --- a/solon-projects/solon-serialization_old/solon.serialization.jackson.xml/pom.xml +++ b/solon-projects/solon-serialization_old/solon.serialization.jackson.xml/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization_old/solon.serialization.jackson/pom.xml b/solon-projects/solon-serialization_old/solon.serialization.jackson/pom.xml index 4d04d9f101e36e86a9fa0eafbb200569c6c0cc6f..ca7ab148f0dd8d7c7c3035d3afc750298a47ecf0 100644 --- a/solon-projects/solon-serialization_old/solon.serialization.jackson/pom.xml +++ b/solon-projects/solon-serialization_old/solon.serialization.jackson/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization_old/solon.serialization.properties/pom.xml b/solon-projects/solon-serialization_old/solon.serialization.properties/pom.xml index 2c0e7c42fa9dff78ac5a39bd442f291270363b1a..df020de1b8c86bb1c7e49aac78360787560828b6 100644 --- a/solon-projects/solon-serialization_old/solon.serialization.properties/pom.xml +++ b/solon-projects/solon-serialization_old/solon.serialization.properties/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization_old/solon.serialization.protostuff/pom.xml b/solon-projects/solon-serialization_old/solon.serialization.protostuff/pom.xml index 693df413f0b6750d97284ceccaf416c68abebe24..6f8d5558c73d9ecb25764a8c5386f05e5c85e157 100644 --- a/solon-projects/solon-serialization_old/solon.serialization.protostuff/pom.xml +++ b/solon-projects/solon-serialization_old/solon.serialization.protostuff/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization_old/solon.serialization.snack3/pom.xml b/solon-projects/solon-serialization_old/solon.serialization.snack3/pom.xml index 580c0e03906d8bc7a395c6214cfb7dacdf0ab35a..af559144f2d47d0b40e2d65bb7fe2643fb8ea75e 100644 --- a/solon-projects/solon-serialization_old/solon.serialization.snack3/pom.xml +++ b/solon-projects/solon-serialization_old/solon.serialization.snack3/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-serialization_old/solon.serialization/pom.xml b/solon-projects/solon-serialization_old/solon.serialization/pom.xml index 2668cf15fd1fbcd6395fc74c99f27df22ea5f1bf..2f853642e1a4da308d386155d6ee20cdbb4c6551 100644 --- a/solon-projects/solon-serialization_old/solon.serialization/pom.xml +++ b/solon-projects/solon-serialization_old/solon.serialization/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 48346eb42f0caa3961d588f756ac2709ca7f88e0..cad69f67123e3fb5d7cf7d21a6891227a83ee021 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 ab45b46af80668f91127a4a3010bb5b027ef01f9..df18068429f36ddf60e7c3cdc08b49c5111da0a8 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 cce046f9e809189ab747791199a4fdfd6236e7f6..4e55ea85826bfa887f48af15063a17d72755db90 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-tool/solon-configuration-processor/pom.xml b/solon-projects/solon-tool/solon-configuration-processor/pom.xml index 9d300e8217661a99995c38755b6de30b0ccd7f33..0f7887460ab382c285811e500ceba554aacf9876 100644 --- a/solon-projects/solon-tool/solon-configuration-processor/pom.xml +++ b/solon-projects/solon-tool/solon-configuration-processor/pom.xml @@ -4,7 +4,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 a8bc07db3643eb8563c88e109ae4762d0763ae3b..005c7722d58930cdc7686b2ea5736132446bcf36 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-view/solon-view-beetl/pom.xml b/solon-projects/solon-view/solon-view-beetl/pom.xml index 3bb7930ee21decebb311c87021eba92a6a6bf4c2..3780450df8ce81014439da80150be9087b1a0eb6 100644 --- a/solon-projects/solon-view/solon-view-beetl/pom.xml +++ b/solon-projects/solon-view/solon-view-beetl/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-view/solon-view-enjoy/pom.xml b/solon-projects/solon-view/solon-view-enjoy/pom.xml index 421bf046cf6a3d824444bf9b6ae00516c0356712..19e7ecf24cf1d7b9e1aeb379f02031b6a86cb585 100644 --- a/solon-projects/solon-view/solon-view-enjoy/pom.xml +++ b/solon-projects/solon-view/solon-view-enjoy/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-view/solon-view-freemarker/pom.xml b/solon-projects/solon-view/solon-view-freemarker/pom.xml index 2a6d4807282c6d8816d0bf9c6e9cbb0a2cf10126..e59dfd1464d822d8078108e73b44c923e3cdf7a0 100644 --- a/solon-projects/solon-view/solon-view-freemarker/pom.xml +++ b/solon-projects/solon-view/solon-view-freemarker/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-view/solon-view-jsp-jakarta/pom.xml b/solon-projects/solon-view/solon-view-jsp-jakarta/pom.xml index 64b88a90d8913c7800442bd1c73a012410e8b225..c2e083b141bdca1aba148594006fa01c32141318 100644 --- a/solon-projects/solon-view/solon-view-jsp-jakarta/pom.xml +++ b/solon-projects/solon-view/solon-view-jsp-jakarta/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-view/solon-view-jsp/pom.xml b/solon-projects/solon-view/solon-view-jsp/pom.xml index c6ef08c697751825e43609d201e324ba850ddb7d..3eace8ae7eb37b5538646f86d5b92f6fc8da89d1 100644 --- a/solon-projects/solon-view/solon-view-jsp/pom.xml +++ b/solon-projects/solon-view/solon-view-jsp/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-view/solon-view-thymeleaf/pom.xml b/solon-projects/solon-view/solon-view-thymeleaf/pom.xml index ca4a719adcea0218d88da2faa993906ad1624b41..43d5625e8160f76f24e5aae3ad73972633532c03 100644 --- a/solon-projects/solon-view/solon-view-thymeleaf/pom.xml +++ b/solon-projects/solon-view/solon-view-thymeleaf/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-view/solon-view-velocity/pom.xml b/solon-projects/solon-view/solon-view-velocity/pom.xml index 48b4e9590deaa18fd9e722be025084edb5ec7056..6cdcd59211536df20f5b2b838210f792072b9b01 100644 --- a/solon-projects/solon-view/solon-view-velocity/pom.xml +++ b/solon-projects/solon-view/solon-view-velocity/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-view/solon-view/pom.xml b/solon-projects/solon-view/solon-view/pom.xml index 661515736b0bad84582eabb5ab6d0fa6ff692467..d4436d9ac92886023c8907bfcea87d6a477c074d 100644 --- a/solon-projects/solon-view/solon-view/pom.xml +++ b/solon-projects/solon-view/solon-view/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-view_old/solon.view.beetl/pom.xml b/solon-projects/solon-view_old/solon.view.beetl/pom.xml index fc9190d51ede36f611bbe72a2fd491a858cbf39f..244e9e4bc94109dd841abc34cee89f0701844fb0 100644 --- a/solon-projects/solon-view_old/solon.view.beetl/pom.xml +++ b/solon-projects/solon-view_old/solon.view.beetl/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-view_old/solon.view.enjoy/pom.xml b/solon-projects/solon-view_old/solon.view.enjoy/pom.xml index e7c22e78591ee61a99df3dddb8f94b77c2f71e03..717520489def8a8c10f90be7eab9a19e33cb78d6 100644 --- a/solon-projects/solon-view_old/solon.view.enjoy/pom.xml +++ b/solon-projects/solon-view_old/solon.view.enjoy/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-view_old/solon.view.freemarker/pom.xml b/solon-projects/solon-view_old/solon.view.freemarker/pom.xml index cef311000f335c2a23c9cf2e24eebfe33add6020..02105b4f0beee176a8ddd16bb5bf051c76012e6f 100644 --- a/solon-projects/solon-view_old/solon.view.freemarker/pom.xml +++ b/solon-projects/solon-view_old/solon.view.freemarker/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-view_old/solon.view.jsp/pom.xml b/solon-projects/solon-view_old/solon.view.jsp/pom.xml index f27c1ec087367e8fb42de1e1830dadeb0b525862..9ae60f1150290ac25d7fa8cb1e448060d467163c 100644 --- a/solon-projects/solon-view_old/solon.view.jsp/pom.xml +++ b/solon-projects/solon-view_old/solon.view.jsp/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-view_old/solon.view.thymeleaf/pom.xml b/solon-projects/solon-view_old/solon.view.thymeleaf/pom.xml index 82d385e5010a1964e92cc8395b32b892017a1e18..a294abc471308e492f8911946c4863b368bf6fbd 100644 --- a/solon-projects/solon-view_old/solon.view.thymeleaf/pom.xml +++ b/solon-projects/solon-view_old/solon.view.thymeleaf/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-view_old/solon.view.velocity/pom.xml b/solon-projects/solon-view_old/solon.view.velocity/pom.xml index 1c4af143f68497d3954fdf699904aeaafea12f06..295c23640e11f5a7c8054d3e2c6b5ec461792bed 100644 --- a/solon-projects/solon-view_old/solon.view.velocity/pom.xml +++ b/solon-projects/solon-view_old/solon.view.velocity/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-view_old/solon.view/pom.xml b/solon-projects/solon-view_old/solon.view/pom.xml index 1caa7af677e74c9df4d39b9126ac379b86b184a4..1b5876f73847ac954f7fe9c976443f6fe71b699a 100644 --- a/solon-projects/solon-view_old/solon.view/pom.xml +++ b/solon-projects/solon-view_old/solon.view/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 d3293105032006f22f63ecebf948c67005a23878..59f93357ef4da05a6d1692d090f9d9522574a493 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 c6042c257d33d9270faf571496cb976e494aedc9..6d8e0857c7d10fbf43aaea009bd5680984b25ef8 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 3ae18cf777f83b1b6ae96cfadac94fbd23115100..735c469041c1289b5b6ce9ad868ddf4936f10ef8 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 96ca48879036fad00b3e061f307ebf498be6348e..7aa98fe5b867fe3dc76e5bcd08aa96e14d883491 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 a4febbbfc738ffdefb31ff22cefa8d32dfa34d09..a924342157ac07c40114b9fc7c247bd66498bbc0 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 8e57634890dd6d80dd328dd0200a45bbb3c112a4..59c963ef0052c32c80644d5036d19b72b952f514 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 c3c1732c77b2bce14987f16afba0ce6b802917e7..0d5b5cb58d495c9a5eef18e77c71fb30de6de8b3 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 4d078bb6d513849e17a9c58323f9a44b9e12bcc4..85d9f750aaeddce65fb28e5bdcc65905b7befffe 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 462aca40905fb1bbf54cd7cd61fa8ecee6a4068c..db2b1dc320b4b7d9593cbc890f2ed6d16af4bf2b 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 48440d787ab214d89db80794641a4deed694305c..550903f22ed6adb72995ca4c14c797cd4bd57b81 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 478526783fc42617e9a575c34db8073ac4141c28..16d29a20cae8cecced2ce92cfd9d14cafea836f4 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web/solon-web-vertx/pom.xml b/solon-projects/solon-web/solon-web-vertx/pom.xml index 87e521e6f7b10ddbb15785fbab2b53ccd433f27b..699cb3085104ce426b891aacee3d741f6d8a9e31 100644 --- a/solon-projects/solon-web/solon-web-vertx/pom.xml +++ b/solon-projects/solon-web/solon-web-vertx/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../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 f1d4d0d96a96a60ddf0eed267e1a2166f9d42f78..2aac7d1712f5059be3b9f18fdacc2f81e29b7897 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 - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web/solon-web-webservices/pom.xml b/solon-projects/solon-web/solon-web-webservices/pom.xml index f4a378d30879781789c79fb012c3c7a1e6ed76ce..48528cd6092803dff646aa2b78b3df89e1f3fe29 100644 --- a/solon-projects/solon-web/solon-web-webservices/pom.xml +++ b/solon-projects/solon-web/solon-web-webservices/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web_old/solon.sessionstate.jedis/pom.xml b/solon-projects/solon-web_old/solon.sessionstate.jedis/pom.xml index be1e5ecf3516cce411acdf467294c5ec3494091b..6856a5d4424aeae6defba4337f0c7af270226912 100644 --- a/solon-projects/solon-web_old/solon.sessionstate.jedis/pom.xml +++ b/solon-projects/solon-web_old/solon.sessionstate.jedis/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web_old/solon.sessionstate.jwt/pom.xml b/solon-projects/solon-web_old/solon.sessionstate.jwt/pom.xml index bd4e978341373b622fca02ddef4f2a011d1440e2..269fd57da8fe4a233ee1a910daf53dc82e89bd23 100644 --- a/solon-projects/solon-web_old/solon.sessionstate.jwt/pom.xml +++ b/solon-projects/solon-web_old/solon.sessionstate.jwt/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web_old/solon.sessionstate.local/pom.xml b/solon-projects/solon-web_old/solon.sessionstate.local/pom.xml index debe7dea214d5380504b0d699ea64afe000c81e8..01f46418dfd48e1718e1e55f7f378be3555d18a0 100644 --- a/solon-projects/solon-web_old/solon.sessionstate.local/pom.xml +++ b/solon-projects/solon-web_old/solon.sessionstate.local/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web_old/solon.sessionstate.redisson/pom.xml b/solon-projects/solon-web_old/solon.sessionstate.redisson/pom.xml index 69c10b48a71e68166bedaf1915754f1e68667726..58d83e2f03535a70c689415c1ea2cf6ffb0d2645 100644 --- a/solon-projects/solon-web_old/solon.sessionstate.redisson/pom.xml +++ b/solon-projects/solon-web_old/solon.sessionstate.redisson/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web_old/solon.web.cors/pom.xml b/solon-projects/solon-web_old/solon.web.cors/pom.xml index 9f912f8070dac847a12e2e7a6db915e8c957e205..850e0ba37f53bf70269db06de33728dd5a98c2c5 100644 --- a/solon-projects/solon-web_old/solon.web.cors/pom.xml +++ b/solon-projects/solon-web_old/solon.web.cors/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web_old/solon.web.rx/pom.xml b/solon-projects/solon-web_old/solon.web.rx/pom.xml index da1800b177e066a71261af5397b4471c5975d0b9..7f290546191024aafc28f9cf74c39b8ca72e21d1 100644 --- a/solon-projects/solon-web_old/solon.web.rx/pom.xml +++ b/solon-projects/solon-web_old/solon.web.rx/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web_old/solon.web.sdl/pom.xml b/solon-projects/solon-web_old/solon.web.sdl/pom.xml index 1285ce309a5fea8634b6b76a54db5d55f4a6b0c3..cad7fe3fb5b1118fdc620423ccdf598e21b1af1e 100644 --- a/solon-projects/solon-web_old/solon.web.sdl/pom.xml +++ b/solon-projects/solon-web_old/solon.web.sdl/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web_old/solon.web.servlet.jakarta/pom.xml b/solon-projects/solon-web_old/solon.web.servlet.jakarta/pom.xml index 2e80ca220b476779e252ca63d5bd2bbf61fc5140..ed1e4dcf24f0e3966af4135f3e6c74ee2f5ec427 100644 --- a/solon-projects/solon-web_old/solon.web.servlet.jakarta/pom.xml +++ b/solon-projects/solon-web_old/solon.web.servlet.jakarta/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web_old/solon.web.servlet/pom.xml b/solon-projects/solon-web_old/solon.web.servlet/pom.xml index 239de344d15fd0556c69755924c8d134f0bd924d..1f941dacb5d48de3e083c9a9c5c3648419a26976 100644 --- a/solon-projects/solon-web_old/solon.web.servlet/pom.xml +++ b/solon-projects/solon-web_old/solon.web.servlet/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web_old/solon.web.sse/pom.xml b/solon-projects/solon-web_old/solon.web.sse/pom.xml index aab36df3d286c37be960f91e80886320b74a99af..815aaca4849ef0c67d7ea0ed9786ed657e23bab8 100644 --- a/solon-projects/solon-web_old/solon.web.sse/pom.xml +++ b/solon-projects/solon-web_old/solon.web.sse/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web_old/solon.web.staticfiles/pom.xml b/solon-projects/solon-web_old/solon.web.staticfiles/pom.xml index 491e12d68ae7b43ede901580981654079247f973..0182dad3038f13b9d9067460797e60145418298e 100644 --- a/solon-projects/solon-web_old/solon.web.staticfiles/pom.xml +++ b/solon-projects/solon-web_old/solon.web.staticfiles/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-projects/solon-web_old/solon.web.stop/pom.xml b/solon-projects/solon-web_old/solon.web.stop/pom.xml index afb20dd0e23813240378477691379ca667373879..421b5b912f71f801fad4549d3b479ab14a6ec860 100644 --- a/solon-projects/solon-web_old/solon.web.stop/pom.xml +++ b/solon-projects/solon-web_old/solon.web.stop/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../../solon-parent/pom.xml diff --git a/solon-shortcuts/solon-lib/pom.xml b/solon-shortcuts/solon-lib/pom.xml index 86cfb64660a8102c93766d853c8b4b8332217508..3cfa0e41a7e3f0bb79e77f049a526b9ffd2c3038 100644 --- a/solon-shortcuts/solon-lib/pom.xml +++ b/solon-shortcuts/solon-lib/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../solon-parent/pom.xml diff --git a/solon-shortcuts/solon-web/pom.xml b/solon-shortcuts/solon-web/pom.xml index aea2394d0051621ebc230cba392ff2c9b67310ca..aa1a9ad8c09572f87e75bb2b4ec081d2f505aa5f 100644 --- a/solon-shortcuts/solon-web/pom.xml +++ b/solon-shortcuts/solon-web/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../../solon-parent/pom.xml diff --git a/solon/pom.xml b/solon/pom.xml index 5b71b8ac5abe5ed0e6a38e5173cf70686eeac40a..0b5be609ad87ffefacb6c1e89217e37cc5a5ffbe 100644 --- a/solon/pom.xml +++ b/solon/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 3.3.1 + 3.3.2-SNAPSHOT ../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 a471bd1cf10249f75b2a84699ca217f8ea3fa6ca..e5a5c919ef7d84389b132317e6ed452adc6503e9 100644 --- a/solon/src/main/java/org/noear/solon/Solon.java +++ b/solon/src/main/java/org/noear/solon/Solon.java @@ -54,7 +54,7 @@ public class Solon { * 框架版本号 */ public static String version() { - return "3.3.1"; + return "3.3.2-SNAPSHOT"; } /** diff --git a/solon/src/main/java/org/noear/solon/core/exception/StatusException.java b/solon/src/main/java/org/noear/solon/core/exception/StatusException.java index bf0627ee38badd40f36795c184b99c76ea42a83f..390f8f57e86d1f8043c568ddc966cd9ea708c035 100644 --- a/solon/src/main/java/org/noear/solon/core/exception/StatusException.java +++ b/solon/src/main/java/org/noear/solon/core/exception/StatusException.java @@ -24,11 +24,54 @@ import org.noear.solon.exception.SolonException; * @since 2.4 */ public class StatusException extends SolonException { + public static final int CODE_CONTINUE = 100; + public static final int CODE_SWITCHING_PROTOCOLS = 101; + public static final int CODE_OK = 200; + public static final int CODE_CREATED = 201; + public static final int CODE_ACCEPTED = 202; + public static final int CODE_NON_AUTHORITATIVE_INFORMATION = 203; + public static final int CODE_NO_CONTENT = 204; + public static final int CODE_RESET_CONTENT = 205; + public static final int CODE_PARTIAL_CONTENT = 206; + public static final int CODE_MULTIPLE_CHOICES = 300; + public static final int CODE_MOVED_PERMANENTLY = 301; + public static final int CODE_MOVED_TEMPORARILY = 302; + public static final int CODE_FOUND = 302; + public static final int CODE_SEE_OTHER = 303; + public static final int CODE_NOT_MODIFIED = 304; + public static final int CODE_USE_PROXY = 305; + public static final int CODE_TEMPORARY_REDIRECT = 307; + public static final int CODE_BAD_REQUEST = 400; + public static final int CODE_UNAUTHORIZED = 401; + public static final int CODE_PAYMENT_REQUIRED = 402; + public static final int CODE_FORBIDDEN = 403; + public static final int CODE_NOT_FOUND = 404; + public static final int CODE_METHOD_NOT_ALLOWED = 405; + public static final int CODE_NOT_ACCEPTABLE = 406; + public static final int CODE_PROXY_AUTHENTICATION_REQUIRED = 407; + public static final int CODE_REQUEST_TIMEOUT = 408; + public static final int CODE_CONFLICT = 409; + public static final int CODE_GONE = 410; + public static final int CODE_LENGTH_REQUIRED = 411; + public static final int CODE_PRECONDITION_FAILED = 412; + public static final int CODE_REQUEST_ENTITY_TOO_LARGE = 413; + public static final int CODE_REQUEST_URI_TOO_LONG = 414; + public static final int CODE_UNSUPPORTED_MEDIA_TYPE = 415; + public static final int CODE_REQUESTED_RANGE_NOT_SATISFIABLE = 416; + public static final int CODE_EXPECTATION_FAILED = 417; + public static final int CODE_INTERNAL_SERVER_ERROR = 500; + public static final int CODE_NOT_IMPLEMENTED = 501; + public static final int CODE_BAD_GATEWAY = 502; + public static final int CODE_SERVICE_UNAVAILABLE = 503; + public static final int CODE_GATEWAY_TIMEOUT = 504; + public static final int CODE_HTTP_VERSION_NOT_SUPPORTED = 505; + + private int code; /** * 获取状态码 - * */ + */ public int getCode() { return code; } diff --git a/solon/src/main/java/org/noear/solon/core/util/PropUtil.java b/solon/src/main/java/org/noear/solon/core/util/PropUtil.java index 23fd2924e050e7c502a4af92e3528f9d52bfe045..6f595e8bb33d53901a62c744823672342b78d65d 100644 --- a/solon/src/main/java/org/noear/solon/core/util/PropUtil.java +++ b/solon/src/main/java/org/noear/solon/core/util/PropUtil.java @@ -98,10 +98,6 @@ public class PropUtil { if (val == null) { //从"环镜变量"获取 val = System.getenv(name); - if (val == null) { - //如果是环境变量，直接使用默认值；认定后面没得变了 - return nameAndDef[1]; - } } } diff --git a/solon/src/main/java/org/noear/solon/core/util/ResourceUtil.java b/solon/src/main/java/org/noear/solon/core/util/ResourceUtil.java index 35e4ace9897f1e2ae6482e7e369c97a7b2a2f7d8..acb7bc266a87ed769de2b22809cd31e2c5fc121e 100644 --- a/solon/src/main/java/org/noear/solon/core/util/ResourceUtil.java +++ b/solon/src/main/java/org/noear/solon/core/util/ResourceUtil.java @@ -116,7 +116,7 @@ public class ResourceUtil { * @param name 内部资源名称 */ public static URL getResource(String name) { - return getResource(null, name); //Utils.class.getResource(name); + return getResource(null, name); } /** @@ -129,7 +129,7 @@ public class ResourceUtil { if (classLoader == null) { return AppClassLoader.global().getResource(name); } else { - return classLoader.getResource(name); //Utils.class.getResource(name); + return classLoader.getResource(name); } }