Java 18 is GA。Waiting for the JDK 18 support in next-version projectl…

…ombok/lombok#3129
lWoHvYe · Mar 23, 2022 · d87d540 · d87d540
1 parent 731f494
commit d87d540
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 26 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ main ]
+    branches: [ dev_3.x ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ main ]
+    branches: [ dev_3.x ]
   schedule:
     - cron: '18 2 * * 2'
 
@@ -44,7 +44,7 @@ jobs:
       uses: actions/setup-java@v3.0.0
       with:
         # The Java version to set up. Takes a whole or semver Java version. See examples of supported syntax in README file
-        java-version: '17'
+        java-version: '18'
         # Java distribution. See the list of supported distributions in README file
         distribution: 'temurin'
         # The package type (jdk, jre, jdk+fx, jre+fx)

diff --git a/README.md b/README.md
@@ -9,6 +9,8 @@
 
 本项目在原eladmin项目的基础上，进行了部分扩展及尝试，在此表示感谢。
 
+在22年底，Spring系列将对Java 17进行支持，在未来17将取代8成为主流 ，在Spring 6.x 及 Spring Boot 3.x Release之前，将在此分支尝试17之后的版本特性。
+
 ---
 启动类 [AppRun.java](eladmin-starter/src/main/java/com/lwohvye/AppRun.java) 和配置文件 [resources](eladmin-starter/src/main/resources)
 详见 [eladmin-starter](eladmin-starter) 模块。[启停脚本](script)

diff --git a/eladmin-api/pom.xml b/eladmin-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>eladmin</artifactId>
         <groupId>com.lwohvye</groupId>
-        <version>3.0.1</version>
+        <version>3.x</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/eladmin-common/pom.xml b/eladmin-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>eladmin</artifactId>
         <groupId>com.lwohvye</groupId>
-        <version>3.0.1</version>
+        <version>3.x</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/eladmin-generator/pom.xml b/eladmin-generator/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>eladmin</artifactId>
         <groupId>com.lwohvye</groupId>
-        <version>3.0.1</version>
+        <version>3.x</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/eladmin-logging/pom.xml b/eladmin-logging/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>eladmin</artifactId>
         <groupId>com.lwohvye</groupId>
-        <version>3.0.1</version>
+        <version>3.x</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/eladmin-search/pom.xml b/eladmin-search/pom.xml
@@ -30,8 +30,9 @@
     <name>搜索服务-MongoDB</name>
 
     <properties>
-        <java.version>17</java.version>
-        <project.core.version>3.0.1</project.core.version>
+        <java.version>18</java.version>
+        <project.core.version>3.x</project.core.version>
+        <maven.compiler.release>17</maven.compiler.release>
         <mapstruct.version>1.4.2.Final</mapstruct.version>
         <druid.version>1.2.8</druid.version>
     </properties>
@@ -214,8 +215,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
                     <showDeprecation>true</showDeprecation>
                     <showWarnings>true</showWarnings>
                     <!--for lombok annotations to resolve-->

diff --git a/eladmin-starter/pom.xml b/eladmin-starter/pom.xml
@@ -30,8 +30,9 @@
     <name>启动模块-基础</name>
 
     <properties>
-        <java.version>17</java.version>
-        <project.core.version>3.0.1</project.core.version>
+        <java.version>18</java.version>
+        <project.core.version>3.x</project.core.version>
+        <maven.compiler.release>17</maven.compiler.release>
         <mapstruct.version>1.4.2.Final</mapstruct.version>
         <javassist.version>3.28.0-GA</javassist.version>
         <shardingsphere.version>5.0.0</shardingsphere.version>
@@ -228,8 +229,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
                     <showDeprecation>true</showDeprecation>
                     <showWarnings>true</showWarnings>
                     <!--for lombok annotations to resolve-->

diff --git a/eladmin-system/pom.xml b/eladmin-system/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>eladmin</artifactId>
         <groupId>com.lwohvye</groupId>
-        <version>3.0.1</version>
+        <version>3.x</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/eladmin-system/src/main/java/com/lwohvye/modules/rabbitmq/config/RabbitMqConfig.java b/eladmin-system/src/main/java/com/lwohvye/modules/rabbitmq/config/RabbitMqConfig.java
@@ -104,7 +104,7 @@ FanoutExchange simpleFanoutDirect() {
      */
     @Bean
     public Queue dataSyncQueue() {
-        return new Queue(DATA_SYNC_QUEUE);
+        return new Queue(DATA_SYNC_QUEUE); // 这种方式。默认持久化
     }
 
     /**
@@ -113,7 +113,7 @@ public Queue dataSyncQueue() {
     @Bean
     public Queue dataSyncTtlQueue() {
         return QueueBuilder
-                .durable(DATA_SYNC_TTL_QUEUE)
+                .durable(DATA_SYNC_TTL_QUEUE) // 这个durable，就是创建个持久化的
                 .withArgument("x-dead-letter-exchange", DIRECT_SYNC_EXCHANGE)//到期后转发的交换机
                 .withArgument("x-dead-letter-routing-key", DATA_SYNC_ROUTE_KEY)//到期后转发的路由键
                 .build();

diff --git a/eladmin-tools/pom.xml b/eladmin-tools/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>eladmin</artifactId>
         <groupId>com.lwohvye</groupId>
-        <version>3.0.1</version>
+        <version>3.x</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <groupId>com.lwohvye</groupId>
     <artifactId>eladmin</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.1</version>
+    <version>3.x</version>
 
     <name>EL-ADMIN 管理系统</name>
     <url>https://github.com/lWoHvYe/eladmin</url>
@@ -49,7 +49,7 @@
         <connection>scm:git:git://github.com/lWoHvYe/eladmin.git</connection>
         <developerConnection>scm:git:ssh://github.com/lWoHvYe/eladmin.git</developerConnection>
         <url>https://github.com/lWoHvYe/eladmin/tree/main</url>
-        <tag>eladmin-v3.0.1</tag>
+        <tag>eladmin-v3.x</tag>
     </scm>
 
     <modules>
@@ -74,8 +74,17 @@
         <!--    Spring Boot依赖版本配置：https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#dependency-versions.properties    -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>17</java.version>
-        <project.core.version>3.0.1</project.core.version>
+        <!--开发版本-->
+        <java.version>18</java.version>
+        <project.core.version>3.x</project.core.version>
+        <!--支持Java 18-->
+        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
+        <!--https://maven.apache.org/plugins/maven-compiler-plugin/-->
+        <!--<maven.compiler.source>17</maven.compiler.source>-->
+        <!--<maven.compiler.target>17</maven.compiler.target>-->
+        <!--Starting JDK 9, release can be used to do the things what source and target can do
+        https://maven.apache.org/plugins/maven-compiler-plugin/examples/set-compiler-release.html-->
+        <maven.compiler.release>17</maven.compiler.release>
         <log4jdbc.version>1.16</log4jdbc.version>
         <springdoc.openapi.version>1.6.6</springdoc.openapi.version>
         <io.swagger.version>1.6.4</io.swagger.version>
@@ -303,9 +312,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
-                    <!--<release>16</release>-->
                     <!--<fork>true</fork>-->
                     <!--for unmappable characters in classes-->
                     <!-- <encoding>UTF-8</encoding>-->