diff --git a/docs/dev-guide/graalvm/graalvm-compile.md b/docs/dev-guide/graalvm/graalvm-compile.md index 5d7dc7b37..4ab4b6544 100644 --- a/docs/dev-guide/graalvm/graalvm-compile.md +++ b/docs/dev-guide/graalvm/graalvm-compile.md @@ -17,6 +17,13 @@ nop: 在nop-commons, nop-auth-core等模块中,对于用到的第三方库如caffeine,jsonwebtoken等增加了`reflect-config.json`配置 +## 版本兼容性 +Truffle languages and other components version 23.1.2 are designed for use with GraalVM for JDK 21.0.2 + +GraalJS version 24.0.2 is designed for use with Oracle GraalVM for JDK 22.0.2 or GraalVM Community Edition for JDK 22.0.2, + +GraalJS version 23.1.2 is designed for use with Oracle GraalVM for JDK 21.0.2 or GraalVM Community Edition for JDK 21.0.2, + ## Solon框架 ### 1. 在pom文件中引入aot支持,引入solon-logging-logback依赖, diff --git a/nop-all-for-spring/pom.xml b/nop-all-for-spring/pom.xml index cdb51d9b3..66c08fc96 100644 --- a/nop-all-for-spring/pom.xml +++ b/nop-all-for-spring/pom.xml @@ -14,7 +14,7 @@ 11 true 2.0.0-SNAPSHOT - 3.8.2 + 3.14.2 diff --git a/nop-cli/pom.xml b/nop-cli/pom.xml index 29367c5fe..32f4d556d 100644 --- a/nop-cli/pom.xml +++ b/nop-cli/pom.xml @@ -58,7 +58,7 @@ 3.11.0 1.1.0 - 3.8.2 + 3.14.2 3.0.0-M5 3.0.0-M1 diff --git a/nop-demo/nop-quarkus-demo/pom.xml b/nop-demo/nop-quarkus-demo/pom.xml index 98413dfc0..f5f1c49ee 100644 --- a/nop-demo/nop-quarkus-demo/pom.xml +++ b/nop-demo/nop-quarkus-demo/pom.xml @@ -57,22 +57,16 @@ - - - - - + + + + + io.github.entropy-cloud nop-js - - - - - org.graalvm.js - js - + @@ -130,10 +124,10 @@ nop-graphql-gateway - - - - + + + + io.github.entropy-cloud @@ -171,7 +165,6 @@ - io.github.entropy-cloud @@ -224,16 +217,16 @@ nop-auth-sso - - - - + + + + - - - - - + + + + + io.github.entropy-cloud diff --git a/nop-demo/pom.xml b/nop-demo/pom.xml index 55cda37cd..849d7c866 100644 --- a/nop-demo/pom.xml +++ b/nop-demo/pom.xml @@ -26,7 +26,7 @@ nop-rpc-client-demo nop-rpc-server-demo nop-spring-report-demo - nop-spring-demo2 + nop-spring-simple-demo nop-spring-demo-no-orm nop-spring-security-demo diff --git a/nop-dependencies/pom.xml b/nop-dependencies/pom.xml index ac59bdcb3..bb19445c7 100644 --- a/nop-dependencies/pom.xml +++ b/nop-dependencies/pom.xml @@ -22,7 +22,7 @@ UTF-8 3.11.0 - 3.8.2 + 3.14.2 3.1.2 @@ -33,7 +33,7 @@ 4.10.1 - + 23.0.1 3.1.12 @@ -46,8 +46,8 @@ 2.3.0 - 3.2.3 - 2023.0.0 + 3.3.3 + 2023.0.3 0.43.1 9.9.2 @@ -361,6 +361,12 @@ 3.5.3 + + + + + + diff --git a/nop-js/pom.xml b/nop-js/pom.xml index e4359dd29..0f232496d 100644 --- a/nop-js/pom.xml +++ b/nop-js/pom.xml @@ -24,9 +24,16 @@ - org.graalvm.js - js - provided + org.graalvm.polyglot + js-community + 23.1.2 + pom + + + + org.graalvm.polyglot + polyglot + 23.1.2 diff --git a/nop-quarkus/nop-quarkus-core-starter/src/main/java/io/nop/quarkus/core/QuarkusIntegration.java b/nop-quarkus/nop-quarkus-core-starter/src/main/java/io/nop/quarkus/core/QuarkusIntegration.java index aa782a01f..f6bedff17 100644 --- a/nop-quarkus/nop-quarkus-core-starter/src/main/java/io/nop/quarkus/core/QuarkusIntegration.java +++ b/nop-quarkus/nop-quarkus-core-starter/src/main/java/io/nop/quarkus/core/QuarkusIntegration.java @@ -15,7 +15,7 @@ import io.nop.commons.metrics.GlobalMeterRegistry; import io.nop.commons.util.StringHelper; import io.nop.quarkus.core.ioc.NopQuarkusBeanContainer; -import io.quarkus.runtime.configuration.ProfileManager; +import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; import java.util.Optional; @@ -24,7 +24,9 @@ public class QuarkusIntegration { public static void start() { - String profile = ProfileManager.getActiveProfile(); + Config config = ConfigProvider.getConfig(); + String profile = config.getValue("quarkus.profile", String.class); + Optional parentProfile = ConfigProvider.getConfig().getOptionalValue(CONFIG_KEY_PROFILE_PARENT, String.class); @@ -32,8 +34,8 @@ public static void start() { System.setProperty(ApiConfigs.CFG_PROFILE.getName(), profile); AppConfig.getConfigProvider().updateConfigValue(ApiConfigs.CFG_PROFILE, profile); - if(profile.equals("dev")){ - AppConfig.getConfigProvider().updateConfigValue(ApiConfigs.CFG_DEBUG,true); + if (profile.equals("dev")) { + AppConfig.getConfigProvider().updateConfigValue(ApiConfigs.CFG_DEBUG, true); } } @@ -43,7 +45,7 @@ public static void start() { } BeanContainer.registerInstance(new NopQuarkusBeanContainer()); - if(BeanContainer.instance().containsBeanType(MeterRegistry.class)) { + if (BeanContainer.instance().containsBeanType(MeterRegistry.class)) { MeterRegistry meterRegistry = BeanContainer.instance().getBeanByType(MeterRegistry.class); GlobalMeterRegistry.registerInstance(meterRegistry); } diff --git a/nop-rpc/nop-rpc-grpc/pom.xml b/nop-rpc/nop-rpc-grpc/pom.xml index 055e3d124..7e1d7f65e 100644 --- a/nop-rpc/nop-rpc-grpc/pom.xml +++ b/nop-rpc/nop-rpc-grpc/pom.xml @@ -37,6 +37,11 @@ grpc-netty + + io.grpc + grpc-core + + io.grpc grpc-protobuf diff --git a/nop-wf/nop-wf-web/pom.xml b/nop-wf/nop-wf-web/pom.xml index 51284ffd7..b952d1033 100644 --- a/nop-wf/nop-wf-web/pom.xml +++ b/nop-wf/nop-wf-web/pom.xml @@ -47,12 +47,6 @@ test - - org.graalvm.js - js - test - - io.github.entropy-cloud nop-autotest-junit @@ -64,7 +58,7 @@ h2 test - + org.junit.jupiter junit-jupiter diff --git a/pom.xml b/pom.xml index f5d32db3f..9e69bf665 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 2.0.0-SNAPSHOT - 3.8.2 + 3.14.2 3.0.0-M5 UTF-8 @@ -448,7 +448,7 @@ nop-netty nop-datav nop-dev - nop-all-for-spring + nop-git nop-oauth