Skip to content

Commit

Permalink
修复slf4j冲突
Browse files Browse the repository at this point in the history
  • Loading branch information
zhou-hao committed Mar 22, 2017
1 parent ebdda2e commit c5dde33
Showing 1 changed file with 18 additions and 1 deletion.
19 changes: 18 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<activiti.version>5.19.0.2</activiti.version>

<fastjson.version>1.2.28</fastjson.version>

<slf4j.version>1.7.21</slf4j.version>
<h2.version>1.4.191</h2.version>
<mysql.version>5.1.39</mysql.version>
<cglib.version>3.2.2</cglib.version>
Expand Down Expand Up @@ -153,6 +153,11 @@
<dependencyManagement>
<dependencies>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
Expand Down Expand Up @@ -219,6 +224,12 @@
<groupId>org.hsweb</groupId>
<artifactId>hsweb-expands-office</artifactId>
<version>${hsweb.expands.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hsweb</groupId>
Expand Down Expand Up @@ -246,6 +257,12 @@
<version>${hsweb.ezorm.version}</version>
<type>pom</type>
<scope>import</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hsweb</groupId>
Expand Down

0 comments on commit c5dde33

Please sign in to comment.