Merge pull request #7569 from dataease/pr@dev-v2@feat_update_version

perf: 升级版本号
This commit is contained in:
fit2cloud-chenyw 2024-01-10 15:17:44 +08:00 committed by GitHub
commit 60e9d88ba9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 54 additions and 15 deletions

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>core</artifactId>
<groupId>io.dataease</groupId>
<version>2.2.0</version>
<version>${dataease.version}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -16,12 +16,12 @@
<dependency>
<groupId>io.dataease</groupId>
<artifactId>api-base</artifactId>
<version>${project.version}</version>
<version>${dataease.version}</version>
</dependency>
<dependency>
<groupId>io.dataease</groupId>
<artifactId>api-permissions</artifactId>
<version>${project.version}</version>
<version>${dataease.version}</version>
</dependency>
<dependency>
<groupId>com.mysql</groupId>

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>core</artifactId>
<groupId>io.dataease</groupId>
<version>2.2.0</version>
<version>${dataease.version}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>dataease</artifactId>
<groupId>io.dataease</groupId>
<version>2.2.0</version>
<version>${dataease.version}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -1 +1 @@
Subproject commit e2a179cff0c86af963a77520e332d962b02a77a8
Subproject commit d17d3775defcb7bbe2603121a417982a0811af4f

45
pom.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.dataease</groupId>
<artifactId>dataease</artifactId>
<version>2.2.0</version>
<version>${dataease.version}</version>
<packaging>pom</packaging>
<modules>
@ -13,7 +13,7 @@
</modules>
<properties>
<dataease.version>2.2.0</dataease.version>
<dataease.version>2.3.0</dataease.version>
<java.version>17</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-cloud-alibaba.version>2022.0.0.0-RC1</spring-cloud-alibaba.version>
@ -40,6 +40,9 @@
<easyexcel.version>3.3.2</easyexcel.version>
<maven.surefire.version>3.1.2</maven.surefire.version>
<maven.clean.version>3.2.0</maven.clean.version>
<flatten-maven.version>1.3.0</flatten-maven.version>
<maven.resources.version>3.3.1</maven.resources.version>
<maven.exec.version>3.1.0</maven.exec.version>
</properties>
<dependencyManagement>
@ -164,10 +167,46 @@
<artifactId>maven-clean-plugin</artifactId>
<version>${maven.clean.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${maven.resources.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>${maven.exec.version}</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>${flatten-maven.version}</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten-clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>api</artifactId>
<groupId>io.dataease</groupId>
<version>2.2.0</version>
<version>${dataease.version}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>api</artifactId>
<groupId>io.dataease</groupId>
<version>2.2.0</version>
<version>${dataease.version}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>sdk</artifactId>
<groupId>io.dataease</groupId>
<version>2.2.0</version>
<version>${dataease.version}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>sdk</artifactId>
<groupId>io.dataease</groupId>
<version>2.2.0</version>
<version>${dataease.version}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>sdk</artifactId>
<groupId>io.dataease</groupId>
<version>2.2.0</version>
<version>${dataease.version}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>dataease</artifactId>
<groupId>io.dataease</groupId>
<version>2.2.0</version>
<version>${dataease.version}</version>
</parent>
<modelVersion>4.0.0</modelVersion>