Commit eeb665739a6bac4cae5672f30a40ed6791643bd6
1 parent
ec876d54
优化 Activiti 的依赖管理
Showing
2 changed files
with
33 additions
and
37 deletions
yudao-dependencies/pom.xml
| @@ -41,6 +41,8 @@ | @@ -41,6 +41,8 @@ | ||
| 41 | <podam.version>7.2.6.RELEASE</podam.version> | 41 | <podam.version>7.2.6.RELEASE</podam.version> |
| 42 | <jedis-mock.version>0.1.16</jedis-mock.version> | 42 | <jedis-mock.version>0.1.16</jedis-mock.version> |
| 43 | <mockito-inline.version>3.6.28</mockito-inline.version> | 43 | <mockito-inline.version>3.6.28</mockito-inline.version> |
| 44 | + <!-- Bpm 工作流相关 --> | ||
| 45 | + <activiti.version>7.1.0.M6</activiti.version> | ||
| 44 | <!-- 工具类相关 --> | 46 | <!-- 工具类相关 --> |
| 45 | <lombok.version>1.18.20</lombok.version> | 47 | <lombok.version>1.18.20</lombok.version> |
| 46 | <mapstruct.version>1.4.1.Final</mapstruct.version> | 48 | <mapstruct.version>1.4.1.Final</mapstruct.version> |
| @@ -365,6 +367,36 @@ | @@ -365,6 +367,36 @@ | ||
| 365 | <version>${podam.version}</version> | 367 | <version>${podam.version}</version> |
| 366 | </dependency> | 368 | </dependency> |
| 367 | 369 | ||
| 370 | + <!-- 工作流相关 --> | ||
| 371 | + <dependency> | ||
| 372 | + <groupId>org.activiti</groupId> | ||
| 373 | + <artifactId>activiti-spring-boot-starter</artifactId> | ||
| 374 | + <version>${activiti.version}</version> | ||
| 375 | + <exclusions> | ||
| 376 | + <exclusion> | ||
| 377 | + <groupId>de.odysseus.juel</groupId> | ||
| 378 | + <artifactId>juel-api</artifactId> | ||
| 379 | + </exclusion> | ||
| 380 | + <exclusion> | ||
| 381 | + <groupId>de.odysseus.juel</groupId> | ||
| 382 | + <artifactId>juel-spi</artifactId> | ||
| 383 | + </exclusion> | ||
| 384 | + <exclusion> | ||
| 385 | + <groupId>org.mybatis</groupId> | ||
| 386 | + <artifactId>mybatis</artifactId> | ||
| 387 | + </exclusion> | ||
| 388 | + <exclusion> | ||
| 389 | + <artifactId>el-api</artifactId> | ||
| 390 | + <groupId>javax.el</groupId> | ||
| 391 | + </exclusion> | ||
| 392 | + </exclusions> | ||
| 393 | + </dependency> | ||
| 394 | + <dependency> | ||
| 395 | + <groupId>org.activiti</groupId> | ||
| 396 | + <artifactId>activiti-image-generator</artifactId> | ||
| 397 | + <version>${activiti.version}</version> | ||
| 398 | + </dependency> | ||
| 399 | + | ||
| 368 | <!-- 工具类相关 --> | 400 | <!-- 工具类相关 --> |
| 369 | <dependency> | 401 | <dependency> |
| 370 | <groupId>cn.iocoder.boot</groupId> | 402 | <groupId>cn.iocoder.boot</groupId> |
yudao-framework/yudao-spring-boot-starter-activiti/pom.xml
| @@ -15,22 +15,6 @@ | @@ -15,22 +15,6 @@ | ||
| 15 | <description>Activiti 拓展</description> | 15 | <description>Activiti 拓展</description> |
| 16 | <url>https://github.com/YunaiV/ruoyi-vue-pro</url> | 16 | <url>https://github.com/YunaiV/ruoyi-vue-pro</url> |
| 17 | 17 | ||
| 18 | - | ||
| 19 | - <properties> | ||
| 20 | - <activiti.version>7.1.0.M6</activiti.version> | ||
| 21 | - </properties> | ||
| 22 | - <!-- TODO @jason：后续弄到 yudao-dependencies 里 --> | ||
| 23 | - <dependencyManagement> | ||
| 24 | - <dependencies> | ||
| 25 | - <dependency> | ||
| 26 | - <groupId>org.activiti.dependencies</groupId> | ||
| 27 | - <artifactId>activiti-dependencies</artifactId> | ||
| 28 | - <version>${activiti.version}</version> | ||
| 29 | - <scope>import</scope> | ||
| 30 | - <type>pom</type> | ||
| 31 | - </dependency> | ||
| 32 | - </dependencies> | ||
| 33 | - </dependencyManagement> | ||
| 34 | <dependencies> | 18 | <dependencies> |
| 35 | <dependency> | 19 | <dependency> |
| 36 | <groupId>cn.iocoder.boot</groupId> | 20 | <groupId>cn.iocoder.boot</groupId> |
| @@ -49,34 +33,14 @@ | @@ -49,34 +33,14 @@ | ||
| 49 | <artifactId>yudao-spring-boot-starter-mybatis</artifactId> | 33 | <artifactId>yudao-spring-boot-starter-mybatis</artifactId> |
| 50 | </dependency> | 34 | </dependency> |
| 51 | 35 | ||
| 52 | - <!--使用mybatis plus需排除掉mybatis--> | 36 | + <!-- 工作流相关 --> |
| 53 | <dependency> | 37 | <dependency> |
| 54 | <groupId>org.activiti</groupId> | 38 | <groupId>org.activiti</groupId> |
| 55 | <artifactId>activiti-spring-boot-starter</artifactId> | 39 | <artifactId>activiti-spring-boot-starter</artifactId> |
| 56 | - <version>${activiti.version}</version> | ||
| 57 | - <exclusions> | ||
| 58 | - <exclusion> | ||
| 59 | - <groupId>de.odysseus.juel</groupId> | ||
| 60 | - <artifactId>juel-api</artifactId> | ||
| 61 | - </exclusion> | ||
| 62 | - <exclusion> | ||
| 63 | - <groupId>de.odysseus.juel</groupId> | ||
| 64 | - <artifactId>juel-spi</artifactId> | ||
| 65 | - </exclusion> | ||
| 66 | - <exclusion> | ||
| 67 | - <groupId>org.mybatis</groupId> | ||
| 68 | - <artifactId>mybatis</artifactId> | ||
| 69 | - </exclusion> | ||
| 70 | - <exclusion> | ||
| 71 | - <artifactId>el-api</artifactId> | ||
| 72 | - <groupId>javax.el</groupId> | ||
| 73 | - </exclusion> | ||
| 74 | - </exclusions> | ||
| 75 | </dependency> | 40 | </dependency> |
| 76 | <dependency> | 41 | <dependency> |
| 77 | <groupId>org.activiti</groupId> | 42 | <groupId>org.activiti</groupId> |
| 78 | <artifactId>activiti-image-generator</artifactId> | 43 | <artifactId>activiti-image-generator</artifactId> |
| 79 | - <version>${activiti.version}</version> | ||
| 80 | </dependency> | 44 | </dependency> |
| 81 | 45 | ||
| 82 | </dependencies> | 46 | </dependencies> |