Skip to content

Commit ce456a0

Browse files
ClearXsClearXs
authored
Merge pull request #1 from b6688c/1.1.5
feat 1.升级springboot至3.1.5版本，同步升级相关的包，mybatis-plus、elasticsearch以及相关的依…
2 parents 5eba4e2 + 68e5148 commit ce456a0

File tree

119 files changed

+134
-4308
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+134
-4308
lines changed

‎pom.xml

Lines changed: 12 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@
77
<groupId>cc.allio</groupId>
88
<artifactId>uno</artifactId>
99
<packaging>pom</packaging>
10-
<version>1.1.4.RELEASE</version>
10+
<version>1.1.5.RELEASE</version>
1111
<description>构建大型应用需要的基本能力 --- all in one</description>
12-
12+
<url>https://github.com/b6688c/uno</url>
1313
<developers>
1414
<developer>
15-
<name>jiangwei</name>
15+
<name>j.x</name>
1616
<email>jiangw1027@gmail.com</email>
1717
</developer>
1818
</developers>
19-
2019
<modules>
2120
<module>uno-bom</module>
2221
<module>uno-core</module>
@@ -33,10 +32,9 @@
3332
</modules>
3433

3534
<properties>
36-
<java.version>1.8</java.version>
35+
<java.version>21</java.version>
3736
<reactor-bom>2020.0.12</reactor-bom>
38-
<spring.boot.version>2.3.12.RELEASE</spring.boot.version>
39-
<spring.platform.version>Cairo-SR8</spring.platform.version>
37+
<spring.boot.version>3.1.5</spring.boot.version>
4038
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
4139
<maven-plugin.version>3.8.1</maven-plugin.version>
4240
<maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
@@ -46,10 +44,6 @@
4644
</properties>
4745

4846
<dependencies>
49-
<dependency>
50-
<groupId>org.springframework.boot</groupId>
51-
<artifactId>spring-boot-starter-aop</artifactId>
52-
</dependency>
5347
<dependency>
5448
<groupId>org.projectlombok</groupId>
5549
<artifactId>lombok</artifactId>
@@ -63,6 +57,13 @@
6357

6458
<dependencyManagement>
6559
<dependencies>
60+
<dependency>
61+
<groupId>org.springframework.boot</groupId>
62+
<artifactId>spring-boot-dependencies</artifactId>
63+
<version>${spring.boot.version}</version>
64+
<type>pom</type>
65+
<scope>import</scope>
66+
</dependency>
6667
<dependency>
6768
<groupId>org.testcontainers</groupId>
6869
<artifactId>testcontainers-bom</artifactId>
@@ -84,27 +85,6 @@
8485
<type>pom</type>
8586
<scope>import</scope>
8687
</dependency>
87-
<dependency>
88-
<groupId>org.springframework.boot</groupId>
89-
<artifactId>spring-boot-dependencies</artifactId>
90-
<version>${spring.boot.version}</version>
91-
<type>pom</type>
92-
<scope>import</scope>
93-
</dependency>
94-
<dependency>
95-
<groupId>io.spring.platform</groupId>
96-
<artifactId>platform-bom</artifactId>
97-
<version>${spring.platform.version}</version>
98-
<type>pom</type>
99-
<scope>import</scope>
100-
</dependency>
101-
<dependency>
102-
<groupId>org.springframework.cloud</groupId>
103-
<artifactId>spring-cloud-dependencies</artifactId>
104-
<version>${spring.cloud.version}</version>
105-
<type>pom</type>
106-
<scope>import</scope>
107-
</dependency>
10888
<dependency>
10989
<groupId>org.drools</groupId>
11090
<artifactId>drools-bom</artifactId>

‎uno-auto/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>uno</artifactId>
77
<groupId>cc.allio</groupId>
8-
<version>1.1.4.RELEASE</version>
8+
<version>1.1.5.RELEASE</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎uno-bom/pom.xml

Lines changed: 8 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
<modelVersion>4.0.0</modelVersion>
1313
<groupId>cc.allio</groupId>
1414
<artifactId>uno-bom</artifactId>
15-
<version>1.1.4.RELEASE</version>
15+
<version>1.1.5.RELEASE</version>
1616
<packaging>pom</packaging>
1717

