Commit 03cb7c4f by 李传峰

对接3.x,处理druid版本

parent f248bc6a
...@@ -39,19 +39,15 @@ ...@@ -39,19 +39,15 @@
<artifactId>universe-monitorlog-logback-starter</artifactId> <artifactId>universe-monitorlog-logback-starter</artifactId>
</dependency> </dependency>
<!-- Database connect Begin -->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
</dependency> </dependency>
<!-- Database connect End -->
<!-- Mysql Driver Begin -->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
</dependency> </dependency>
<!-- Mysql Driver End -->
<!-- Jackson Begin --> <!-- Jackson Begin -->
<dependency> <dependency>
......
...@@ -14,14 +14,14 @@ ...@@ -14,14 +14,14 @@
<groupId>com.pcloud.common</groupId> <groupId>com.pcloud.common</groupId>
<artifactId>pcloud-common-parent</artifactId> <artifactId>pcloud-common-parent</artifactId>
<version>3.1.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>pcloud-common-parent</name>
<modules> <modules>
<module>pcloud-common</module> <module>pcloud-common</module>
<module>pcloud-common-core</module> <module>pcloud-common-core</module>
<module>pcloud-solr</module> <module>pcloud-solr</module>
</modules> </modules>
<packaging>pom</packaging>
<name>pcloud-common-parent</name>
<properties> <properties>
<reversion>3.1.0-SNAPSHOT</reversion> <reversion>3.1.0-SNAPSHOT</reversion>
...@@ -82,10 +82,6 @@ ...@@ -82,10 +82,6 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>1.2.76</version> <version>1.2.76</version>
</dependency> </dependency>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment