更新quakus和springboot的版本

entropy-cloud · Sep 14, 2024 · 59a904f · 59a904f
1 parent 6013dc9
commit 59a904f
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 50 deletions.
diff --git 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
@@ -14,7 +14,7 @@
         <maven.compiler.compilerVersion>11</maven.compiler.compilerVersion>
         <maven.deploy.skip>true</maven.deploy.skip>
         <nop-entropy.version>2.0.0-SNAPSHOT</nop-entropy.version>
-        <quarkus.platform.version>3.8.2</quarkus.platform.version>
+        <quarkus.platform.version>3.14.2</quarkus.platform.version>
     </properties>
 
     <dependencyManagement>

diff --git a/nop-cli/pom.xml b/nop-cli/pom.xml
@@ -58,7 +58,7 @@
 
         <compiler-plugin.version>3.11.0</compiler-plugin.version>
         <maven-flatten-version>1.1.0</maven-flatten-version>
-        <quarkus.platform.version>3.8.2</quarkus.platform.version>
+        <quarkus.platform.version>3.14.2</quarkus.platform.version>
         <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
 
         <maven-release-plugin.version>3.0.0-M1</maven-release-plugin.version>

diff --git a/nop-demo/nop-quarkus-demo/pom.xml b/nop-demo/nop-quarkus-demo/pom.xml
@@ -57,22 +57,16 @@
         <!--            <artifactId>quarkus-logging-json</artifactId>-->
         <!--        </dependency>-->
 
-<!--        <dependency>-->
-<!--            <artifactId>icu4j</artifactId>-->
-<!--            <groupId>com.ibm.icu</groupId>-->
-<!--            <version>71.1</version>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <artifactId>icu4j</artifactId>-->
+        <!--            <groupId>com.ibm.icu</groupId>-->
+        <!--            <version>71.1</version>-->
+        <!--        </dependency>-->
 
         <dependency>
             <groupId>io.github.entropy-cloud</groupId>
             <artifactId>nop-js</artifactId>
-<!--            <scope>test</scope>-->
-        </dependency>
-
-        <dependency>
-            <groupId>org.graalvm.js</groupId>
-            <artifactId>js</artifactId>
-<!--            <scope>test</scope>-->
+            <!--            <scope>test</scope>-->
         </dependency>
 
         <dependency>
@@ -130,10 +124,10 @@
             <artifactId>nop-graphql-gateway</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>io.github.entropy-cloud</groupId>-->
-<!--            <artifactId>nop-rpc-grpc</artifactId>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>io.github.entropy-cloud</groupId>-->
+        <!--            <artifactId>nop-rpc-grpc</artifactId>-->
+        <!--        </dependency>-->
 
         <dependency>
             <groupId>io.github.entropy-cloud</groupId>
@@ -171,7 +165,6 @@
         </dependency>
 
 
-
         <!-- 引入报表测试文件和测试服务 -->
         <dependency>
             <groupId>io.github.entropy-cloud</groupId>
@@ -224,16 +217,16 @@
             <artifactId>nop-auth-sso</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>io.quarkus</groupId>-->
-<!--            <artifactId>quarkus-redis-client</artifactId>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>io.quarkus</groupId>-->
+        <!--            <artifactId>quarkus-redis-client</artifactId>-->
+        <!--        </dependency>-->
 
-<!--        <dependency>-->
-<!--            <groupId>io.rest-assured</groupId>-->
-<!--            <artifactId>rest-assured</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>io.rest-assured</groupId>-->
+        <!--            <artifactId>rest-assured</artifactId>-->
+        <!--            <scope>test</scope>-->
+        <!--        </dependency>-->
 
         <dependency>
             <groupId>io.github.entropy-cloud</groupId>

diff --git a/nop-demo/pom.xml b/nop-demo/pom.xml
@@ -26,7 +26,7 @@
         <module>nop-rpc-client-demo</module>
         <module>nop-rpc-server-demo</module>
         <module>nop-spring-report-demo</module>
-        <module>nop-spring-demo2</module>
+<!--        <module>nop-spring-demo2</module>-->
         <module>nop-spring-simple-demo</module>
         <module>nop-spring-demo-no-orm</module>
         <module>nop-spring-security-demo</module>