1818
<properties>
1919
<!-- 统一版本管理 -->
20-
<uno.version>1.1.4.RELEASE</uno.version>
20+
<uno.version>1.1.5.RELEASE</uno.version>
2121
<!-- 序列化框架 -->
2222
<protostuff.version>1.5.9</protostuff.version>
2323
<!-- google SPI -->
@@ -28,20 +28,17 @@
2828
<!-- 代理相关 -->
2929
<byte-buddy.version>1.12.2</byte-buddy.version>
3030
<cglib.version>3.3.0</cglib.version>
31-
<spring-webflux.version>5.2.15.RELEASE</spring-webflux.version>
3231
<lombok.version>1.18.22</lombok.version>
3332
<!-- 单元测试框架 -->
3433
<junit-jupiter.version>5.6.2</junit-jupiter.version>
3534
<mockito.version>4.0.0</mockito.version>
3635
<guava.version>30.1.1-jre</guava.version>
3736
<!-- swagger -->
38-
<swagger-v3.version>2.1.11</swagger-v3.version>
37+
<swagger-v3.version>2.2.17</swagger-v3.version>
3938
<swagger-v2.version>1.6.2</swagger-v2.version>
4039
<qlexpress.version>3.2.0</qlexpress.version>
41-
<mybatis-spring-boot.version>2.2.1</mybatis-spring-boot.version>
42-
<mybatis-plus-boot.version>3.4.2</mybatis-plus-boot.version>
43-
<flink.version>1.14.3</flink.version>
44-
<flink-minlog.version>1.2</flink-minlog.version>
40+
<mybatis-spring-boot.version>3.0.2</mybatis-spring-boot.version>
41+
<mybatis-plus-boot.version>3.5.3</mybatis-plus-boot.version>
4542
<!-- 国人reactor后台管理框架 -->
4643
<hsweb-framework.version>4.0.11</hsweb-framework.version>
4744
<!-- 数据库 -->
@@ -53,28 +50,21 @@
5350
<mybatis-plus-dynamic.version>3.3.6</mybatis-plus-dynamic.version>
5451
<!-- 链路追踪 -->
5552
<oepntracing.version>0.31.0</oepntracing.version>
56-
<!-- es -->
57-
<easy-es.version>0.9.40</easy-es.version>
58-
<!-- feign -->
59-
<feign-reactor.version>2.0.15</feign-reactor.version>
60-
<easyexcel.version>2.2.10</easyexcel.version>
61-
<springfox-swagger2.version>2.10.5</springfox-swagger2.version>
53+
<springfox-swagger2.version>3.0.0</springfox-swagger2.version>
6254
<geotools.version>27.0</geotools.version>
6355
<postgis-jdbc.version>2.5.1</postgis-jdbc.version>
64-
<aviator.version>5.3.2</aviator.version>
6556
<easypoi.version>4.4.0</easypoi.version>
6657
<appache-commons-csv.version>1.8</appache-commons-csv.version>
6758
<!-- elasticsearch -->
68-
<elasticsearch-client.version>7.17.7</elasticsearch-client.version>
59+
<elasticsearch-client.version>8.7.1</elasticsearch-client.version>
6960
<!-- influxdb -->
7061
<influxdb-client.version>6.7.0</influxdb-client.version>
7162
<shardingsphere.version>5.3.1</shardingsphere.version>
7263
<gdal.version>2.4.0</gdal.version>
7364
<!-- tdengine -->
7465
<tdengine.version>3.2.4</tdengine.version>
7566

