From d87d5401507e3abfbea7e3f424cd4429ddb6487d Mon Sep 17 00:00:00 2001 From: lWoHvYe Date: Wed, 23 Mar 2022 10:28:58 +0800 Subject: [PATCH] =?UTF-8?q?Java=2018=20is=20GA=E3=80=82Waiting=20for=20the?= =?UTF-8?q?=20JDK=2018=20support=20in=20next-version=20=20https://github.c?= =?UTF-8?q?om/projectlombok/lombok/issues/3129?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/codeql-analysis.yml | 6 +++--- README.md | 2 ++ eladmin-api/pom.xml | 2 +- eladmin-common/pom.xml | 2 +- eladmin-generator/pom.xml | 2 +- eladmin-logging/pom.xml | 2 +- eladmin-search/pom.xml | 7 +++---- eladmin-starter/pom.xml | 7 +++---- eladmin-system/pom.xml | 2 +- .../rabbitmq/config/RabbitMqConfig.java | 4 ++-- eladmin-tools/pom.xml | 2 +- pom.xml | 20 ++++++++++++------- 12 files changed, 32 insertions(+), 26 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b9a1b1753..9f12b4aca 100644 --- 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 index 1bdb04b4a..0083477da 100644 --- 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 index 24dc6360b..c13d53de8 100644 --- a/eladmin-api/pom.xml +++ b/eladmin-api/pom.xml @@ -21,7 +21,7 @@ eladmin com.lwohvye - 3.0.1 + 3.x 4.0.0 diff --git a/eladmin-common/pom.xml b/eladmin-common/pom.xml index aff1c9a3c..bd0fd708f 100644 --- a/eladmin-common/pom.xml +++ b/eladmin-common/pom.xml @@ -21,7 +21,7 @@ eladmin com.lwohvye - 3.0.1 + 3.x 4.0.0 diff --git a/eladmin-generator/pom.xml b/eladmin-generator/pom.xml index 17d501abf..f6b9056c0 100644 --- a/eladmin-generator/pom.xml +++ b/eladmin-generator/pom.xml @@ -21,7 +21,7 @@ eladmin com.lwohvye - 3.0.1 + 3.x 4.0.0 diff --git a/eladmin-logging/pom.xml b/eladmin-logging/pom.xml index 70f428ea5..bde2923cb 100644 --- a/eladmin-logging/pom.xml +++ b/eladmin-logging/pom.xml @@ -21,7 +21,7 @@ eladmin com.lwohvye - 3.0.1 + 3.x 4.0.0 diff --git a/eladmin-search/pom.xml b/eladmin-search/pom.xml index 2968b29bf..fe5149dd3 100644 --- a/eladmin-search/pom.xml +++ b/eladmin-search/pom.xml @@ -30,8 +30,9 @@ 搜索服务-MongoDB - 17 - 3.0.1 + 18 + 3.x + 17 1.4.2.Final 1.2.8 @@ -214,8 +215,6 @@ org.apache.maven.plugins maven-compiler-plugin - 17 - 17 true true diff --git a/eladmin-starter/pom.xml b/eladmin-starter/pom.xml index e0ca5df9d..bb6dc34a4 100644 --- a/eladmin-starter/pom.xml +++ b/eladmin-starter/pom.xml @@ -30,8 +30,9 @@ 启动模块-基础 - 17 - 3.0.1 + 18 + 3.x + 17 1.4.2.Final 3.28.0-GA 5.0.0 @@ -228,8 +229,6 @@ org.apache.maven.plugins maven-compiler-plugin - 17 - 17 true true diff --git a/eladmin-system/pom.xml b/eladmin-system/pom.xml index c2ab6b4f2..1e0cbe5cc 100644 --- a/eladmin-system/pom.xml +++ b/eladmin-system/pom.xml @@ -21,7 +21,7 @@ eladmin com.lwohvye - 3.0.1 + 3.x 4.0.0 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 index 6a50a4126..1e5eeaa14 100644 --- 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 index 7b2451b28..459e876dc 100644 --- a/eladmin-tools/pom.xml +++ b/eladmin-tools/pom.xml @@ -21,7 +21,7 @@ eladmin com.lwohvye - 3.0.1 + 3.x 4.0.0 diff --git a/pom.xml b/pom.xml index 26f8cfe28..4307b68fe 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.lwohvye eladmin pom - 3.0.1 + 3.x EL-ADMIN 管理系统 https://github.com/lWoHvYe/eladmin @@ -49,7 +49,7 @@ scm:git:git://github.com/lWoHvYe/eladmin.git scm:git:ssh://github.com/lWoHvYe/eladmin.git https://github.com/lWoHvYe/eladmin/tree/main - eladmin-v3.0.1 + eladmin-v3.x @@ -74,8 +74,17 @@ UTF-8 UTF-8 - 17 - 3.0.1 + + 18 + 3.x + + 3.10.1 + + + + + 17 1.16 1.6.6 1.6.4 @@ -303,9 +312,6 @@ org.apache.maven.plugins maven-compiler-plugin - 17 - 17 -