Browse Source

simplify dependency

sunyj 8 years ago
parent
commit
c5113b3391
3 changed files with 88 additions and 151 deletions
  1. 10 35
      mall-search/pom.xml
  2. 40 43
      pom.xml
  3. 38 73
      search-console-b2b/pom.xml

+ 10 - 35
mall-search/pom.xml

@@ -4,25 +4,14 @@
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.4.1.RELEASE</version>
+		<groupId>com.uas.search</groupId>
+		<artifactId>search-parent</artifactId>
+		<version>0.1.9-SNAPSHOT</version>
 	</parent>
 	</parent>
-	<groupId>com.uas.search</groupId>
 	<artifactId>mall-search</artifactId>
 	<artifactId>mall-search</artifactId>
 	<packaging>war</packaging>
 	<packaging>war</packaging>
 	<version>0.0.1-SNAPSHOT</version>
 	<version>0.0.1-SNAPSHOT</version>
 
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.plugin.version>2.3.2</maven.compiler.plugin.version>
-		<spring.cloud.version>1.2.1.RELEASE</spring.cloud.version>
-		<fastjson.version>1.2.15</fastjson.version>
-		<druid.version>1.0.24</druid.version>
-		<lucene.version>5.2.0</lucene.version>
-		<ikanalyzer.version>2012_v5</ikanalyzer.version>
-	</properties>
-
 	<dependencies>
 	<dependencies>
 		<dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<groupId>org.springframework.boot</groupId>
@@ -53,12 +42,18 @@
 			<groupId>org.springframework.data</groupId>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-jpa</artifactId>
 			<artifactId>spring-data-jpa</artifactId>
 		</dependency>
 		</dependency>
+
 		<!-- fastjson -->
 		<!-- fastjson -->
 		<dependency>
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
 			<artifactId>fastjson</artifactId>
-			<version>${fastjson.version}</version>
 		</dependency>
 		</dependency>
+
+		<dependency>
+			<groupId>com.uas.search</groupId>
+			<artifactId>search-common</artifactId>
+		</dependency>
+
 		<!-- jdbc -->
 		<!-- jdbc -->
 		<dependency>
 		<dependency>
 			<groupId>mysql</groupId>
 			<groupId>mysql</groupId>
@@ -68,7 +63,6 @@
 		<dependency>
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid</artifactId>
 			<artifactId>druid</artifactId>
-			<version>${druid.version}</version>
 		</dependency>
 		</dependency>
 		<dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<groupId>org.hibernate</groupId>
@@ -83,24 +77,20 @@
 		<dependency>
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
 			<groupId>org.apache.lucene</groupId>
 			<artifactId>lucene-core</artifactId>
 			<artifactId>lucene-core</artifactId>
-			<version>${lucene.version}</version>
 		</dependency>
 		</dependency>
 		<dependency>
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
 			<groupId>org.apache.lucene</groupId>
 			<artifactId>lucene-queryparser</artifactId>
 			<artifactId>lucene-queryparser</artifactId>
-			<version>${lucene.version}</version>
 		</dependency>
 		</dependency>
 		<dependency>
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
 			<groupId>org.apache.lucene</groupId>
 			<artifactId>lucene-analyzers-common</artifactId>
 			<artifactId>lucene-analyzers-common</artifactId>
-			<version>${lucene.version}</version>
 		</dependency>
 		</dependency>
 
 
 		<!-- IKAnalyzer -->
 		<!-- IKAnalyzer -->
 		<dependency>
 		<dependency>
 			<groupId>org.wltea.analyzer</groupId>
 			<groupId>org.wltea.analyzer</groupId>
 			<artifactId>IKAnalyzer</artifactId>
 			<artifactId>IKAnalyzer</artifactId>
-			<version>${ikanalyzer.version}</version>
 		</dependency>
 		</dependency>
 	</dependencies>
 	</dependencies>
 
 
@@ -123,19 +113,4 @@
 			</plugin>
 			</plugin>
 		</plugins>
 		</plugins>
 	</build>
 	</build>
