Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore
# Conflicts: # common/yohoufo-fore-common.iml # order/yohoufo-fore-order.iml # payment/yohoufo-fore-payment.iml
Showing
7 changed files
with
203 additions
and
108 deletions
@@ -16,7 +16,6 @@ | @@ -16,7 +16,6 @@ | ||
16 | </content> | 16 | </content> |
17 | <orderEntry type="inheritedJdk" /> | 17 | <orderEntry type="inheritedJdk" /> |
18 | <orderEntry type="sourceFolder" forTests="false" /> | 18 | <orderEntry type="sourceFolder" forTests="false" /> |
19 | -<<<<<<< HEAD | ||
20 | <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.4-SNAPSHOT" level="project" /> | 19 | <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.4-SNAPSHOT" level="project" /> |
21 | <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config:1.4.4-SNAPSHOT" level="project" /> | 20 | <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config:1.4.4-SNAPSHOT" level="project" /> |
22 | <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.4-SNAPSHOT" level="project" /> | 21 | <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.4-SNAPSHOT" level="project" /> |
@@ -30,9 +29,15 @@ | @@ -30,9 +29,15 @@ | ||
30 | <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.4-SNAPSHOT" level="project" /> | 29 | <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.4-SNAPSHOT" level="project" /> |
31 | <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.4-SNAPSHOT" level="project" /> | 30 | <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.4-SNAPSHOT" level="project" /> |
32 | <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.4-SNAPSHOT" level="project" /> | 31 | <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.4-SNAPSHOT" level="project" /> |
33 | -======= | ||
34 | ->>>>>>> 1f89a7ae07f35940011ae205122cddcb4f458e17 | ||
35 | <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.5-SNAPSHOT" level="project" /> | 32 | <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.5-SNAPSHOT" level="project" /> |
33 | + <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" /> | ||
34 | + <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" /> | ||
35 | + <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
36 | + <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> | ||
37 | + <orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
38 | + <orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
39 | + <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
40 | + <orderEntry type="module" module-name="yoho-core-trace" /> | ||
36 | <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" /> | 41 | <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" /> |
37 | <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" /> | 42 | <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" /> |
38 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" /> | 43 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" /> |
@@ -47,33 +52,31 @@ | @@ -47,33 +52,31 @@ | ||
47 | <orderEntry type="library" name="Maven: com.esotericsoftware:kryo-shaded:3.0.3" level="project" /> | 52 | <orderEntry type="library" name="Maven: com.esotericsoftware:kryo-shaded:3.0.3" level="project" /> |
48 | <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" /> | 53 | <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" /> |
49 | <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" /> | 54 | <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" /> |
50 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config:1.4.5-SNAPSHOT" level="project" /> | 55 | + <orderEntry type="module" module-name="yoho-core-config" /> |
51 | <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" /> | 56 | <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" /> |
52 | <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" /> | 57 | <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" /> |
53 | <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" /> | 58 | <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" /> |
54 | <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" /> | 59 | <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" /> |
55 | <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.9.1" level="project" /> | 60 | <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.9.1" level="project" /> |
56 | <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.9.1" level="project" /> | 61 | <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.9.1" level="project" /> |
57 | -<<<<<<< HEAD | ||
58 | <orderEntry type="module" module-name="error-code" /> | 62 | <orderEntry type="module" module-name="error-code" /> |
59 | -======= | ||
60 | <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" /> | 63 | <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" /> |
61 | ->>>>>>> 1f89a7ae07f35940011ae205122cddcb4f458e17 | ||
62 | <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" /> | 64 | <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" /> |
65 | + <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" /> | ||
63 | <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" /> | 66 | <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" /> |
64 | <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" /> | 67 | <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" /> |
65 | <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" /> | 68 | <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" /> |
66 | <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" /> | 69 | <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" /> |
67 | <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" /> | 70 | <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" /> |
68 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.5-SNAPSHOT" level="project" /> | 71 | + <orderEntry type="module" module-name="yoho-core-common" /> |
69 | <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" /> | 72 | <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" /> |
70 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" /> | 73 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" /> |
71 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" /> | 74 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" /> |
72 | <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" /> | 75 | <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" /> |
73 | <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" /> | 76 | <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" /> |
74 | <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" /> | 77 | <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" /> |
75 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-redis-cluster:1.4.5-SNAPSHOT" level="project" /> | ||
76 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config-client:1.4.5-SNAPSHOT" level="project" /> | 78 | + <orderEntry type="module" module-name="yoho-core-redis-cluster" /> |
79 | + <orderEntry type="module" module-name="yoho-core-config-client" /> | ||
77 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" /> | 80 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" /> |
78 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" /> | 81 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" /> |
79 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" /> | 82 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" /> |
@@ -91,9 +94,9 @@ | @@ -91,9 +94,9 @@ | ||
91 | <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" /> | 94 | <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" /> |
92 | <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" /> | 95 | <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" /> |
93 | <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.8.1" level="project" /> | 96 | <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.8.1" level="project" /> |
94 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-client-simple:1.4.5-SNAPSHOT" level="project" /> | 97 | + <orderEntry type="module" module-name="yoho-core-rest-client-simple" /> |
95 | <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" /> | 98 | <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" /> |
96 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-common:1.4.5-SNAPSHOT" level="project" /> | 99 | + <orderEntry type="module" module-name="yoho-core-rest-common" /> |
97 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" /> | 100 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" /> |
98 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" /> | 101 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" /> |
99 | <orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.4.4" level="project" /> | 102 | <orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.4.4" level="project" /> |
@@ -103,13 +106,13 @@ | @@ -103,13 +106,13 @@ | ||
103 | <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" /> | 106 | <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" /> |
104 | <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" /> | 107 | <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" /> |
105 | <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" /> | 108 | <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" /> |
106 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-alarm:1.4.5-SNAPSHOT" level="project" /> | ||
107 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance:1.4.5-SNAPSHOT" level="project" /> | ||
108 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance-model:1.4.5-SNAPSHOT" level="project" /> | 109 | + <orderEntry type="module" module-name="yoho-core-alarm" /> |
110 | + <orderEntry type="module" module-name="yoho-core-rest-governance" /> | ||
111 | + <orderEntry type="module" module-name="yoho-core-rest-governance-model" /> | ||
109 | <orderEntry type="library" name="Maven: org.apache.curator:curator-x-discovery:2.9.1" level="project" /> | 112 | <orderEntry type="library" name="Maven: org.apache.curator:curator-x-discovery:2.9.1" level="project" /> |
110 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" /> | 113 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" /> |
111 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" /> | 114 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" /> |
112 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.5-SNAPSHOT" level="project" /> | 115 | + <orderEntry type="module" module-name="yoho-core-cache" /> |
113 | <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" /> | 116 | <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" /> |
114 | <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" /> | 117 | <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" /> |
115 | <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" /> | 118 | <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" /> |
@@ -139,7 +142,6 @@ | @@ -139,7 +142,6 @@ | ||
139 | <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" /> | 142 | <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" /> |
140 | <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" /> | 143 | <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" /> |
141 | <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" /> | 144 | <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" /> |
142 | - <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" /> | ||
143 | <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> | 145 | <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> |
144 | <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" /> | 146 | <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" /> |
145 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" /> | 147 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" /> |
@@ -157,27 +159,24 @@ | @@ -157,27 +159,24 @@ | ||
157 | <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" /> | 159 | <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" /> |
158 | <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" /> | 160 | <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" /> |
159 | <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" /> | 161 | <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" /> |
160 | -<<<<<<< HEAD | ||
161 | <orderEntry type="module" module-name="uic-service-model" /> | 162 | <orderEntry type="module" module-name="uic-service-model" /> |
162 | -======= | ||
163 | <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.5-SNAPSHOT" level="project" /> | 163 | <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.5-SNAPSHOT" level="project" /> |
164 | ->>>>>>> 1f89a7ae07f35940011ae205122cddcb4f458e17 | 164 | + <orderEntry type="module" module-name="uic-service-model" /> |
165 | <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.5-SNAPSHOT" level="project" /> | 165 | <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.5-SNAPSHOT" level="project" /> |
166 | <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" /> | 166 | <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" /> |
167 | <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" /> | 167 | <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" /> |
168 | <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> | 168 | <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> |
169 | - <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> | ||
170 | <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" /> | 169 | <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" /> |
171 | <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" /> | 170 | <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" /> |
172 | <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" /> | 171 | <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" /> |
173 | -<<<<<<< HEAD | ||
174 | <orderEntry type="module" module-name="resource-service-model" /> | 172 | <orderEntry type="module" module-name="resource-service-model" /> |
175 | <orderEntry type="module" module-name="users-service-model" /> | 173 | <orderEntry type="module" module-name="users-service-model" /> |
176 | <orderEntry type="module" module-name="shops-service-model" /> | 174 | <orderEntry type="module" module-name="shops-service-model" /> |
177 | -======= | ||
178 | <orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.5-SNAPSHOT" level="project" /> | 175 | <orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.5-SNAPSHOT" level="project" /> |
179 | <orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.5-SNAPSHOT" level="project" /> | 176 | <orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.5-SNAPSHOT" level="project" /> |
180 | <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.5-SNAPSHOT" level="project" /> | 177 | <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.5-SNAPSHOT" level="project" /> |
181 | ->>>>>>> 1f89a7ae07f35940011ae205122cddcb4f458e17 | 178 | + <orderEntry type="module" module-name="resource-service-model" /> |
179 | + <orderEntry type="module" module-name="users-service-model" /> | ||
180 | + <orderEntry type="module" module-name="shops-service-model" /> | ||
182 | </component> | 181 | </component> |
183 | </module> | 182 | </module> |
@@ -10,6 +10,12 @@ | @@ -10,6 +10,12 @@ | ||
10 | </content> | 10 | </content> |
11 | <orderEntry type="inheritedJdk" /> | 11 | <orderEntry type="inheritedJdk" /> |
12 | <orderEntry type="sourceFolder" forTests="false" /> | 12 | <orderEntry type="sourceFolder" forTests="false" /> |
13 | + <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" /> | ||
14 | + <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
15 | + <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> | ||
16 | + <orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
17 | + <orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
18 | + <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
13 | <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" /> | 19 | <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" /> |
14 | <orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.1.1" level="project" /> | 20 | <orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.1.1" level="project" /> |
15 | <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" /> | 21 | <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" /> |
@@ -20,14 +26,13 @@ | @@ -20,14 +26,13 @@ | ||
20 | <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.6" level="project" /> | 26 | <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.6" level="project" /> |
21 | <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.30" level="project" /> | 27 | <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.30" level="project" /> |
22 | <orderEntry type="module" module-name="yohoufo-fore-common" /> | 28 | <orderEntry type="module" module-name="yohoufo-fore-common" /> |
23 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.5-SNAPSHOT" level="project" /> | 29 | + <orderEntry type="module" module-name="yoho-core-trace" /> |
24 | <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" /> | 30 | <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" /> |
25 | <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" /> | 31 | <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" /> |
26 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" /> | 32 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" /> |
27 | <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:1.5.1.RELEASE" level="project" /> | 33 | <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:1.5.1.RELEASE" level="project" /> |
28 | <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.8.RELEASE" level="project" /> | 34 | <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.8.RELEASE" level="project" /> |
29 | <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-core:4.3.8.RELEASE" level="project" /> | 35 | <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-core:4.3.8.RELEASE" level="project" /> |
30 | - <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.8.RELEASE" level="project" /> | ||
31 | <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.1.3.RELEASE" level="project" /> | 36 | <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.1.3.RELEASE" level="project" /> |
32 | <orderEntry type="library" name="Maven: org.springframework.kafka:spring-kafka:1.1.2.RELEASE" level="project" /> | 37 | <orderEntry type="library" name="Maven: org.springframework.kafka:spring-kafka:1.1.2.RELEASE" level="project" /> |
33 | <orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:0.10.1.1" level="project" /> | 38 | <orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:0.10.1.1" level="project" /> |
@@ -35,36 +40,23 @@ | @@ -35,36 +40,23 @@ | ||
35 | <orderEntry type="library" name="Maven: com.esotericsoftware:kryo-shaded:3.0.3" level="project" /> | 40 | <orderEntry type="library" name="Maven: com.esotericsoftware:kryo-shaded:3.0.3" level="project" /> |
36 | <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" /> | 41 | <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" /> |
37 | <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" /> | 42 | <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" /> |
38 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config:1.4.5-SNAPSHOT" level="project" /> | ||
39 | - <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" /> | ||
40 | - <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" /> | ||
41 | - <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" /> | ||
42 | - <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" /> | ||
43 | - <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> | ||
44 | - <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" /> | ||
45 | - <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.9.1" level="project" /> | ||
46 | - <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.9.1" level="project" /> | ||
47 | - <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" /> | ||
48 | - <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" /> | 43 | + <orderEntry type="module" module-name="error-code" /> |
49 | <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" /> | 44 | <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" /> |
50 | <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" /> | 45 | <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" /> |
51 | - <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" /> | ||
52 | <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" /> | 46 | <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" /> |
53 | - <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" /> | ||
54 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.5-SNAPSHOT" level="project" /> | 47 | + <orderEntry type="module" module-name="yoho-core-common" /> |
55 | <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" /> | 48 | <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" /> |
56 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" /> | 49 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" /> |
57 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" /> | 50 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" /> |
58 | <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" /> | 51 | <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" /> |
59 | <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" /> | 52 | <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" /> |
60 | <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" /> | 53 | <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" /> |
61 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-redis-cluster:1.4.5-SNAPSHOT" level="project" /> | ||
62 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config-client:1.4.5-SNAPSHOT" level="project" /> | 54 | + <orderEntry type="module" module-name="yoho-core-redis-cluster" /> |
55 | + <orderEntry type="module" module-name="yoho-core-config-client" /> | ||
63 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" /> | 56 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" /> |
64 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" /> | 57 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" /> |
65 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" /> | 58 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" /> |
66 | <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.3.8.RELEASE" level="project" /> | 59 | <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.3.8.RELEASE" level="project" /> |
67 | - <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.8.RELEASE" level="project" /> | ||
68 | <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" /> | 60 | <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" /> |
69 | <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:1.5.1.RELEASE" level="project" /> | 61 | <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:1.5.1.RELEASE" level="project" /> |
70 | <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:3.5.5" level="project" /> | 62 | <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:3.5.5" level="project" /> |
@@ -77,9 +69,9 @@ | @@ -77,9 +69,9 @@ | ||
77 | <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" /> | 69 | <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" /> |
78 | <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" /> | 70 | <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" /> |
79 | <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.8.1" level="project" /> | 71 | <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.8.1" level="project" /> |
80 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-client-simple:1.4.5-SNAPSHOT" level="project" /> | 72 | + <orderEntry type="module" module-name="yoho-core-rest-client-simple" /> |
81 | <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" /> | 73 | <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" /> |
82 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-common:1.4.5-SNAPSHOT" level="project" /> | 74 | + <orderEntry type="module" module-name="yoho-core-rest-common" /> |
83 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" /> | 75 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" /> |
84 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" /> | 76 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" /> |
85 | <orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.4.4" level="project" /> | 77 | <orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.4.4" level="project" /> |
@@ -89,13 +81,13 @@ | @@ -89,13 +81,13 @@ | ||
89 | <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" /> | 81 | <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" /> |
90 | <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" /> | 82 | <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" /> |
91 | <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" /> | 83 | <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" /> |
92 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-alarm:1.4.5-SNAPSHOT" level="project" /> | ||
93 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance:1.4.5-SNAPSHOT" level="project" /> | ||
94 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance-model:1.4.5-SNAPSHOT" level="project" /> | 84 | + <orderEntry type="module" module-name="yoho-core-alarm" /> |
85 | + <orderEntry type="module" module-name="yoho-core-rest-governance" /> | ||
86 | + <orderEntry type="module" module-name="yoho-core-rest-governance-model" /> | ||
95 | <orderEntry type="library" name="Maven: org.apache.curator:curator-x-discovery:2.9.1" level="project" /> | 87 | <orderEntry type="library" name="Maven: org.apache.curator:curator-x-discovery:2.9.1" level="project" /> |
96 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" /> | 88 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" /> |
97 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" /> | 89 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" /> |
98 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.5-SNAPSHOT" level="project" /> | 90 | + <orderEntry type="module" module-name="yoho-core-cache" /> |
99 | <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" /> | 91 | <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" /> |
100 | <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" /> | 92 | <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" /> |
101 | <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" /> | 93 | <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" /> |
@@ -138,16 +130,45 @@ | @@ -138,16 +130,45 @@ | ||
138 | <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" /> | 130 | <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" /> |
139 | <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" /> | 131 | <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" /> |
140 | <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" /> | 132 | <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" /> |
141 | - <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.5-SNAPSHOT" level="project" /> | 133 | + <orderEntry type="module" module-name="uic-service-model" /> |
142 | <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.5-SNAPSHOT" level="project" /> | 134 | <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.5-SNAPSHOT" level="project" /> |
143 | <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" /> | 135 | <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" /> |
144 | <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> | 136 | <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> |
145 | - <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> | ||
146 | <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" /> | 137 | <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" /> |
147 | <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" /> | 138 | <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" /> |
148 | <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" /> | 139 | <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" /> |
149 | - <orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
150 | - <orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
151 | - <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.5-SNAPSHOT" level="project" /> | 140 | + <orderEntry type="module" module-name="resource-service-model" /> |
141 | + <orderEntry type="module" module-name="users-service-model" /> | ||
142 | + <orderEntry type="module" module-name="shops-service-model" /> | ||
143 | + <orderEntry type="module" module-name="yoho-core-dal" /> | ||
144 | + <orderEntry type="module" module-name="yoho-core-config" /> | ||
145 | + <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" /> | ||
146 | + <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" /> | ||
147 | + <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" /> | ||
148 | + <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" /> | ||
149 | + <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> | ||
150 | + <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" /> | ||
151 | + <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.9.1" level="project" /> | ||
152 | + <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.9.1" level="project" /> | ||
153 | + <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" /> | ||
154 | + <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.8.RELEASE" level="project" /> | ||
155 | + <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.8.RELEASE" level="project" /> | ||
156 | + <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.8.RELEASE" level="project" /> | ||
157 | + <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" /> | ||
158 | + <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:1.4.2" level="project" /> | ||
159 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.10.2" level="project" /> | ||
160 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:4.10.2" level="project" /> | ||
161 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:4.10.2" level="project" /> | ||
162 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:4.10.2" level="project" /> | ||
163 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:4.10.2" level="project" /> | ||
164 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:4.10.2" level="project" /> | ||
165 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:4.10.2" level="project" /> | ||
166 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:4.10.2" level="project" /> | ||
167 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:4.10.2" level="project" /> | ||
168 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:4.10.2" level="project" /> | ||
169 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:4.10.2" level="project" /> | ||
170 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:4.10.2" level="project" /> | ||
171 | + <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.4.1" level="project" /> | ||
172 | + <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" /> | ||
152 | </component> | 173 | </component> |
153 | </module> | 174 | </module> |
order/.gitignore
0 → 100644
@@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
11 | <content url="file://$MODULE_DIR$"> | 11 | <content url="file://$MODULE_DIR$"> |
12 | <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> | 12 | <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> |
13 | <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> | 13 | <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> |
14 | - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> | 14 | + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> |
15 | <excludeFolder url="file://$MODULE_DIR$/target" /> | 15 | <excludeFolder url="file://$MODULE_DIR$/target" /> |
16 | </content> | 16 | </content> |
17 | <orderEntry type="inheritedJdk" /> | 17 | <orderEntry type="inheritedJdk" /> |
@@ -34,6 +34,16 @@ | @@ -34,6 +34,16 @@ | ||
34 | <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" /> | 34 | <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" /> |
35 | <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" /> | 35 | <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" /> |
36 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" /> | 36 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" /> |
37 | + <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" /> | ||
38 | + <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" /> | ||
39 | + <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
40 | + <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> | ||
41 | + <orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
42 | + <orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
43 | + <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
44 | + <orderEntry type="library" name="Maven: com.yoho.ufo.model:order-ufo-model:1.0-SNAPSHOT" level="project" /> | ||
45 | + <orderEntry type="module" module-name="yohoufo-fore-common" /> | ||
46 | + <orderEntry type="module" module-name="yoho-core-trace" /> | ||
37 | <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:1.5.1.RELEASE" level="project" /> | 47 | <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:1.5.1.RELEASE" level="project" /> |
38 | <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.8.RELEASE" level="project" /> | 48 | <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.8.RELEASE" level="project" /> |
39 | <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-core:4.3.8.RELEASE" level="project" /> | 49 | <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-core:4.3.8.RELEASE" level="project" /> |
@@ -60,22 +70,22 @@ | @@ -60,22 +70,22 @@ | ||
60 | <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" /> | 70 | <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" /> |
61 | <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" /> | 71 | <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" /> |
62 | <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" /> | 72 | <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" /> |
73 | + <orderEntry type="module" module-name="yoho-core-config" /> | ||
63 | <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.9.1" level="project" /> | 74 | <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.9.1" level="project" /> |
64 | - <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" /> | 75 | + <orderEntry type="module" module-name="error-code" /> |
65 | <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" /> | 76 | <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" /> |
66 | <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" /> | 77 | <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" /> |
67 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.5-SNAPSHOT" level="project" /> | 78 | + <orderEntry type="module" module-name="yoho-core-common" /> |
68 | <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" /> | 79 | <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" /> |
69 | <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" /> | 80 | <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" /> |
70 | <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" /> | 81 | <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" /> |
71 | <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" /> | 82 | <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" /> |
72 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-redis-cluster:1.4.5-SNAPSHOT" level="project" /> | ||
73 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config-client:1.4.5-SNAPSHOT" level="project" /> | 83 | + <orderEntry type="module" module-name="yoho-core-redis-cluster" /> |
84 | + <orderEntry type="module" module-name="yoho-core-config-client" /> | ||
74 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" /> | 85 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" /> |
75 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" /> | 86 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" /> |
76 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" /> | 87 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" /> |
77 | <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.3.8.RELEASE" level="project" /> | 88 | <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.3.8.RELEASE" level="project" /> |
78 | - <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.8.RELEASE" level="project" /> | ||
79 | <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" /> | 89 | <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" /> |
80 | <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:1.5.1.RELEASE" level="project" /> | 90 | <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:1.5.1.RELEASE" level="project" /> |
81 | <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:3.5.5" level="project" /> | 91 | <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:3.5.5" level="project" /> |
@@ -107,6 +117,7 @@ | @@ -107,6 +117,7 @@ | ||
107 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" /> | 117 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" /> |
108 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" /> | 118 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" /> |
109 | <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.5-SNAPSHOT" level="project" /> | 119 | <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.5-SNAPSHOT" level="project" /> |
120 | + <orderEntry type="module" module-name="yoho-core-cache" /> | ||
110 | <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" /> | 121 | <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" /> |
111 | <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" /> | 122 | <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" /> |
112 | <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" /> | 123 | <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" /> |
@@ -136,7 +147,6 @@ | @@ -136,7 +147,6 @@ | ||
136 | <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" /> | 147 | <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" /> |
137 | <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" /> | 148 | <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" /> |
138 | <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" /> | 149 | <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" /> |
139 | - <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" /> | ||
140 | <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> | 150 | <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> |
141 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" /> | 151 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" /> |
142 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" level="project" /> | 152 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" level="project" /> |
@@ -157,7 +167,6 @@ | @@ -157,7 +167,6 @@ | ||
157 | <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" /> | 167 | <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" /> |
158 | <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" /> | 168 | <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" /> |
159 | <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> | 169 | <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> |
160 | - <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> | ||
161 | <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" /> | 170 | <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" /> |
162 | <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" /> | 171 | <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" /> |
163 | <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" /> | 172 | <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" /> |
@@ -181,26 +190,39 @@ | @@ -181,26 +190,39 @@ | ||
181 | <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.5-SNAPSHOT" level="project" /> | 190 | <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.5-SNAPSHOT" level="project" /> |
182 | <orderEntry type="module" module-name="yohoufo-fore-dal" /> | 191 | <orderEntry type="module" module-name="yohoufo-fore-dal" /> |
183 | <orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.1.1" level="project" /> | 192 | <orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.1.1" level="project" /> |
193 | + <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" /> | ||
184 | <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" /> | 194 | <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" /> |
185 | <orderEntry type="library" name="Maven: commons-pool:commons-pool:20030825.183949" level="project" /> | 195 | <orderEntry type="library" name="Maven: commons-pool:commons-pool:20030825.183949" level="project" /> |
186 | <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" /> | 196 | <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" /> |
187 | <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.6" level="project" /> | 197 | <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.6" level="project" /> |
188 | <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.30" level="project" /> | 198 | <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.30" level="project" /> |
189 | - | 199 | + <orderEntry type="module" module-name="yoho-core-dal" /> |
200 | + <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.8.RELEASE" level="project" /> | ||
201 | + <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.8.RELEASE" level="project" /> | ||
202 | + <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:1.4.2" level="project" /> | ||
203 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.10.2" level="project" /> | ||
204 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:4.10.2" level="project" /> | ||
205 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:4.10.2" level="project" /> | ||
206 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:4.10.2" level="project" /> | ||
207 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:4.10.2" level="project" /> | ||
208 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:4.10.2" level="project" /> | ||
209 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:4.10.2" level="project" /> | ||
210 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:4.10.2" level="project" /> | ||
211 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:4.10.2" level="project" /> | ||
212 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:4.10.2" level="project" /> | ||
213 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:4.10.2" level="project" /> | ||
214 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:4.10.2" level="project" /> | ||
215 | + <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.4.1" level="project" /> | ||
190 | <orderEntry type="module" module-name="order-ufo-model" /> | 216 | <orderEntry type="module" module-name="order-ufo-model" /> |
191 | <orderEntry type="module" module-name="yohoufo-fore-product" /> | 217 | <orderEntry type="module" module-name="yohoufo-fore-product" /> |
192 | <orderEntry type="module" module-name="yoho-core-rest-client-simple" /> | 218 | <orderEntry type="module" module-name="yoho-core-rest-client-simple" /> |
193 | - | ||
194 | - <orderEntry type="library" name="Maven: com.yoho.ufo.model:order-ufo-model:1.0-SNAPSHOT" level="project" /> | ||
195 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-client-simple:1.4.5-SNAPSHOT" level="project" /> | ||
196 | - | ||
197 | <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" /> | 219 | <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" /> |
198 | <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" /> | 220 | <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" /> |
199 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" /> | 221 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" /> |
200 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" /> | 222 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" /> |
201 | <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" /> | 223 | <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" /> |
202 | <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" /> | 224 | <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" /> |
203 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-common:1.4.5-SNAPSHOT" level="project" /> | 225 | + <orderEntry type="module" module-name="yoho-core-rest-common" /> |
204 | <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.9.1" level="project" /> | 226 | <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.9.1" level="project" /> |
205 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" /> | 227 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" /> |
206 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" /> | 228 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" /> |
@@ -211,9 +233,9 @@ | @@ -211,9 +233,9 @@ | ||
211 | <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" /> | 233 | <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" /> |
212 | <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" /> | 234 | <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" /> |
213 | <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" /> | 235 | <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" /> |
214 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-alarm:1.4.5-SNAPSHOT" level="project" /> | ||
215 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance:1.4.5-SNAPSHOT" level="project" /> | ||
216 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance-model:1.4.5-SNAPSHOT" level="project" /> | 236 | + <orderEntry type="module" module-name="yoho-core-alarm" /> |
237 | + <orderEntry type="module" module-name="yoho-core-rest-governance" /> | ||
238 | + <orderEntry type="module" module-name="yoho-core-rest-governance-model" /> | ||
217 | <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" /> | 239 | <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" /> |
218 | <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" /> | 240 | <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" /> |
219 | <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" /> | 241 | <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" /> |
@@ -30,6 +30,16 @@ | @@ -30,6 +30,16 @@ | ||
30 | <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.4-SNAPSHOT" level="project" /> | 30 | <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.4-SNAPSHOT" level="project" /> |
31 | <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.4-SNAPSHOT" level="project" /> | 31 | <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.4-SNAPSHOT" level="project" /> |
32 | <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.5-SNAPSHOT" level="project" /> | 32 | <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.5-SNAPSHOT" level="project" /> |
33 | + <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" /> | ||
34 | + <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" /> | ||
35 | + <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
36 | + <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> | ||
37 | + <orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
38 | + <orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
39 | + <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
40 | + <orderEntry type="library" name="Maven: com.yoho.ufo.model:order-ufo-model:1.0-SNAPSHOT" level="project" /> | ||
41 | + <orderEntry type="module" module-name="yohoufo-fore-common" /> | ||
42 | + <orderEntry type="module" module-name="yoho-core-trace" /> | ||
33 | <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" /> | 43 | <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" /> |
34 | <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" /> | 44 | <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" /> |
35 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" /> | 45 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" /> |
@@ -44,7 +54,7 @@ | @@ -44,7 +54,7 @@ | ||
44 | <orderEntry type="library" name="Maven: com.esotericsoftware:kryo-shaded:3.0.3" level="project" /> | 54 | <orderEntry type="library" name="Maven: com.esotericsoftware:kryo-shaded:3.0.3" level="project" /> |
45 | <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" /> | 55 | <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" /> |
46 | <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" /> | 56 | <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" /> |
47 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config:1.4.5-SNAPSHOT" level="project" /> | 57 | + <orderEntry type="module" module-name="yoho-core-config" /> |
48 | <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" /> | 58 | <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" /> |
49 | <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" /> | 59 | <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" /> |
50 | <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" /> | 60 | <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" /> |
@@ -54,20 +64,21 @@ | @@ -54,20 +64,21 @@ | ||
54 | <orderEntry type="module" module-name="error-code" /> | 64 | <orderEntry type="module" module-name="error-code" /> |
55 | <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" /> | 65 | <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" /> |
56 | <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" /> | 66 | <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" /> |
67 | + <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" /> | ||
57 | <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" /> | 68 | <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" /> |
58 | <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" /> | 69 | <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" /> |
59 | <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" /> | 70 | <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" /> |
60 | <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" /> | 71 | <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" /> |
61 | <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" /> | 72 | <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" /> |
62 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.5-SNAPSHOT" level="project" /> | 73 | + <orderEntry type="module" module-name="yoho-core-common" /> |
63 | <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" /> | 74 | <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" /> |
64 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" /> | 75 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" /> |
65 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" /> | 76 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" /> |
66 | <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" /> | 77 | <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" /> |
67 | <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" /> | 78 | <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" /> |
68 | <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" /> | 79 | <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" /> |
69 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-redis-cluster:1.4.5-SNAPSHOT" level="project" /> | ||
70 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config-client:1.4.5-SNAPSHOT" level="project" /> | 80 | + <orderEntry type="module" module-name="yoho-core-redis-cluster" /> |
81 | + <orderEntry type="module" module-name="yoho-core-config-client" /> | ||
71 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" /> | 82 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" /> |
72 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" /> | 83 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" /> |
73 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" /> | 84 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" /> |
@@ -85,9 +96,9 @@ | @@ -85,9 +96,9 @@ | ||
85 | <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" /> | 96 | <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" /> |
86 | <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" /> | 97 | <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" /> |
87 | <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.8.1" level="project" /> | 98 | <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.8.1" level="project" /> |
88 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-client-simple:1.4.5-SNAPSHOT" level="project" /> | 99 | + <orderEntry type="module" module-name="yoho-core-rest-client-simple" /> |
89 | <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" /> | 100 | <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" /> |
90 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-common:1.4.5-SNAPSHOT" level="project" /> | 101 | + <orderEntry type="module" module-name="yoho-core-rest-common" /> |
91 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" /> | 102 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" /> |
92 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" /> | 103 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" /> |
93 | <orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.4.4" level="project" /> | 104 | <orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.4.4" level="project" /> |
@@ -97,13 +108,13 @@ | @@ -97,13 +108,13 @@ | ||
97 | <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" /> | 108 | <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" /> |
98 | <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" /> | 109 | <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" /> |
99 | <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" /> | 110 | <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" /> |
100 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-alarm:1.4.5-SNAPSHOT" level="project" /> | ||
101 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance:1.4.5-SNAPSHOT" level="project" /> | ||
102 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance-model:1.4.5-SNAPSHOT" level="project" /> | 111 | + <orderEntry type="module" module-name="yoho-core-alarm" /> |
112 | + <orderEntry type="module" module-name="yoho-core-rest-governance" /> | ||
113 | + <orderEntry type="module" module-name="yoho-core-rest-governance-model" /> | ||
103 | <orderEntry type="library" name="Maven: org.apache.curator:curator-x-discovery:2.9.1" level="project" /> | 114 | <orderEntry type="library" name="Maven: org.apache.curator:curator-x-discovery:2.9.1" level="project" /> |
104 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" /> | 115 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" /> |
105 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" /> | 116 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" /> |
106 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.5-SNAPSHOT" level="project" /> | 117 | + <orderEntry type="module" module-name="yoho-core-cache" /> |
107 | <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" /> | 118 | <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" /> |
108 | <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" /> | 119 | <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" /> |
109 | <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" /> | 120 | <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" /> |
@@ -133,7 +144,6 @@ | @@ -133,7 +144,6 @@ | ||
133 | <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" /> | 144 | <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" /> |
134 | <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" /> | 145 | <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" /> |
135 | <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" /> | 146 | <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" /> |
136 | - <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" /> | ||
137 | <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> | 147 | <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> |
138 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" /> | 148 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" /> |
139 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" level="project" /> | 149 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" level="project" /> |
@@ -154,7 +164,6 @@ | @@ -154,7 +164,6 @@ | ||
154 | <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" /> | 164 | <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" /> |
155 | <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" /> | 165 | <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" /> |
156 | <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> | 166 | <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> |
157 | - <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> | ||
158 | <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" /> | 167 | <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" /> |
159 | <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" /> | 168 | <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" /> |
160 | <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" /> | 169 | <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" /> |
@@ -176,10 +185,24 @@ | @@ -176,10 +185,24 @@ | ||
176 | <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" /> | 185 | <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" /> |
177 | <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.6" level="project" /> | 186 | <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.6" level="project" /> |
178 | <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.30" level="project" /> | 187 | <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.30" level="project" /> |
188 | + <orderEntry type="module" module-name="yoho-core-dal" /> | ||
189 | + <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.8.RELEASE" level="project" /> | ||
190 | + <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:1.4.2" level="project" /> | ||
191 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.10.2" level="project" /> | ||
192 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:4.10.2" level="project" /> | ||
193 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:4.10.2" level="project" /> | ||
194 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:4.10.2" level="project" /> | ||
195 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:4.10.2" level="project" /> | ||
196 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:4.10.2" level="project" /> | ||
197 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:4.10.2" level="project" /> | ||
198 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:4.10.2" level="project" /> | ||
199 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:4.10.2" level="project" /> | ||
200 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:4.10.2" level="project" /> | ||
201 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:4.10.2" level="project" /> | ||
202 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:4.10.2" level="project" /> | ||
203 | + <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.4.1" level="project" /> | ||
179 | <orderEntry type="module" module-name="order-ufo-model" /> | 204 | <orderEntry type="module" module-name="order-ufo-model" /> |
180 | <orderEntry type="module" module-name="yohoufo-fore-product" /> | 205 | <orderEntry type="module" module-name="yohoufo-fore-product" /> |
181 | - <orderEntry type="library" name="Maven: com.yoho.ufo.model:order-ufo-model:1.0-SNAPSHOT" level="project" /> | ||
182 | - | ||
183 | <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" /> | 206 | <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" /> |
184 | <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" /> | 207 | <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" /> |
185 | <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> | 208 | <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> |
@@ -10,8 +10,15 @@ | @@ -10,8 +10,15 @@ | ||
10 | </content> | 10 | </content> |
11 | <orderEntry type="inheritedJdk" /> | 11 | <orderEntry type="inheritedJdk" /> |
12 | <orderEntry type="sourceFolder" forTests="false" /> | 12 | <orderEntry type="sourceFolder" forTests="false" /> |
13 | + <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" /> | ||
14 | + <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" /> | ||
15 | + <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
16 | + <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> | ||
17 | + <orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
18 | + <orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
19 | + <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
13 | <orderEntry type="module" module-name="yohoufo-fore-common" /> | 20 | <orderEntry type="module" module-name="yohoufo-fore-common" /> |
14 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-trace:1.4.5-SNAPSHOT" level="project" /> | 21 | + <orderEntry type="module" module-name="yoho-core-trace" /> |
15 | <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" /> | 22 | <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.21" level="project" /> |
16 | <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" /> | 23 | <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.0.14" level="project" /> |
17 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" /> | 24 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.3" level="project" /> |
@@ -26,7 +33,7 @@ | @@ -26,7 +33,7 @@ | ||
26 | <orderEntry type="library" name="Maven: com.esotericsoftware:kryo-shaded:3.0.3" level="project" /> | 33 | <orderEntry type="library" name="Maven: com.esotericsoftware:kryo-shaded:3.0.3" level="project" /> |
27 | <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" /> | 34 | <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" /> |
28 | <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" /> | 35 | <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" /> |
29 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config:1.4.5-SNAPSHOT" level="project" /> | 36 | + <orderEntry type="module" module-name="yoho-core-config" /> |
30 | <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" /> | 37 | <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-zookeeper:0.7.3" level="project" /> |
31 | <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" /> | 38 | <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" /> |
32 | <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" /> | 39 | <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" /> |
@@ -35,27 +42,26 @@ | @@ -35,27 +42,26 @@ | ||
35 | <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" /> | 42 | <orderEntry type="library" name="Maven: io.netty:netty:3.7.0.Final" level="project" /> |
36 | <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.9.1" level="project" /> | 43 | <orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.9.1" level="project" /> |
37 | <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.9.1" level="project" /> | 44 | <orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.9.1" level="project" /> |
38 | - <orderEntry type="library" name="Maven: com.yoho.common:error-code:1.4.5-SNAPSHOT" level="project" /> | 45 | + <orderEntry type="module" module-name="error-code" /> |
39 | <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" /> | 46 | <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.8.RELEASE" level="project" /> |
40 | <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" /> | 47 | <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.8.RELEASE" level="project" /> |
41 | <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" /> | 48 | <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.8.RELEASE" level="project" /> |
42 | <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" /> | 49 | <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.13.sec01" level="project" /> |
43 | <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" /> | 50 | <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" /> |
44 | <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" /> | 51 | <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.14" level="project" /> |
45 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-common:1.4.5-SNAPSHOT" level="project" /> | 52 | + <orderEntry type="module" module-name="yoho-core-common" /> |
46 | <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" /> | 53 | <orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.9.1" level="project" /> |
47 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" /> | 54 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" /> |
48 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" /> | 55 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" /> |
49 | <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" /> | 56 | <orderEntry type="library" name="Maven: net.sf.dozer:dozer:5.5.1" level="project" /> |
50 | <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" /> | 57 | <orderEntry type="library" name="Maven: net.sf.dozer:dozer-spring:5.5.1" level="project" /> |
51 | <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" /> | 58 | <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.2.6" level="project" /> |
52 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-redis-cluster:1.4.5-SNAPSHOT" level="project" /> | ||
53 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-config-client:1.4.5-SNAPSHOT" level="project" /> | 59 | + <orderEntry type="module" module-name="yoho-core-redis-cluster" /> |
60 | + <orderEntry type="module" module-name="yoho-core-config-client" /> | ||
54 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" /> | 61 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.8.10.RELEASE" level="project" /> |
55 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" /> | 62 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.10.RELEASE" level="project" /> |
56 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" /> | 63 | <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.13.10.RELEASE" level="project" /> |
57 | <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.3.8.RELEASE" level="project" /> | 64 | <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.3.8.RELEASE" level="project" /> |
58 | - <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.8.RELEASE" level="project" /> | ||
59 | <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" /> | 65 | <orderEntry type="library" name="Maven: redis.clients:jedis:2.9.0" level="project" /> |
60 | <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:1.5.1.RELEASE" level="project" /> | 66 | <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:1.5.1.RELEASE" level="project" /> |
61 | <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:3.5.5" level="project" /> | 67 | <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:3.5.5" level="project" /> |
@@ -68,9 +74,9 @@ | @@ -68,9 +74,9 @@ | ||
68 | <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" /> | 74 | <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" /> |
69 | <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" /> | 75 | <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" /> |
70 | <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.8.1" level="project" /> | 76 | <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.8.1" level="project" /> |
71 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-client-simple:1.4.5-SNAPSHOT" level="project" /> | 77 | + <orderEntry type="module" module-name="yoho-core-rest-client-simple" /> |
72 | <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" /> | 78 | <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" /> |
73 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-common:1.4.5-SNAPSHOT" level="project" /> | 79 | + <orderEntry type="module" module-name="yoho-core-rest-common" /> |
74 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" /> | 80 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" /> |
75 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" /> | 81 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" /> |
76 | <orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.4.4" level="project" /> | 82 | <orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.4.4" level="project" /> |
@@ -80,13 +86,13 @@ | @@ -80,13 +86,13 @@ | ||
80 | <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" /> | 86 | <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" /> |
81 | <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" /> | 87 | <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.6.Final" level="project" /> |
82 | <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" /> | 88 | <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.6.Final" level="project" /> |
83 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-alarm:1.4.5-SNAPSHOT" level="project" /> | ||
84 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance:1.4.5-SNAPSHOT" level="project" /> | ||
85 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-rest-governance-model:1.4.5-SNAPSHOT" level="project" /> | 89 | + <orderEntry type="module" module-name="yoho-core-alarm" /> |
90 | + <orderEntry type="module" module-name="yoho-core-rest-governance" /> | ||
91 | + <orderEntry type="module" module-name="yoho-core-rest-governance-model" /> | ||
86 | <orderEntry type="library" name="Maven: org.apache.curator:curator-x-discovery:2.9.1" level="project" /> | 92 | <orderEntry type="library" name="Maven: org.apache.curator:curator-x-discovery:2.9.1" level="project" /> |
87 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" /> | 93 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.2" level="project" /> |
88 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" /> | 94 | <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.5" level="project" /> |
89 | - <orderEntry type="library" name="Maven: com.yoho.core:yoho-core-cache:1.4.5-SNAPSHOT" level="project" /> | 95 | + <orderEntry type="module" module-name="yoho-core-cache" /> |
90 | <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" /> | 96 | <orderEntry type="library" name="Maven: net.spy:spymemcached:2.12.0" level="project" /> |
91 | <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" /> | 97 | <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.8.RELEASE" level="project" /> |
92 | <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" /> | 98 | <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.8.RELEASE" level="project" /> |
@@ -116,7 +122,6 @@ | @@ -116,7 +122,6 @@ | ||
116 | <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" /> | 122 | <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" /> |
117 | <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" /> | 123 | <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" /> |
118 | <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" /> | 124 | <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" /> |
119 | - <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" /> | ||
120 | <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> | 125 | <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> |
121 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" /> | 126 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.3" level="project" /> |
122 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" level="project" /> | 127 | <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.3" level="project" /> |
@@ -131,25 +136,42 @@ | @@ -131,25 +136,42 @@ | ||
131 | <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" /> | 136 | <orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" /> |
132 | <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" /> | 137 | <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" /> |
133 | <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" /> | 138 | <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" /> |
134 | - <orderEntry type="library" name="Maven: com.yoho.service.model:uic-service-model:1.4.5-SNAPSHOT" level="project" /> | 139 | + <orderEntry type="module" module-name="uic-service-model" /> |
135 | <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.5-SNAPSHOT" level="project" /> | 140 | <orderEntry type="library" name="Maven: com.yoho.service.model:social-service-model:1.4.5-SNAPSHOT" level="project" /> |
136 | <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" /> | 141 | <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.7" level="project" /> |
137 | <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" /> | 142 | <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" /> |
138 | <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> | 143 | <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> |
139 | - <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> | ||
140 | <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" /> | 144 | <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" /> |
141 | <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" /> | 145 | <orderEntry type="library" name="Maven: com.squareup.retrofit:retrofit:1.9.0" level="project" /> |
142 | <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" /> | 146 | <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.14.4" level="project" /> |
143 | - <orderEntry type="library" name="Maven: com.yoho.service.model:resource-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
144 | - <orderEntry type="library" name="Maven: com.yoho.service.model:users-service-model:1.4.5-SNAPSHOT" level="project" /> | ||
145 | - <orderEntry type="library" name="Maven: com.yoho.service.model:shops-service-model:1.4.5-SNAPSHOT" level="project" /> | 147 | + <orderEntry type="module" module-name="resource-service-model" /> |
148 | + <orderEntry type="module" module-name="users-service-model" /> | ||
149 | + <orderEntry type="module" module-name="shops-service-model" /> | ||
146 | <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" /> | 150 | <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" /> |
147 | <orderEntry type="module" module-name="yohoufo-fore-dal" /> | 151 | <orderEntry type="module" module-name="yohoufo-fore-dal" /> |
148 | <orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.1.1" level="project" /> | 152 | <orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.1.1" level="project" /> |
153 | + <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" /> | ||
149 | <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" /> | 154 | <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" /> |
150 | <orderEntry type="library" name="Maven: commons-pool:commons-pool:20030825.183949" level="project" /> | 155 | <orderEntry type="library" name="Maven: commons-pool:commons-pool:20030825.183949" level="project" /> |
151 | <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" /> | 156 | <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" /> |
152 | <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.6" level="project" /> | 157 | <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.6" level="project" /> |
153 | <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.30" level="project" /> | 158 | <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.30" level="project" /> |
159 | + <orderEntry type="module" module-name="yoho-core-dal" /> | ||
160 | + <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.8.RELEASE" level="project" /> | ||
161 | + <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.8.RELEASE" level="project" /> | ||
162 | + <orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:1.4.2" level="project" /> | ||
163 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.10.2" level="project" /> | ||
164 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:4.10.2" level="project" /> | ||
165 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:4.10.2" level="project" /> | ||
166 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:4.10.2" level="project" /> | ||
167 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:4.10.2" level="project" /> | ||
168 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:4.10.2" level="project" /> | ||
169 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:4.10.2" level="project" /> | ||
170 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:4.10.2" level="project" /> | ||
171 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:4.10.2" level="project" /> | ||
172 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:4.10.2" level="project" /> | ||
173 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:4.10.2" level="project" /> | ||
174 | + <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:4.10.2" level="project" /> | ||
175 | + <orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.4.1" level="project" /> | ||
154 | </component> | 176 | </component> |
155 | </module> | 177 | </module> |
-
Please register or login to post a comment