Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat 1.升级springboot至3.1.5版本，同步升级相关的包，mybatis-plus、elasticsearch以及相关的依… #1

Merged
merged 1 commit into from
Oct 21, 2023
Merged

feat 1.升级springboot至3.1.5版本，同步升级相关的包，mybatis-plus、elasticsearch以及相关的依… #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 12 additions & 32 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@
<groupId>cc.allio</groupId>
<artifactId>uno</artifactId>
<packaging>pom</packaging>
<version>1.1.4.RELEASE</version>
<version>1.1.5.RELEASE</version>
<description>构建大型应用需要的基本能力 --- all in one</description>

<url>https://github.com/b6688c/uno</url>
<developers>
<developer>
<name>jiangwei</name>
<name>j.x</name>
<email>jiangw1027@gmail.com</email>
</developer>
</developers>

<modules>
<module>uno-bom</module>
<module>uno-core</module>
Expand All @@ -33,10 +32,9 @@
</modules>

<properties>
<java.version>1.8</java.version>
<java.version>21</java.version>
<reactor-bom>2020.0.12</reactor-bom>
<spring.boot.version>2.3.12.RELEASE</spring.boot.version>
<spring.platform.version>Cairo-SR8</spring.platform.version>
<spring.boot.version>3.1.5</spring.boot.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-plugin.version>3.8.1</maven-plugin.version>
<maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
Expand All @@ -46,10 +44,6 @@
</properties>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
Expand All @@ -63,6 +57,13 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring.boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
Expand All @@ -84,27 +85,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring.boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.spring.platform</groupId>
<artifactId>platform-bom</artifactId>
<version>${spring.platform.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring.cloud.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-bom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion uno-auto/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>uno</artifactId>
<groupId>cc.allio</groupId>
<version>1.1.4.RELEASE</version>
<version>1.1.5.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
107 changes: 8 additions & 99 deletions uno-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>cc.allio</groupId>
<artifactId>uno-bom</artifactId>
<version>1.1.4.RELEASE</version>
<version>1.1.5.RELEASE</version>
<packaging>pom</packaging>

<properties>
<!-- 统一版本管理 -->
<uno.version>1.1.4.RELEASE</uno.version>
<uno.version>1.1.5.RELEASE</uno.version>
<!-- 序列化框架 -->
<protostuff.version>1.5.9</protostuff.version>
<!-- google SPI -->
Expand All @@ -28,20 +28,17 @@
<!-- 代理相关 -->
<byte-buddy.version>1.12.2</byte-buddy.version>
<cglib.version>3.3.0</cglib.version>
<spring-webflux.version>5.2.15.RELEASE</spring-webflux.version>
<lombok.version>1.18.22</lombok.version>
<!-- 单元测试框架 -->
<junit-jupiter.version>5.6.2</junit-jupiter.version>
<mockito.version>4.0.0</mockito.version>
<guava.version>30.1.1-jre</guava.version>
<!-- swagger -->
<swagger-v3.version>2.1.11</swagger-v3.version>
<swagger-v3.version>2.2.17</swagger-v3.version>
<swagger-v2.version>1.6.2</swagger-v2.version>
<qlexpress.version>3.2.0</qlexpress.version>
<mybatis-spring-boot.version>2.2.1</mybatis-spring-boot.version>
<mybatis-plus-boot.version>3.4.2</mybatis-plus-boot.version>
<flink.version>1.14.3</flink.version>
<flink-minlog.version>1.2</flink-minlog.version>
<mybatis-spring-boot.version>3.0.2</mybatis-spring-boot.version>
<mybatis-plus-boot.version>3.5.3</mybatis-plus-boot.version>
<!-- 国人reactor后台管理框架 -->
<hsweb-framework.version>4.0.11</hsweb-framework.version>
<!-- 数据库 -->
Expand All @@ -53,28 +50,21 @@
<mybatis-plus-dynamic.version>3.3.6</mybatis-plus-dynamic.version>
<!-- 链路追踪 -->
<oepntracing.version>0.31.0</oepntracing.version>
<!-- es -->
<easy-es.version>0.9.40</easy-es.version>
<!-- feign -->
<feign-reactor.version>2.0.15</feign-reactor.version>
<easyexcel.version>2.2.10</easyexcel.version>
<springfox-swagger2.version>2.10.5</springfox-swagger2.version>
<springfox-swagger2.version>3.0.0</springfox-swagger2.version>
<geotools.version>27.0</geotools.version>
<postgis-jdbc.version>2.5.1</postgis-jdbc.version>
<aviator.version>5.3.2</aviator.version>
<easypoi.version>4.4.0</easypoi.version>
<appache-commons-csv.version>1.8</appache-commons-csv.version>
<!-- elasticsearch -->
<elasticsearch-client.version>7.17.7</elasticsearch-client.version>
<elasticsearch-client.version>8.7.1</elasticsearch-client.version>
<!-- influxdb -->
<influxdb-client.version>6.7.0</influxdb-client.version>
<shardingsphere.version>5.3.1</shardingsphere.version>
<gdal.version>2.4.0</gdal.version>
<!-- tdengine -->
<tdengine.version>3.2.4</tdengine.version>

<easy-rules.version>4.1.0</easy-rules.version>
<spring-statemachine.version>2.2.0.RELEASE</spring-statemachine.version>
<spring-statemachine.version>3.2.1</spring-statemachine.version>
<jakarta.json-api.version>2.0.1</jakarta.json-api.version>
<concurrentunit.version>0.4.6</concurrentunit.version>
</properties>
Expand Down Expand Up @@ -104,11 +94,6 @@
<artifactId>uno-component-http</artifactId>
<version>${uno.version}</version>
</dependency>
<dependency>
<groupId>cc.allio</groupId>
<artifactId>uno-component-flink</artifactId>
<version>${uno.version}</version>
</dependency>
<dependency>
<groupId>cc.allio</groupId>
<artifactId>uno-component-websocket</artifactId>
Expand All @@ -130,11 +115,6 @@
<artifactId>uno-starter-core</artifactId>
<version>${uno.version}</version>
</dependency>
<dependency>
<groupId>cc.allio</groupId>
<artifactId>uno-starter-flink</artifactId>
<version>${uno.version}</version>
</dependency>
<dependency>
<groupId>cc.allio</groupId>
<artifactId>uno-starter-kafka</artifactId>
Expand Down Expand Up @@ -192,12 +172,6 @@
<artifactId>spring-statemachine-core</artifactId>
<version>${spring-statemachine.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webflux</artifactId>
<version>${spring-webflux.version}</version>
<scope>provided</scope>
</dependency>
<!-- cglib -->
<dependency>
<groupId>cglib</groupId>
Expand Down Expand Up @@ -308,31 +282,6 @@
<version>${mybatis-plus-boot.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_2.12</artifactId>
<version>${flink.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients_2.12</artifactId>
<version>${flink.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-kafka_2.12</artifactId>
<version>${flink.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-jdbc_2.12</artifactId>
<version>${flink.version}</version>
</dependency>
<dependency>
<groupId>com.esotericsoftware.minlog</groupId>
<artifactId>minlog</artifactId>
<version>${flink-minlog.version}</version>
</dependency>
<!-- 数据库 -->
<!-- Druid -->
<dependency>
Expand Down Expand Up @@ -394,11 +343,6 @@
<artifactId>opentracing-util</artifactId>
<version>${oepntracing.version}</version>
</dependency>
<dependency>
<groupId>cn.easy-es</groupId>
<artifactId>easy-es-boot-starter</artifactId>
<version>2.0.0-beta1</version>
</dependency>
<dependency>
<groupId>com.playtika.reactivefeign</groupId>
<artifactId>feign-reactor-cloud</artifactId>
Expand All @@ -414,11 +358,6 @@
<artifactId>feign-reactor-spring-configuration</artifactId>
<version>${feign-reactor.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>${easyexcel.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
Expand All @@ -444,11 +383,6 @@
<artifactId>postgis-jdbc</artifactId>
<version>${postgis-jdbc.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.aviator</groupId>
<artifactId>aviator</artifactId>
<version>${aviator.version}</version>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-annotation</artifactId>
Expand All @@ -469,26 +403,6 @@
<artifactId>commons-csv</artifactId>
<version>${appache-commons-csv.version}</version>
</dependency>
<dependency>
<groupId>co.elastic.clients</groupId>
<artifactId>elasticsearch-java</artifactId>
<version>${elasticsearch-client.version}</version>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
<version>${elasticsearch-client.version}</version>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-client</artifactId>
<version>${elasticsearch-client.version}</version>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>${elasticsearch-client.version}</version>
</dependency>
<dependency>
<groupId>com.influxdb</groupId>
<artifactId>influxdb-client-java</artifactId>
Expand Down Expand Up @@ -520,11 +434,6 @@
<artifactId>shardingsphere-sql-parser-oracle</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
<dependency>
<groupId>org.jeasy</groupId>
<artifactId>easy-rules-core</artifactId>
<version>${easy-rules.version}</version>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions uno-components/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>uno</artifactId>
<groupId>cc.allio</groupId>
<version>1.1.4.RELEASE</version>
<version>1.1.5.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -14,7 +14,6 @@

<modules>
<module>uno-component-http</module>
<module>uno-component-flink</module>
<module>uno-component-websocket</module>
<module>uno-component-sequential</module>
<module>uno-component-kafka</module>
Expand Down
45 changes: 0 additions & 45 deletions uno-components/uno-component-flink/pom.xml
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions uno-components/uno-component-flink/src/main/java/cc/allio/uno/component/flink/Input.java
View file
Open in desktop

This file was deleted.

Loading
Loading