-
-	<distributionManagement>
-		<!-- 发布release仓库 -->
-		<repository>
-			<id>platform-release</id>
-			<name>platform-release</name>
-			<url>http://113.105.74.141:8081/artifactory/libs-release-local</url>
-		</repository>
-		<!-- 发布快照版本 -->
-		<snapshotRepository>
-			<id>platform-snapshots</id>
-			<name>platform-snapshots</name>
-			<url>http://113.105.74.141:8081/artifactory/libs-snapshot-local</url>
-		</snapshotRepository>
-	</distributionManagement>
 </project>
 </project>

+ 40 - 43
pom.xml

@@ -22,6 +22,20 @@
 			<activation>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			</activation>
+			<modules>
+				<module>mall-search</module>
+				<module>search-api-b2b</module>
+				<module>search-console-b2b</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>b2c_release</id>
+			<modules>
+				<module>mall-search</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>b2b_release</id>
 			<modules>
 			<modules>
 				<module>search-api-b2b</module>
 				<module>search-api-b2b</module>
 				<module>search-console-b2b</module>
 				<module>search-console-b2b</module>
@@ -35,29 +49,25 @@
 		<java.source.version>1.7</java.source.version>
 		<java.source.version>1.7</java.source.version>
 		<java.target.version>1.7</java.target.version>
 		<java.target.version>1.7</java.target.version>
 		<maven.compiler.plugin.version>2.3.2</maven.compiler.plugin.version>
 		<maven.compiler.plugin.version>2.3.2</maven.compiler.plugin.version>
+		<search.common.version>0.1.9-SNAPSHOT</search.common.version>
 		<dubbo.version>2.8.4</dubbo.version>
 		<dubbo.version>2.8.4</dubbo.version>
 		<zookeeper.version>3.4.6</zookeeper.version>
 		<zookeeper.version>3.4.6</zookeeper.version>
-		<servlet.version>3.0-alpha-1</servlet.version>
 		<fastjson.version>1.2.15</fastjson.version>
 		<fastjson.version>1.2.15</fastjson.version>
 		<zkclient.version>0.1</zkclient.version>
 		<zkclient.version>0.1</zkclient.version>
-		<commons.logging.version>1.1.1</commons.logging.version>
 		<druid.version>1.0.24</druid.version>
 		<druid.version>1.0.24</druid.version>
+		<hibernate.ehcache.version>4.3.7.Final</hibernate.ehcache.version>
 		<oracle.jdbc.version>11.2.0</oracle.jdbc.version>
 		<oracle.jdbc.version>11.2.0</oracle.jdbc.version>
 		<jms.version>1.1</jms.version>
 		<jms.version>1.1</jms.version>
+		<lucene.version>5.2.0</lucene.version>
+		<ikanalyzer.version>2012_v5</ikanalyzer.version>
 	</properties>
 	</properties>
 
 
 	<dependencyManagement>
 	<dependencyManagement>
 		<dependencies>
 		<dependencies>
-			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>servlet-api</artifactId>
-				<version>${servlet.version}</version>
-				<scope>provided</scope>
-			</dependency>
 			<dependency>
 			<dependency>
 				<groupId>com.uas.search</groupId>
 				<groupId>com.uas.search</groupId>
 				<artifactId>search-common</artifactId>
 				<artifactId>search-common</artifactId>
-				<version>${project.version}</version>
+				<version>${search.common.version}</version>
 			</dependency>
 			</dependency>
 			<dependency>
 			<dependency>
 				<groupId>junit</groupId>
 				<groupId>junit</groupId>
@@ -93,12 +103,6 @@
 				<artifactId>fastjson</artifactId>
 				<artifactId>fastjson</artifactId>
 				<version>${fastjson.version}</version>
 				<version>${fastjson.version}</version>
 			</dependency>
 			</dependency>
-			<!-- hessian -->
-			<dependency>
-				<groupId>com.caucho</groupId>
-				<artifactId>hessian</artifactId>
-				<version>${hession.version}</version>
-			</dependency>
 			<!-- zookeeper -->
 			<!-- zookeeper -->
 			<dependency>
 			<dependency>
 				<groupId>org.apache.zookeeper</groupId>
 				<groupId>org.apache.zookeeper</groupId>
