Browse Source

修改到spring boot

admin 9 years ago
parent
commit
1bcb48d601
1 changed files with 16 additions and 71 deletions
  1. 16 71
      pom.xml

+ 16 - 71
pom.xml

@@ -2,7 +2,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>1.4.1.RELEASE</version>
+	</parent>
 	<groupId>com.uas.search</groupId>
 	<artifactId>search-parent</artifactId>
 	<version>${project.version}</version>
@@ -49,20 +53,23 @@
 		<zookeeper.version>3.4.6</zookeeper.version>
 		<zclient.version>0.1</zclient.version>
 		<servlet.version>3.0-alpha-1</servlet.version>
-		<spring.version>4.1.6.RELEASE</spring.version>
 		<hessian.version>4.0.7</hessian.version>
-		<fastjson.version>1.1.39</fastjson.version>
+		<fastjson.version>1.2.15</fastjson.version>
 		<zkclient.version>0.1</zkclient.version>
 		<log4j.version>1.2.16</log4j.version>
 		<commons.logging.version>1.1.1</commons.logging.version>
-		<spring.data.jpa.version>1.8.0.RELEASE</spring.data.jpa.version>
-		<commons.dbcp.version>1.4</commons.dbcp.version>
+		<druid.version>1.0.24</druid.version>
 		<oracle.jdbc.version>11.2.0</oracle.jdbc.version>
 		<jms.version>1.1</jms.version>
 	</properties>
 
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-starter-config</artifactId>
+				<version>1.2.1.RELEASE</version>
+			</dependency>
 			<dependency>
 				<groupId>javax.servlet</groupId>
 				<artifactId>servlet-api</artifactId>
@@ -86,62 +93,6 @@
 				<artifactId>ojdbc6</artifactId>
 				<version>${oracle.jdbc.version}</version>
 			</dependency>
-			<!-- spring -->
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-core</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-context</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-webmvc</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-aop</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-beans</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-expression</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-web</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-jdbc</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-tx</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-context-support</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.data</groupId>
-				<artifactId>spring-data-jpa</artifactId>
-				<version>${spring.data.jpa.version}</version>
-			</dependency>
 			<!-- dubbo -->
 			<dependency>
 				<groupId>com.alibaba</groupId>
@@ -199,11 +150,11 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
-			<!-- dbcp -->
+			<!-- druid -->
 			<dependency>
-				<groupId>commons-dbcp</groupId>
-				<artifactId>commons-dbcp</artifactId>
-				<version>${commons.dbcp.version}</version>
+				<groupId>com.alibaba</groupId>
+				<artifactId>druid</artifactId>
+				<version>${druid.version}</version>
 			</dependency>
 			<!-- hibernate -->
 			<dependency>
@@ -249,12 +200,6 @@
 		</dependencies>
 	</dependencyManagement>
 
-	<modules>
-		<module>search-api</module>
-		<module>search-console</module>
-		<module>search-api-b2b</module>
-		<module>search-console-b2b</module>
-	</modules>
 	<distributionManagement>
 		<!-- 发布release仓库 -->
 		<repository>