common / ylp-common-parent

Commit ce8379b2cf2f36dd483d6a9e8ae6f652ad3982f8

Authored by 后端研发-谢家林
2 parents e15c1864 106effac

Merge branch 'qa1.0' 

Conflicts:
	pom.xml
Inline Side-by-side
Showing 2 changed files with 38 additions and 66 deletions
.gitignore
  View file @ce8379b
1 1 /target/
2   -*.iml
3 2 \ No newline at end of file
  3 +*.iml
  4 +/.idea*
4 5 \ No newline at end of file
... ...
1 1 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2   - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  2 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3 3 <modelVersion>4.0.0</modelVersion>
4 4  
5 5 <groupId>com.ylp.common</groupId>
6 6 <artifactId>ylp-common-parent</artifactId>
7   - <version>3.0-SNAPSHOT</version>
  7 + <version>1.0-Release</version>
8 8 <packaging>pom</packaging>
9 9  
10 10 <name>ylp-common-parent</name>
11 11 <url>http://maven.apache.org</url>
12   -
  12 +
13 13 <!-- 全局属性配置 -->
14 14 <profiles>
15   -
  15 +
16 16 <!-- 开发环境 -->
17 17 <profile>
18 18 <id>main</id>
... ... @@ -27,7 +27,7 @@
27 27 <activeByDefault>true</activeByDefault>
28 28 </activation>
29 29 </profile>
30   -
  30 +
31 31 <!-- 测试环境 -->
32 32 <profile>
33 33 <id>test</id>
... ... @@ -37,7 +37,7 @@
37 37 <ver>3.0-SNAPSHOT</ver>
38 38 </properties>
39 39 </profile>
40   -
  40 +
41 41 <!-- qa环境 -->
42 42 <profile>
43 43 <id>qa</id>
... ... @@ -48,7 +48,7 @@
48 48 </properties>
49 49 </profile>
50 50  
51   - <!-- 生产环境 -->
  51 + <!-- prod环境 -->
52 52 <profile>
53 53 <id>prod</id>
54 54 <properties>
... ... @@ -57,77 +57,48 @@
57 57 <ver>1.0-Release</ver>
58 58 </properties>
59 59 </profile>
60   -
  60 +
61 61 </profiles>
62 62  
63 63 <distributionManagement>
64 64 <repository>
65 65 <id>nexus-releases</id>
66 66 <name>Nexus Release Repository</name>
67   - <url>http://172.16.8.222:8081/nexus/content/repositories/releases/</url>
  67 + <url>http://nexus.vipzhuang.cn/content/repositories/releases/</url>
68 68 </repository>
69 69 <snapshotRepository>
70 70 <id>nexus-snapshots</id>
71 71 <name>Nexus Snapshot Repository</name>
72   - <url>http://172.16.8.222:8081/nexus/content/repositories/snapshots/</url>
  72 + <url>http://nexus.vipzhuang.cn/content/repositories/snapshots/</url>
73 73 </snapshotRepository>
74 74 </distributionManagement>
75   -
  75 +
  76 + <repositories>
  77 + <repository>
  78 + <id>nexus</id>
  79 + <url>http://nexus.vipzhuang.cn/content/groups/public</url>
  80 + <releases>
  81 + <enabled>true</enabled>
  82 + </releases>
  83 + <snapshots>
  84 + <enabled>false</enabled>
  85 + </snapshots>
  86 + </repository>
  87 + <repository>
  88 + <id>nexus-snapshots</id>
  89 + <url>http://nexus.vipzhuang.cn/content/repositories/snapshots/</url>
  90 + <releases>
  91 + <enabled>false</enabled>
  92 + </releases>
  93 + <snapshots>
  94 + <enabled>true</enabled>
  95 + </snapshots>
  96 + </repository>
  97 + </repositories>
  98 +