@@ -116,46 +120,39 @@
 				<artifactId>druid</artifactId>
 				<artifactId>druid</artifactId>
 				<version>${druid.version}</version>
 				<version>${druid.version}</version>
 			</dependency>
 			</dependency>
-			<!-- hibernate -->
 			<dependency>
 			<dependency>
 				<groupId>org.hibernate</groupId>
 				<groupId>org.hibernate</groupId>
-				<artifactId>hibernate-core</artifactId>
-				<version>4.3.7.Final</version>
+				<artifactId>hibernate-ehcache</artifactId>
+				<version>${hibernate.ehcache.version}</version>
 			</dependency>
 			</dependency>
 			<dependency>
 			<dependency>
-				<groupId>org.hibernate</groupId>
-				<artifactId>hibernate-entitymanager</artifactId>
-				<version>4.3.7.Final</version>
-				<exclusions>
-					<exclusion>
-						<groupId>cglib</groupId>
-						<artifactId>cglib</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>dom4j</groupId>
-						<artifactId>dom4j</artifactId>
-					</exclusion>
-				</exclusions>
+				<groupId>javax.jms</groupId>
+				<artifactId>jms</artifactId>
+				<version>${jms.version}</version>
 			</dependency>
 			</dependency>
+
+			<!-- lucene -->
 			<dependency>
 			<dependency>
-				<groupId>org.hibernate.javax.persistence</groupId>
-				<artifactId>hibernate-jpa-2.1-api</artifactId>
-				<version>1.0.0.Final</version>
+				<groupId>org.apache.lucene</groupId>
+				<artifactId>lucene-core</artifactId>
+				<version>${lucene.version}</version>
 			</dependency>
 			</dependency>
 			<dependency>
 			<dependency>
-				<groupId>org.hibernate</groupId>
-				<artifactId>hibernate-ehcache</artifactId>
-				<version>4.3.7.Final</version>
+				<groupId>org.apache.lucene</groupId>
+				<artifactId>lucene-queryparser</artifactId>
+				<version>${lucene.version}</version>
 			</dependency>
 			</dependency>
 			<dependency>
 			<dependency>
-				<groupId>commons-collections</groupId>
-				<artifactId>commons-collections</artifactId>
-				<version>3.2.1</version>
+				<groupId>org.apache.lucene</groupId>
+				<artifactId>lucene-analyzers-common</artifactId>
+				<version>${lucene.version}</version>
 			</dependency>
 			</dependency>
+
+			<!-- IKAnalyzer -->
 			<dependency>
 			<dependency>
-				<groupId>javax.jms</groupId>
-				<artifactId>jms</artifactId>
-				<version>${jms.version}</version>
+				<groupId>org.wltea.analyzer</groupId>
+				<artifactId>IKAnalyzer</artifactId>
+				<version>${ikanalyzer.version}</version>
 			</dependency>
 			</dependency>
 		</dependencies>
 		</dependencies>
 	</dependencyManagement>
 	</dependencyManagement>

+ 38 - 73
search-console-b2b/pom.xml

@@ -10,10 +10,12 @@
 	</parent>
 	</parent>
 	<artifactId>search-console-b2b</artifactId>
 	<artifactId>search-console-b2b</artifactId>
 	<packaging>war</packaging>
 	<packaging>war</packaging>
-	<name>search-console-b2b Maven Webapp</name>
-	<url>http://maven.apache.org</url>
+
+	<properties>
+		<platform.core.version>0.0.1-SNAPSHOT</platform.core.version>
+	</properties>
+
 	<dependencies>
 	<dependencies>
-		<!-- spring boot -->
 		<dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
@@ -26,16 +28,13 @@
 			<groupId>org.springframework.boot</groupId>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
 			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
 		</dependency>
-
 		<dependency>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context-support</artifactId>
 		</dependency>
 		</dependency>
-
 		<dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-context-support</artifactId>
+			<artifactId>spring-tx</artifactId>
 		</dependency>
 		</dependency>
 
 
 		<dependency>
 		<dependency>