diff --git a/nop-dependencies/pom.xml b/nop-dependencies/pom.xml
@@ -22,7 +22,7 @@
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
 
         <compiler-plugin.version>3.11.0</compiler-plugin.version>
-        <quarkus.platform.version>3.8.2</quarkus.platform.version>
+        <quarkus.platform.version>3.14.2</quarkus.platform.version>
         <surefire-plugin.version>3.1.2</surefire-plugin.version>
 
         <!--        <vertx.version>4.3.1</vertx.version>-->
@@ -33,7 +33,7 @@
 
         <antlr.version>4.10.1</antlr.version>
 
-        <!--        <graalvm.version>21.3.5</graalvm.version>-->
+        <graalvm.version>23.0.1</graalvm.version>
         <!--        <jackson.version>2.10.2</jackson.version>-->
         <janino.version>3.1.12</janino.version>
         <!--        <junit-jupiter.version>5.7.0</junit-jupiter.version>-->
@@ -46,8 +46,8 @@
         <nacos.version>2.3.0</nacos.version>
         <!--        <testcontainers.version>1.16.3</testcontainers.version>-->
 
-        <spring-boot.version>3.2.3</spring-boot.version>
-        <spring-cloud.version>2023.0.0</spring-cloud.version>
+        <spring-boot.version>3.3.3</spring-boot.version>
+        <spring-cloud.version>2023.0.3</spring-cloud.version>
 
         <tablesaw.version>0.43.1</tablesaw.version>
         <lucene.version>9.9.2</lucene.version>
@@ -361,6 +361,12 @@
                 <version>3.5.3</version>
             </dependency>
 
+<!--            <dependency>-->
+<!--                <groupId>org.graalvm.js</groupId>-->
+<!--                <artifactId>js</artifactId>-->
+<!--                <version>${graalvm.version}</version>-->
+<!--            </dependency>-->
+
         </dependencies>
     </dependencyManagement>
 

diff --git a/nop-js/pom.xml b/nop-js/pom.xml
@@ -24,9 +24,16 @@
         </dependency>
 
         <dependency>
-            <groupId>org.graalvm.js</groupId>
-            <artifactId>js</artifactId>
-            <scope>provided</scope>
+            <groupId>org.graalvm.polyglot</groupId>
+            <artifactId>js-community</artifactId>
+            <version>23.1.2</version>
+            <type>pom</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.graalvm.polyglot</groupId>
+            <artifactId>polyglot</artifactId>
+            <version>23.1.2</version>
         </dependency>
 
         <dependency>

diff --git a/...uarkus/nop-quarkus-core-starter/src/main/java/io/nop/quarkus/core/QuarkusIntegration.java b/...uarkus/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,16 +24,18 @@
 
 public class QuarkusIntegration {
     public static void start() {
-        String profile = ProfileManager.getActiveProfile();
+        Config config = ConfigProvider.getConfig();
+        String profile = config.getValue("quarkus.profile", String.class);
+
         Optional<String> parentProfile = ConfigProvider.getConfig().getOptionalValue(CONFIG_KEY_PROFILE_PARENT,
                 String.class);
 
         if (!StringHelper.isEmpty(profile)) {
             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
@@ -37,6 +37,11 @@
             <artifactId>grpc-netty</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-core</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-protobuf</artifactId>

diff --git a/nop-wf/nop-wf-web/pom.xml b/nop-wf/nop-wf-web/pom.xml
@@ -47,12 +47,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.graalvm.js</groupId>
-            <artifactId>js</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>io.github.entropy-cloud</groupId>
             <artifactId>nop-autotest-junit</artifactId>
@@ -64,7 +58,7 @@
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -75,7 +75,7 @@
 
         <nop-entropy.version>2.0.0-SNAPSHOT</nop-entropy.version>
 
-        <quarkus.platform.version>3.8.2</quarkus.platform.version>
+        <quarkus.platform.version>3.14.2</quarkus.platform.version>
 
         <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -448,7 +448,7 @@
         <module>nop-netty</module>
         <module>nop-datav</module>
         <module>nop-dev</module>
-        <module>nop-all-for-spring</module>
+<!--        <module>nop-all-for-spring</module>-->
         <module>nop-git</module>
        <!-- <module>tests</module> -->
         <module>nop-oauth</module>