76-
<easy-rules.version>4.1.0</easy-rules.version>
77-
<spring-statemachine.version>2.2.0.RELEASE</spring-statemachine.version>
67+
<spring-statemachine.version>3.2.1</spring-statemachine.version>
7868
<jakarta.json-api.version>2.0.1</jakarta.json-api.version>
7969
<concurrentunit.version>0.4.6</concurrentunit.version>
8070
</properties>
@@ -104,11 +94,6 @@
10494
<artifactId>uno-component-http</artifactId>
10595
<version>${uno.version}</version>
10696
</dependency>
107-
<dependency>
108-
<groupId>cc.allio</groupId>
109-
<artifactId>uno-component-flink</artifactId>
110-
<version>${uno.version}</version>
111-
</dependency>
11297
<dependency>
11398
<groupId>cc.allio</groupId>
11499
<artifactId>uno-component-websocket</artifactId>
@@ -130,11 +115,6 @@
130115
<artifactId>uno-starter-core</artifactId>
131116
<version>${uno.version}</version>
132117
</dependency>
133-
<dependency>
134-
<groupId>cc.allio</groupId>
135-
<artifactId>uno-starter-flink</artifactId>
136-
<version>${uno.version}</version>
137-
</dependency>
138118
<dependency>
139119
<groupId>cc.allio</groupId>
140120
<artifactId>uno-starter-kafka</artifactId>
@@ -192,12 +172,6 @@
192172
<artifactId>spring-statemachine-core</artifactId>
193173
<version>${spring-statemachine.version}</version>
194174
</dependency>
195-
<dependency>
196-
<groupId>org.springframework</groupId>
197-
<artifactId>spring-webflux</artifactId>
198-
<version>${spring-webflux.version}</version>
199-
<scope>provided</scope>
200-
</dependency>
201175
<!-- cglib -->
202176
<dependency>
203177
<groupId>cglib</groupId>
@@ -308,31 +282,6 @@
308282
<version>${mybatis-plus-boot.version}</version>
309283
<scope>provided</scope>
310284
</dependency>
311-
<dependency>
312-
<groupId>org.apache.flink</groupId>
313-
<artifactId>flink-streaming-java_2.12</artifactId>
314-
<version>${flink.version}</version>
315-
</dependency>
316-
<dependency>
317-
<groupId>org.apache.flink</groupId>
318-
<artifactId>flink-clients_2.12</artifactId>
319-
<version>${flink.version}</version>
320-
</dependency>
321-
<dependency>
322-
<groupId>org.apache.flink</groupId>
323-
<artifactId>flink-connector-kafka_2.12</artifactId>
324-
<version>${flink.version}</version>
325-
</dependency>
326-
<dependency>
327-
<groupId>org.apache.flink</groupId>
328-
<artifactId>flink-connector-jdbc_2.12</artifactId>
329-
<version>${flink.version}</version>
330-
</dependency>
331-
<dependency>
332-
<groupId>com.esotericsoftware.minlog</groupId>
333-
<artifactId>minlog</artifactId>
334-
<version>${flink-minlog.version}</version>
335-
</dependency>
336285
<!-- 数据库 -->
337286
<!-- Druid -->
338287
<dependency>
@@ -394,11 +343,6 @@
394343
<artifactId>opentracing-util</artifactId>
395344
<version>${oepntracing.version}</version>
396345
</dependency>
397-
<dependency>
398-
<groupId>cn.easy-es</groupId>
399-
<artifactId>easy-es-boot-starter</artifactId>
400-
<version>2.0.0-beta1</version>
401-
</dependency>
402346
<dependency>
403347
<groupId>com.playtika.reactivefeign</groupId>
404348
<artifactId>feign-reactor-cloud</artifactId>
@@ -414,11 +358,6 @@
414358
<artifactId>feign-reactor-spring-configuration</artifactId>
415359
<version>${feign-reactor.version}</version>
416360
</dependency>
417-
<dependency>
418-
<groupId>com.alibaba</groupId>
419-
<artifactId>easyexcel</artifactId>
420-
<version>${easyexcel.version}</version>
421-
</dependency>
422361
<dependency>
423362
<groupId>io.springfox</groupId>
424363
<artifactId>springfox-swagger2</artifactId>
@@ -444,11 +383,6 @@
444383
<artifactId>postgis-jdbc</artifactId>
445384
<version>${postgis-jdbc.version}</version>
446385
</dependency>
447-
<dependency>
448-
<groupId>com.googlecode.aviator</groupId>
449-
<artifactId>aviator</artifactId>
450-
<version>${aviator.version}</version>
451-
</dependency>
452386
<dependency>
453387
<groupId>cn.afterturn</groupId>
454388
<artifactId>easypoi-annotation</artifactId>
@@ -469,26 +403,6 @@
469403
<artifactId>commons-csv</artifactId>
470404
<version>${appache-commons-csv.version}</version>
471405
</dependency>
472-
<dependency>
473-
<groupId>co.elastic.clients</groupId>
474-
<artifactId>elasticsearch-java</artifactId>
475-
<version>${elasticsearch-client.version}</version>
476-
</dependency>
477-
<dependency>
478-
<groupId>org.elasticsearch.client</groupId>
479-
<artifactId>elasticsearch-rest-high-level-client</artifactId>
480-
<version>${elasticsearch-client.version}</version>
481-
</dependency>
482-
<dependency>
483-
<groupId>org.elasticsearch.client</groupId>
484-
<artifactId>elasticsearch-rest-client</artifactId>
485-
<version>${elasticsearch-client.version}</version>
486-
</dependency>
487-
<dependency>
488-
<groupId>org.elasticsearch</groupId>
489-
<artifactId>elasticsearch</artifactId>
490-
<version>${elasticsearch-client.version}</version>
491-
</dependency>
492406
<dependency>
493407
<groupId>com.influxdb</groupId>
494408
<artifactId>influxdb-client-java</artifactId>
@@ -520,11 +434,6 @@
520434
<artifactId>shardingsphere-sql-parser-oracle</artifactId>
521435
<version>${shardingsphere.version}</version>
522436
</dependency>
523-
<dependency>
524-
<groupId>org.jeasy</groupId>
525-
<artifactId>easy-rules-core</artifactId>
526-
<version>${easy-rules.version}</version>
527-
</dependency>
528437
<dependency>
529438
<groupId>jakarta.json</groupId>
530439
<artifactId>jakarta.json-api</artifactId>

‎uno-components/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>uno</artifactId>
77
<groupId>cc.allio</groupId>
8-
<version>1.1.4.RELEASE</version>
8+
<version>1.1.5.RELEASE</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -14,7 +14,6 @@
1414

1515
<modules>
1616
<module>uno-component-http</module>
17-
<module>uno-component-flink</module>
1817
<module>uno-component-websocket</module>
1918
<module>uno-component-sequential</module>
2019
<module>uno-component-kafka</module>

‎uno-components/uno-component-flink/pom.xml

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎uno-components/uno-component-flink/src/main/java/cc/allio/uno/component/flink/Input.java

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)