@@ -63,6 +62,18 @@
 			<groupId>com.uas.search</groupId>
 			<groupId>com.uas.search</groupId>
 			<artifactId>search-common</artifactId>
 			<artifactId>search-common</artifactId>
 		</dependency>
 		</dependency>
+		<!-- platform-core -->
+		<dependency>
+			<groupId>com.uas.platform</groupId>
+			<artifactId>platform-core</artifactId>
+			<version>${platform.core.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>*</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 
 
 		<!-- dubbo -->
 		<!-- dubbo -->
 		<dependency>
 		<dependency>
@@ -80,30 +91,11 @@
 			<artifactId>zkclient</artifactId>
 			<artifactId>zkclient</artifactId>
 		</dependency>
 		</dependency>
 
 
-		<!-- lucene -->
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-core</artifactId>
-			<version>5.2.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-queryparser</artifactId>
-			<version>5.2.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.lucene</groupId>
-			<artifactId>lucene-analyzers-common</artifactId>
-			<version>5.2.0</version>
-		</dependency>
-
-		<!-- IKAnalyzer -->
+		<!-- jdbc -->
 		<dependency>
 		<dependency>
-			<groupId>org.wltea.analyzer</groupId>
-			<artifactId>IKAnalyzer</artifactId>
-			<version>2012_v5</version>
+			<groupId>com.oracle</groupId>
+			<artifactId>ojdbc6</artifactId>
 		</dependency>
 		</dependency>
-
 		<!-- Lucene实时建索引时用于监听Oracle消息队列 -->
 		<!-- Lucene实时建索引时用于监听Oracle消息队列 -->
 		<dependency>
 		<dependency>
 			<groupId>javax.jms</groupId>
 			<groupId>javax.jms</groupId>
@@ -115,65 +107,38 @@
 			<artifactId>aqapi</artifactId>
 			<artifactId>aqapi</artifactId>
 			<version>1.0</version>
 			<version>1.0</version>
 		</dependency>
 		</dependency>
-
-		<!-- hibernate -->
+		<!-- druid -->
 		<dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core</artifactId>
+			<groupId>com.alibaba</groupId>
+			<artifactId>druid</artifactId>
 		</dependency>
 		</dependency>
 		<dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>cglib</groupId>
-					<artifactId>cglib</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>dom4j</groupId>
-					<artifactId>dom4j</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate.javax.persistence</groupId>
-			<artifactId>hibernate-jpa-2.1-api</artifactId>
+			<artifactId>hibernate-ehcache</artifactId>
 		</dependency>
 		</dependency>
 		<dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-ehcache</artifactId>
+			<artifactId>hibernate-entitymanager</artifactId>
 		</dependency>
 		</dependency>
 
 
-		<!-- jdbc -->
+		<!-- lucene -->
 		<dependency>
 		<dependency>
-			<groupId>com.oracle</groupId>
-			<artifactId>ojdbc6</artifactId>
+			<groupId>org.apache.lucene</groupId>
+			<artifactId>lucene-core</artifactId>
 		</dependency>
 		</dependency>
-
-		<!-- druid -->
 		<dependency>
 		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>druid</artifactId>
+			<groupId>org.apache.lucene</groupId>
+			<artifactId>lucene-queryparser</artifactId>
 		</dependency>
 		</dependency>
-
-		<!-- platform-core -->
 		<dependency>
 		<dependency>
-			<groupId>com.uas.platform</groupId>
-			<artifactId>platform-core</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
-			<exclusions>
-				<exclusion>
-					<groupId>*</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-			</exclusions>
+			<groupId>org.apache.lucene</groupId>
+			<artifactId>lucene-analyzers-common</artifactId>
 		</dependency>
 		</dependency>
 
 
-		<!-- 文件上传 -->
+		<!-- IKAnalyzer -->
 		<dependency>
 		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-			<version>1.3.2</version>
+			<groupId>org.wltea.analyzer</groupId>
+			<artifactId>IKAnalyzer</artifactId>
 		</dependency>
 		</dependency>
 	</dependencies>
 	</dependencies>
 	<build>
 	<build>