Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
开发团队
Flowable Engine
提交
4478e5b8
F
Flowable Engine
项目概览
开发团队
/
Flowable Engine
通知
9
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Flowable Engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4478e5b8
编写于
9月 18, 2014
作者:
J
Joram Barrez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Spring boot integration] Removed <optional> in favor of <exclusions>
上级
ee15a9c0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
37 addition
and
10 deletion
+37
-10
modules/activiti-spring-boot/pom.xml
modules/activiti-spring-boot/pom.xml
+33
-0
modules/activiti-spring-boot/src/main/java/org/activiti/spring/boot/ProcessEngineAutoConfiguration.java
.../activiti/spring/boot/ProcessEngineAutoConfiguration.java
+4
-6
modules/activiti-spring/pom.xml
modules/activiti-spring/pom.xml
+0
-4
未找到文件。
modules/activiti-spring-boot/pom.xml
浏览文件 @
4478e5b8
...
...
@@ -16,7 +16,10 @@
<activiti.artifact>
org.activiti.spring.boot
</activiti.artifact>
<!-- Note that Spring framework version needs to match the one used in Spring Boot-->
<spring.boot.version>
1.2.0.M1
</spring.boot.version>
<spring.framework.version>
4.1.0.RELEASE
</spring.framework.version>
</properties>
...
...
@@ -98,10 +101,40 @@
<dependency>
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-engine
</artifactId>
<!-- Excluding these in favour of the Spring Boot dependencies -->
<exclusions>
<exclusion>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-beans
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-spring
</artifactId>
<!-- Excluding these in favour of the Spring Boot dependencies -->
<exclusions>
<exclusion>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-core
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-context
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-jdbc
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-tx
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-orm
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
...
...
modules/activiti-spring-boot/src/main/java/org/activiti/spring/boot/ProcessEngineAutoConfiguration.java
浏览文件 @
4478e5b8
...
...
@@ -47,8 +47,8 @@ import org.springframework.util.StringUtils;
/**
* <p>
* Auto configuration for using Activiti from a
<A
* href="http://spring.io/projects/spring-boot">Spring Boot application</a>.
* Auto configuration for using Activiti from a
*
<a
href="http://spring.io/projects/spring-boot">Spring Boot application</a>.
* Provides a configured {@link org.activiti.engine.ProcessEngine} if none other
* is detected.
* <p>
...
...
@@ -219,10 +219,8 @@ public class ProcessEngineAutoConfiguration {
@Override
public
DataSource
dataSource
()
{
Assert
.
isTrue
(
this
.
dataSources
.
length
>
0
,
"you must have configured at least "
+
"one javax.sql.DataSource bean in your Spring application context."
);
Assert
.
isTrue
(
this
.
dataSources
.
length
>
0
,
"you must have configured at least one javax.sql.DataSource bean in your Spring application context."
);
return
this
.
dataSources
[
0
];
}
...
...
modules/activiti-spring/pom.xml
浏览文件 @
4478e5b8
...
...
@@ -104,12 +104,10 @@
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-context
</artifactId>
<optional>
true
</optional>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-jdbc
</artifactId>
<optional>
true
</optional>
</dependency>
<!-- <dependency>
<groupId>org.springframework</groupId>
...
...
@@ -118,7 +116,6 @@
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-tx
</artifactId>
<optional>
true
</optional>
</dependency>
<dependency>
<groupId>
org.springframework
</groupId>
...
...
@@ -152,7 +149,6 @@
<dependency>
<groupId>
org.springframework
</groupId>
<artifactId>
spring-orm
</artifactId>
<optional>
true
</optional>
</dependency>
<dependency>
<groupId>
com.h2database
</groupId>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录