Skip to content

Commit d10fcfb

Browse files
chanjarsterchanjarster
committed
Merge branch 'feature/sax-xml' into develop
2 parents 9757dd1 + 3ba128f commit d10fcfb

File tree

78 files changed

+843
-1430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+843
-1430
lines changed

‎pom.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,6 @@
5555
<artifactId>httpmime</artifactId>
5656
<version>${httpclient.version}</version>
5757
</dependency>
58-
<dependency>
59-
<groupId>javax.xml.bind</groupId>
60-
<artifactId>jaxb-api</artifactId>
61-
<version>2.2.7</version>
62-
</dependency>
63-
<dependency>
64-
<groupId>com.sun.xml.bind</groupId>
65-
<artifactId>jaxb-impl</artifactId>
66-
<version>2.2.7</version>
67-
</dependency>
6858
<dependency>
6959
<groupId>com.google.code.gson</groupId>
7060
<artifactId>gson</artifactId>

‎pom.xml.versionsBackup‎

Lines changed: 0 additions & 229 deletions
This file was deleted.

‎weixin-java-common/pom.xml‎

Lines changed: 66 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,73 @@
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>me.chanjar</groupId>
8-
<artifactId>weixin-java-parent</artifactId>
9-
<version>1.0.7-SNAPSHOT</version>
10-
</parent>
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>me.chanjar</groupId>
8+
<artifactId>weixin-java-parent</artifactId>
9+
<version>1.0.7-SNAPSHOT</version>
10+
</parent>
1111

12-
<artifactId>weixin-java-common</artifactId>
13-
<name>WeiXin Java Tools - Common</name>
14-
<description>微信公众号、企业号Java SDK Common</description>
12+
<artifactId>weixin-java-common</artifactId>
13+
<name>WeiXin Java Tools - Common</name>
14+
<description>微信公众号、企业号Java SDK Common</description>
1515

16-
<dependencies>
17-
<dependency>
18-
<groupId>junit</groupId>
19-
<artifactId>junit</artifactId>
20-
<scope>test</scope>
21-
</dependency>
22-
<dependency>
23-
<groupId>org.testng</groupId>
24-
<artifactId>testng</artifactId>
25-
<version>6.8.7</version>
26-
<scope>test</scope>
27-
</dependency>
28-
<dependency>
29-
<groupId>org.mockito</groupId>
30-
<artifactId>mockito-all</artifactId>
31-
<version>1.9.5</version>
32-
<scope>test</scope>
33-
</dependency>
34-
<dependency>
35-
<groupId>com.google.inject</groupId>
36-
<artifactId>guice</artifactId>
37-
<version>3.0</version>
38-
<scope>test</scope>
39-
</dependency>
40-
<dependency>
41-
<groupId>org.eclipse.jetty</groupId>
42-
<artifactId>jetty-server</artifactId>
43-
<version>9.3.0.M0</version>
44-
<scope>test</scope>
45-
</dependency>
46-
<dependency>
47-
<groupId>org.eclipse.jetty</groupId>
48-
<artifactId>jetty-servlet</artifactId>
49-
<version>9.3.0.M0</version>
50-
<scope>test</scope>
51-
</dependency>
52-
</dependencies>
16+
<dependencies>
17+
<dependency>
18+
<groupId>com.thoughtworks.xstream</groupId>
19+
<artifactId>xstream</artifactId>
20+
<version>1.4.7</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+
<version>6.8.7</version>
31+
<scope>test</scope>
32+
</dependency>
33+
<dependency>
34+
<groupId>org.mockito</groupId>
35+
<artifactId>mockito-all</artifactId>
36+
<version>1.9.5</version>
37+
<scope>test</scope>
38+
</dependency>
39+
<dependency>
40+
<groupId>com.google.inject</groupId>
41+
<artifactId>guice</artifactId>
42+
<version>3.0</version>
43+
<scope>test</scope>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.eclipse.jetty</groupId>
47+
<artifactId>jetty-server</artifactId>
48+
<version>9.3.0.M0</version>
49+
<scope>test</scope>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.eclipse.jetty</groupId>
53+
<artifactId>jetty-servlet</artifactId>
54+
<version>9.3.0.M0</version>
55+
<scope>test</scope>
56+
</dependency>
57+
</dependencies>
5358

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>
59+
<build>
60+
<plugins>
61+
<plugin>
62+
<groupId>org.apache.maven.plugins</groupId>
63+
<artifactId>maven-surefire-plugin</artifactId>
64+
<configuration>
65+
<suiteXmlFiles>
66+
<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
67+
</suiteXmlFiles>
68+
</configuration>
69+
</plugin>
70+
</plugins>
71+
</build>
6772

6873
</project>

0 commit comments

Comments
 (0)