From c0681cf572b619c1fd3c61ba3879cc04be33961f Mon Sep 17 00:00:00 2001 From: lbw Date: Fri, 26 May 2023 15:55:54 +0800 Subject: [PATCH] :green_heart: Fixing CI Build. remove dependabot.yml --- .github/dependabot.yml | 62 ------------------------------------------ README.md | 28 ++++++------------- 2 files changed, 9 insertions(+), 81 deletions(-) delete mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index c216d4f1..00000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,62 +0,0 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates -# https://docs.github.com/zh/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file - -version: 2 -updates: - - package-ecosystem: "maven" # See documentation for possible values - directory: "/" # Location of package manifests - schedule: - interval: "daily" - # 目标分支 - target-branch: "dev" - # https://docs.github.com/zh/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#ignore - ignore: - - dependency-name: org.springframework.boot:spring-boot-dependencies - # spring-boot 3.0 不支持 JDK 8 - versions: - - ">= 3" - - dependency-name: org.springframework.cloud:spring-cloud-dependencies - # spring-cloud 2022 不支持 JDK 8 - versions: - - ">= 2022" - - dependency-name: com.alibaba.cloud:spring-cloud-alibaba-dependencies - # spring-cloud-alibaba 2022 不支持 JDK 8 - versions: - - ">= 2022" - - dependency-name: com.alibaba.cloud:spring-cloud-alibaba-dependencies - # spring-cloud-alibaba 2021.1 为命名错误 - versions: - - "= 2021.1" - - dependency-name: de.codecentric:spring-boot-admin-dependencies - # spring-boot-admin 3.0 不支持 JDK 8 - versions: - - ">= 3" - - dependency-name: de.codecentric:spring-boot-admin-starter-server - # spring-boot-admin 3.0 不支持 JDK 8 - versions: - - ">= 3" - - dependency-name: io.github.git-commit-id:git-commit-id-maven-plugin - # git-commit-id-maven-plugin 5.0 不支持 JDK 8 - versions: - - ">= 5" - - dependency-name: org.springframework.security:spring-security-oauth2-authorization-server - # spring-security-oauth2-authorization-server 1.0 不支持 JDK 8 - versions: - - ">= 1" - - - package-ecosystem: "maven" - directory: "/" - schedule: - interval: "daily" - # 目标分支 - target-branch: "sca-springboot3" - - - package-ecosystem: "maven" - directory: "/" - schedule: - interval: "daily" - # 目标分支 - target-branch: "sct-springboot3" diff --git a/README.md b/README.md index 8f4cc7af..36b06897 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,6 @@ - 提供对常见容器化支持 Docker、Kubernetes、Rancher2 支持 - 提供 lambda 、stream api 、webflux 的生产实践 - ## 文档视频 [ 🚀🚀🚀 低代码数据可视化](http://datav.avuejs.com) @@ -37,23 +36,16 @@ - master: java8 + springboot 2.7 + springcloud 2021 - jdk17: java17 + springboot 3.0 + springcloud 2022 -| 分支 | 说明 | -|-----------------|------------------------------------------------------------------| -| master | java8 + springboot 2.7 + springcloud 2021 | -| sca-springboot3 | java17 + springboot 3.0 + springcloud 2022 | -| sct-springboot3 | java17 + springboot 3.0 + springcloud 2022 | - - ### 核心依赖 -| 依赖 | 版本 | -| ---------------------- |------------| -| Spring Boot | 2.7.11 | -| Spring Cloud | 2021.0.6 | -| Spring Cloud Alibaba | 2021.0.5.0 | +| 依赖 | 版本 | +|-----------------------------|------------| +| Spring Boot | 2.7.12 | +| Spring Cloud | 2021.0.6 | +| Spring Cloud Alibaba | 2021.0.5.0 | | Spring Authorization Server | 0.4.2 | -| Mybatis Plus | 3.5.3.1 | -| hutool | 5.8.17 | +| Mybatis Plus | 3.5.3.1 | +| hutool | 5.8.17 | ### 模块说明 @@ -137,7 +129,6 @@ pig 开源软件遵循 [Apache 2.0 协议](https://www.apache.org/licenses/LICEN ![](https://minio.pigx.vip/oss/1655474288.jpg) - ### 其他说明 1. 欢迎提交 [PR](https://dwz.cn/2KURd5Vf)，注意对应提交对应 `dev` 分支 @@ -151,7 +142,8 @@ pig 开源软件遵循 [Apache 2.0 协议](https://www.apache.org/licenses/LICEN 2. 如果使用 IntelliJ IDEA 开发，请安装自动格式化软件 spring-javaformat-intellij-idea-plugin - 3. 其他开发工具，请参考 spring-javaformat + 3. 其他开发工具，请参考 + spring-javaformat 说明，或`提交代码前`在项目根目录运行下列命令（需要开发者电脑支持`mvn`命令）进行代码格式化 ``` mvn spring-javaformat:apply @@ -159,5 +151,3 @@ pig 开源软件遵循 [Apache 2.0 协议](https://www.apache.org/licenses/LICEN 2. 欢迎提交 [issue](https://gitee.com/log4j/pig/issues)，请写清楚遇到问题的原因、开发环境、复显步骤。 - -3. 联系作者 pig4cloud@qq.com