Skip to content

Commit

Permalink
build(maven): Release 2.2.0 (#557)
Browse files Browse the repository at this point in the history
* build(maven): Release 2.2.0

* build(maven): 升级spring版本
  • Loading branch information
zhou-hao authored Aug 21, 2024
1 parent f754740 commit 39687d8
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Auto Deploy Docker

on:
on:
push:
branches: [ "master","2.0" ]
branches: [ "master","2.0","2.1","2.2" ]
jobs:
build:

Expand Down
21 changes: 15 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,22 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.locales>zh_CN</project.build.locales>
<spring.boot.version>2.7.18</spring.boot.version>
<spring.framework.version>5.3.39</spring.framework.version>
<java.version>1.8</java.version>
<project.build.jdk>${java.version}</project.build.jdk>
<!-- 基础通用模块依赖,快照版本表示正在持续迭代.发布后将同步到maven中央仓库 -->
<!-- https://github.com/hs-web/hsweb-framework -->
<hsweb.framework.version>4.0.17-SNAPSHOT</hsweb.framework.version>
<hsweb.framework.version>4.0.17</hsweb.framework.version>
<!-- https://github.com/hs-web/hsweb-easy-orm -->
<easyorm.version>4.1.2-SNAPSHOT</easyorm.version>
<easyorm.version>4.1.2</easyorm.version>
<!-- https://github.com/jetlinks/jetlinks -->
<jetlinks.version>1.2.2-SNAPSHOT</jetlinks.version>
<jetlinks.version>1.2.2</jetlinks.version>
<!-- https://github.com/hs-web/reactor-excel -->
<reactor.excel.version>1.0.6-SNAPSHOT</reactor.excel.version>
<reactor.excel.version>1.0.6</reactor.excel.version>
<!-- https://github.com/jetlinks/reactor-ql -->
<reactor.ql.version>1.0.16</reactor.ql.version>
<reactor.ql.version>1.0.17</reactor.ql.version>
<!-- https://github.com/jetlinks/jetlinks-plugin -->
<jetlinks.plugin.version>1.0.1</jetlinks.plugin.version>
<jetlinks.plugin.version>1.0.2</jetlinks.plugin.version>
<!-- https://github.com/jetlinks/jetlinks-sdk -->
<jetlinks.sdk.version>1.0.0</jetlinks.sdk.version>

Expand Down Expand Up @@ -197,6 +198,14 @@

<dependencies>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>${spring.framework.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-bom</artifactId>
Expand Down

0 comments on commit 39687d8

Please sign in to comment.