Skip to content

Commit eeb0452

Browse files
binarywangbinarywang
committed
优化调整pom文件，将jedis单独移入cp中
1 parent 245bec7 commit eeb0452

File tree

2 files changed

+69
-70
lines changed

2 files changed

+69
-70
lines changed

‎pom.xml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<project
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4-
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0">
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.github.binarywang</groupId>
77
<artifactId>weixin-java-parent</artifactId>
@@ -99,7 +99,6 @@
9999
<httpclient.version>4.5</httpclient.version>
100100
<slf4j.version>1.7.10</slf4j.version>
101101
<logback.version>1.1.2</logback.version>
102-
<jedis.version>2.9.0</jedis.version>
103102
<gson.version>2.7</gson.version>
104103
<guava.version>19.0</guava.version>
105104
<commons-lang3.version>3.5</commons-lang3.version>
@@ -150,12 +149,6 @@
150149
<artifactId>commons-lang3</artifactId>
151150
<version>${commons-lang3.version}</version>
152151
</dependency>
153-
<dependency>
154-
<groupId>redis.clients</groupId>
155-
<artifactId>jedis</artifactId>
156-
<version>${jedis.version}</version>
157-
<optional>true</optional>
158-
</dependency>
159152
<dependency>
160153
<groupId>com.google.guava</groupId>
161154
<artifactId>guava</artifactId>

‎weixin-java-cp/pom.xml‎

Lines changed: 67 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,74 @@
11
<?xml version="1.0"?>
22
<project
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4-
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
5-
<modelVersion>4.0.0</modelVersion>
6-
<parent>
7-
<groupId>com.github.binarywang</groupId>
8-
<artifactId>weixin-java-parent</artifactId>
9-
<version>2.4.8.BETA</version>
10-
</parent>
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>com.github.binarywang</groupId>
8+
<artifactId>weixin-java-parent</artifactId>
9+
<version>2.4.8.BETA</version>
10+
</parent>
1111

12-
<artifactId>weixin-java-cp</artifactId>
13-
<name>WeiXin Java Tools - CP</name>
14-
<description>微信企业号Java SDK</description>
12+
<artifactId>weixin-java-cp</artifactId>
13+
<name>WeiXin Java Tools - CP</name>
14+
<description>微信企业号Java SDK</description>
1515

16-
<dependencies>
17-
<dependency>
18-
<groupId>com.github.binarywang</groupId>
19-
<artifactId>weixin-java-common</artifactId>
20-
<version>${project.version}</version>
21-
</dependency>
22-
<dependency>
23-
<groupId>junit</groupId>
24-
<artifactId>junit</artifactId>
25-
<scope>test</scope>
26-
</dependency>
27-
<dependency>
28-
<groupId>org.testng</groupId>
29-
<artifactId>testng</artifactId>
30-
<scope>test</scope>
31-
</dependency>
32-
<dependency>
33-
<groupId>org.mockito</groupId>
34-
<artifactId>mockito-all</artifactId>
35-
<scope>test</scope>
36-
</dependency>
37-
<dependency>
38-
<groupId>com.google.inject</groupId>
39-
<artifactId>guice</artifactId>
40-
<scope>test</scope>
41-
</dependency>
42-
<dependency>
43-
<groupId>org.eclipse.jetty</groupId>
44-
<artifactId>jetty-server</artifactId>
45-
<scope>test</scope>
46-
</dependency>
47-
<dependency>
48-
<groupId>org.eclipse.jetty</groupId>
49-
<artifactId>jetty-servlet</artifactId>
50-
<scope>test</scope>
51-
</dependency>
52-
</dependencies>
16+
<dependencies>
17+
<dependency>
18+
<groupId>com.github.binarywang</groupId>
19+
<artifactId>weixin-java-common</artifactId>
20+
<version>${project.version}</version>
21+
</dependency>
22+
<dependency>
23+
<groupId>junit</groupId>
24+
<artifactId>junit</artifactId>
25+
<scope>test</scope>
26+
</dependency>
27+
<dependency>
28+
<groupId>org.testng</groupId>
29+
<artifactId>testng</artifactId>
30+
<scope>test</scope>
31+
</dependency>
32+
<dependency>
33+
<groupId>org.mockito</groupId>
34+
<artifactId>mockito-all</artifactId>
35+
<scope>test</scope>
36+
</dependency>
37+
<dependency>
38+
<groupId>com.google.inject</groupId>
39+
<artifactId>guice</artifactId>
40+
<scope>test</scope>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.eclipse.jetty</groupId>
44+
<artifactId>jetty-server</artifactId>
45+
<scope>test</scope>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.eclipse.jetty</groupId>
49+
<artifactId>jetty-servlet</artifactId>
50+
<scope>test</scope>
51+
</dependency>
52+
<dependency>
53+
<groupId>redis.clients</groupId>
54+
<artifactId>jedis</artifactId>
55+
<version>2.9.0</version>
56+
<optional>true</optional>
57+
</dependency>
58+
</dependencies>
5359

54-
<build>
55-
<plugins>
56-
<plugin>
57-
<groupId>org.apache.maven.plugins</groupId>
58-
<artifactId>maven-surefire-plugin</artifactId>
59-
<configuration>
60-
<suiteXmlFiles>
61-
<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
62-
</suiteXmlFiles>
63-
</configuration>
64-
</plugin>
65-
</plugins>
66-
</build>
60+
<build>
61+
<plugins>
62+
<plugin>
63+
<groupId>org.apache.maven.plugins</groupId>
64+
<artifactId>maven-surefire-plugin</artifactId>
65+
<configuration>
66+
<suiteXmlFiles>
67+
<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
68+
</suiteXmlFiles>
69+
</configuration>
70+
</plugin>
71+
</plugins>
72+
</build>
6773

6874
</project>

0 commit comments

Comments
 (0)