76 99 <properties>
77 100 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
78 101  
79   -
80   -
81   - <!-- common projects -->
82   - <ylp-common-tools.version>3.0-SNAPSHOT</ylp-common-tools.version>
83   - <ylp-common-config.version>3.0-SNAPSHOT</ylp-common-config.version>
84   - <ylp-common-core.version>3.0-SNAPSHOT</ylp-common-core.version>
85   - <ylp-common-web.version>3.0-SNAPSHOT</ylp-common-web.version>
86   -
87   - <!-- facade projects -->
88   - <ylp-facade-user.version>3.0-SNAPSHOT</ylp-facade-user.version>
89   - <ylp-facade-data.version>3.0-SNAPSHOT</ylp-facade-data.version>
90   - <ylp-facade-account.version>3.0-SNAPSHOT</ylp-facade-account.version>
91   - <ylp-facade-settlement.version>3.0-SNAPSHOT</ylp-facade-settlement.version>
92   - <ylp-facade-trade.version>3.0-SNAPSHOT</ylp-facade-trade.version>
93   - <ylp-facade-notify.version>3.0-SNAPSHOT</ylp-facade-notify.version>
94   - <ylp-facade-source.version>3.0-SNAPSHOT</ylp-facade-source.version>
95   - <ylp-facade-accountcheck.version>3.0-SNAPSHOT</ylp-facade-accountcheck.version>
96   - <ylp-facade-change.version>3.0-SNAPSHOT</ylp-facade-change.version>
97   - <ylp-facade-commodity.version>3.0-SNAPSHOT</ylp-facade-commodity.version>
98   -
99   - <!-- service projects -->
100   - <ylp-service-user.version>3.0-SNAPSHOT</ylp-service-user.version>
101   - <ylp-service-account.version>3.0-SNAPSHOT</ylp-service-account.version>
102   - <ylp-service-settlement.version>3.0-SNAPSHOT</ylp-service-settlement.version>
103   - <ylp-service-trade.version>3.0-SNAPSHOT</ylp-service-trade.version>
104   - <ylp-service-notify.version>3.0-SNAPSHOT</ylp-service-notify.version>
105   - <ylp-service-source.version>3.0-SNAPSHOT</ylp-service-source.version>
106   - <ylp-service-accountcheck.version>3.0-SNAPSHOT</ylp-service-accountcheck.version>
107   - <ylp-service-change.version>3.0-SNAPSHOT</ylp-service-change.version>
108   - <ylp-service-commodity.version>3.0-SNAPSHOT</ylp-service-commodity.version>
109   -
110   - <!-- web projects -->
111   - <ylp-web-pay.version>3.0-SNAPSHOT</ylp-web-pay.version>
112   - <ylp-web-source.version>3.0-SNAPSHOT</ylp-web-source.version>
113   - <ylp-data-web.version>3.0-SNAPSHOT</ylp-data-web.version>
114   -
115   - <!-- timer task projects -->
116   - <ylp-timer-settlement.version>3.0-SNAPSHOT</ylp-timer-settlement.version>
117   - <!-- extend projects -->
118   -
119   - <!-- api projects -->
120   - <ylp-payweb-api.version>3.0-SNAPSHOT</ylp-payweb-api.version>
121   -
122   - <!-- app projects -->
123   - <ylp-app-queue-notify.version>3.0-SNAPSHOT</ylp-app-queue-notify.version>
124   - <ylp-app-accountcheck.version>3.0-SNAPSHOT</ylp-app-accountcheck.version>
125   -
126   - <!-- weixin -->
127   - <ylp-weixin-wechat.version>3.0-SNAPSHOT</ylp-weixin-wechat.version>
128   -
129   - <!-- ========================================================== -->
130   -
131 102 <!-- frameworks -->
132 103 <org.springframework.version>3.2.4.RELEASE</org.springframework.version>
133 104  
... ... @@ -536,11 +507,11 @@
536 507 <exclusions>
537 508 <exclusion>
538 509 <groupId>org.slf4j</groupId>
539   - <artifactId>slf4j-log4j12</artifactId>
  510 + <artifactId>slf4j-log4j12</artifactId>
540 511 </exclusion>
541 512 </exclusions>
542 513 </dependency>
543   -
  514 +
544 515 </dependencies>
545 516 </dependencyManagement>
546 517  
... ...