恢复quarkus版本为3.3.3, 3.4.0以上版本目前aliyun的镜像还没有同步，暂不使用

entropy-cloud · Sep 30, 2023 · c411169 · c411169
1 parent dfd7d82
commit c411169
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 15 deletions.
diff --git a/nop-cli/pom.xml b/nop-cli/pom.xml
@@ -106,7 +106,7 @@
             <groupId>io.github.entropy-cloud</groupId>
             <artifactId>nop-cli-core</artifactId>
             <version>2.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
+            <optional>true</optional>
         </dependency>
 
     </dependencies>

diff --git a/nop-demo/nop-quarkus-demo/pom.xml b/nop-demo/nop-quarkus-demo/pom.xml
@@ -75,6 +75,12 @@
         <dependency>
             <groupId>io.github.entropy-cloud</groupId>
             <artifactId>nop-auth-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>nop-js</artifactId>
+                    <groupId>io.github.entropy-cloud</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

diff --git a/...main/resources/META-INF/native-image/io.nop.demo/nop-quarkus-demo/native-image.properties b/...main/resources/META-INF/native-image/io.nop.demo/nop-quarkus-demo/native-image.properties
@@ -1,7 +1,8 @@
 Args=--enable-http \
 --enable-https \
 --enable-all-security-services \
---verbose \
+--initialize-at-run-time=org.h2.fulltext \
+-H:+AllowDeprecatedBuilderClassesOnImageClasspath \
 -H:EnableURLProtocols=http,https \
 --report-unsupported-elements-at-runtime \
 -H:ReflectionConfigurationResources=${.}/reflect-config.json \

diff --git a/nop-demo/nop-quarkus-demo/src/main/resources/application.yaml b/nop-demo/nop-quarkus-demo/src/main/resources/application.yaml
@@ -31,10 +31,14 @@ nop:
     #    jdbc-url: jdbc:h2:./db/test
     #    username: sa
     #    password:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    jdbc-url: jdbc:mysql://127.0.0.1:3306/dev?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=UTC
-    username: nop
-    password: nop-test
+    #driver-class-name: com.mysql.cj.jdbc.Driver
+    #jdbc-url: jdbc:mysql://127.0.0.1:3306/dev?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=UTC
+    #username: nop
+    #password: nop-test
+    driver-class-name: org.h2.Driver
+    jdbc-url: jdbc:h2:./db/test
+    username: sa
+    password:
 
   gateway:
     http-filter:

diff --git a/nop-demo/nop-quarkus-demo/src/main/resources/nop-vfs-index.txt b/nop-demo/nop-quarkus-demo/src/main/resources/nop-vfs-index.txt
@@ -286,7 +286,6 @@
 /nop/graphql/introspection.graphql
 /nop/http/beans/http-client-jdk.beans.xml
 /nop/integration/beans/oss-defaults.beans.xml
-/nop/js/libs/nop-server-tool.mjs
 /nop/main/app.gateway.xml
 /nop/orm/beans/orm-defaults.beans.xml
 /nop/orm/imp/orm.imp.xml

diff --git a/nop-dependencies/pom.xml b/nop-dependencies/pom.xml
@@ -26,7 +26,7 @@
         <spring-cloud-alibaba.version>2021.0.4.0</spring-cloud-alibaba.version>
 
         <compiler-plugin.version>3.11.0</compiler-plugin.version>
-        <quarkus.platform.version>3.3.2</quarkus.platform.version>
+        <quarkus.platform.version>3.3.3</quarkus.platform.version>
         <surefire-plugin.version>3.1.2</surefire-plugin.version>
 
         <!--        <vertx.version>4.3.1</vertx.version>-->
@@ -46,7 +46,7 @@
 
         <lettuce.version>6.1.4.RELEASE</lettuce.version>
 
-        <h2.version>2.1.210</h2.version>
+<!--        <h2.version>2.1.210</h2.version>-->
         <nacos.version>1.4.4</nacos.version>
         <testcontainers.version>1.16.3</testcontainers.version>
 
@@ -489,11 +489,11 @@
                 <version>${pulsar.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.h2database</groupId>
-                <artifactId>h2</artifactId>
-                <version>${h2.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.h2database</groupId>-->
+<!--                <artifactId>h2</artifactId>-->
+<!--                <version>${h2.version}</version>-->
+<!--            </dependency>-->
 
             <dependency>
                 <groupId>com.oracle.ojdbc</groupId>

diff --git a/pom.xml b/pom.xml
@@ -69,7 +69,7 @@
 
         <nop-entropy.version>2.0.0-SNAPSHOT</nop-entropy.version>
 
-        <quarkus.platform.version>3.3.2</quarkus.platform.version>
+        <quarkus.platform.version>3.3.3</quarkus.platform.version>
 
         <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>