Skip to content

Commit 04978f9

Browse files
sutrasutra
committed
Merge branch 'release/0.7.5'
2 parents 1068e18 + 113eaa4 commit 04978f9

File tree

23 files changed

+588
-174
lines changed

23 files changed

+588
-174
lines changed

‎README-zh.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
![logo](http://webmagic.io/images/logo.jpeg)
22

33

4+
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/us.codecraft/webmagic-parent/badge.svg?subject=Maven%20Central)](https://maven-badges.herokuapp.com/maven-central/us.codecraft/webmagic-parent/)
5+
[![License](https://img.shields.io/badge/License-Apache%20License%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
46
[![Build Status](https://travis-ci.org/code4craft/webmagic.png?branch=master)](https://travis-ci.org/code4craft/webmagic)
57

6-
78
官方网站[http://webmagic.io/](http://webmagic.io/)
89

910
>webmagic是一个开源的Java垂直爬虫框架，目标是简化爬虫的开发流程，让开发者专注于逻辑功能的开发。webmagic的核心非常简单，但是覆盖爬虫的整个流程，也是很好的学习爬虫开发的材料。
@@ -38,12 +39,12 @@ webmagic使用maven管理依赖，在项目中添加对应的依赖即可使用w
3839
<dependency>
3940
<groupId>us.codecraft</groupId>
4041
<artifactId>webmagic-core</artifactId>
41-
<version>0.7.4</version>
42+
<version>0.7.5</version>
4243
</dependency>
4344
<dependency>
4445
<groupId>us.codecraft</groupId>
4546
<artifactId>webmagic-extension</artifactId>
46-
<version>0.7.4</version>
47+
<version>0.7.5</version>
4748
</dependency>
4849
```
4950

‎README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
[Readme in Chinese](https://github.com/code4craft/webmagic/tree/master/README-zh.md)
44

55

6+
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/us.codecraft/webmagic-parent/badge.svg?subject=Maven%20Central)](https://maven-badges.herokuapp.com/maven-central/us.codecraft/webmagic-parent/)
7+
[![License](https://img.shields.io/badge/License-Apache%20License%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
68
[![Build Status](https://travis-ci.org/code4craft/webmagic.png?branch=master)](https://travis-ci.org/code4craft/webmagic)
79

810
>A scalable crawler framework. It covers the whole lifecycle of crawler: downloading, url management, content extraction and persistent. It can simplify the development of a specific crawler.
@@ -23,12 +25,12 @@ Add dependencies to your pom.xml:
2325
<dependency>
2426
<groupId>us.codecraft</groupId>
2527
<artifactId>webmagic-core</artifactId>
26-
<version>0.7.4</version>
28+
<version>0.7.5</version>
2729
</dependency>
2830
<dependency>
2931
<groupId>us.codecraft</groupId>
3032
<artifactId>webmagic-extension</artifactId>
31-
<version>0.7.4</version>
33+
<version>0.7.5</version>
3234
</dependency>
3335
```
3436

‎pom.xml

Lines changed: 161 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<groupId>us.codecraft</groupId>
4-
<version>0.7.4</version>
4+
<version>0.7.5</version>
55
<modelVersion>4.0.0</modelVersion>
66
<packaging>pom</packaging>
77
<properties>
88
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
99
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
10-
<java.version>1.8</java.version>
10+
<maven.compiler.source>1.8</maven.compiler.source>
11+
<maven.compiler.target>1.8</maven.compiler.target>
1112
<spring-version>4.0.0.RELEASE</spring-version>
1213
</properties>
1314
<artifactId>webmagic-parent</artifactId>
@@ -33,7 +34,7 @@
3334
<connection>scm:git:[email protected]:code4craft/webmagic.git</connection>
3435
<developerConnection>scm:git:[email protected]:code4craft/webmagic.git</developerConnection>
3536
<url>[email protected]:code4craft/webmagic.git</url>
36-
<tag>webmagic-parent-0.6.1</tag>
37+
<tag>WebMagic-${project.version}</tag>
3738
</scm>
3839
<licenses>
3940
<license>
@@ -49,6 +50,7 @@
4950
<module>webmagic-selenium</module>
5051
<module>webmagic-saxon</module>
5152
<module>webmagic-samples</module>
53+
<module>webmagic-coverage</module>
5254
</modules>
5355

5456
<dependencyManagement>
@@ -73,17 +75,17 @@
7375
<dependency>
7476
<groupId>org.apache.httpcomponents</groupId>
7577
<artifactId>httpcore</artifactId>
76-
<version>4.4.13</version>
78+
<version>4.4.14</version>
7779
</dependency>
7880
<dependency>
7981
<groupId>com.google.guava</groupId>
8082
<artifactId>guava</artifactId>
81-
<version>30.0-android</version>
83+
<version>30.1-jre</version>
8284
</dependency>
8385
<dependency>
8486
<groupId>com.jayway.jsonpath</groupId>
8587
<artifactId>json-path</artifactId>
86-
<version>2.6.0</version>
88+
<version>2.5.0</version>
8789
</dependency>
8890
<dependency>
8991
<groupId>org.slf4j</groupId>
@@ -98,12 +100,12 @@
98100
<dependency>
99101
<groupId>us.codecraft</groupId>
100102
<artifactId>xsoup</artifactId>
101-
<version>0.3.1</version>
103+
<version>0.3.2</version>
102104
</dependency>
103105
<dependency>
104106
<groupId>com.alibaba</groupId>
105107
<artifactId>fastjson</artifactId>
106-
<version>1.2.69</version>
108+
<version>1.2.75</version>
107109
</dependency>
108110
<dependency>
109111
<groupId>com.github.dreamhead</groupId>
@@ -125,38 +127,33 @@
125127
<dependency>
126128
<groupId>org.assertj</groupId>
127129
<artifactId>assertj-core</artifactId>
128-
<version>3.16.1</version>
130+
<version>3.18.1</version>
129131
<scope>test</scope>
130132
</dependency>
131133
<dependency>
132134
<groupId>org.apache.commons</groupId>
133135
<artifactId>commons-lang3</artifactId>
134-
<version>3.10</version>
136+
<version>3.11</version>
135137
</dependency>
136138
<dependency>
137139
<groupId>commons-collections</groupId>
138140
<artifactId>commons-collections</artifactId>
139141
<version>3.2.2</version>
140142
</dependency>
141143
<dependency>
142-
<groupId>commons-io</groupId>
143-
<artifactId>commons-io</artifactId>
144-
<version>2.7</version>
145-
</dependency>
144+
<groupId>commons-io</groupId>
145+
<artifactId>commons-io</artifactId>
146+
<version>2.8.0</version>
147+
</dependency>
146148
<dependency>
147149
<groupId>org.codehaus.groovy</groupId>
148150
<artifactId>groovy-all</artifactId>
149-
<version>2.4.19</version>
151+
<version>3.0.7</version>
150152
</dependency>
151153
<dependency>
152154
<groupId>org.jruby</groupId>
153155
<artifactId>jruby</artifactId>
154-
<version>9.2.11.1</version>
155-
</dependency>
156-
<dependency>
157-
<groupId>org.jsoup</groupId>
158-
<artifactId>jsoup</artifactId>
159-
<version>1.10.3</version>
156+
<version>9.2.14.0</version>
160157
</dependency>
161158
<dependency>
162159
<groupId>org.python</groupId>
@@ -171,12 +168,12 @@
171168
<dependency>
172169
<groupId>net.sf.saxon</groupId>
173170
<artifactId>Saxon-HE</artifactId>
174-
<version>10.1</version>
171+
<version>10.3</version>
175172
</dependency>
176173
<dependency>
177174
<groupId>net.sourceforge.htmlcleaner</groupId>
178175
<artifactId>htmlcleaner</artifactId>
179-
<version>2.5</version>
176+
<version>2.9</version>
180177
</dependency>
181178
<dependency>
182179
<groupId>com.github.detro</groupId>
@@ -191,7 +188,7 @@
191188
<dependency>
192189
<groupId>redis.clients</groupId>
193190
<artifactId>jedis</artifactId>
194-
<version>2.9.3</version>
191+
<version>3.6.0</version>
195192
</dependency>
196193
</dependencies>
197194
</dependencyManagement>
@@ -211,7 +208,7 @@
211208
<configuration>
212209
<rules>
213210
<requireMavenVersion>
214-
<version>3.0.5</version>
211+
<version>3.3.9</version>
215212
</requireMavenVersion>
216213
</rules>
217214
</configuration>
@@ -221,19 +218,10 @@
221218
<plugin>
222219
<groupId>org.apache.maven.plugins</groupId>
223220
<artifactId>maven-surefire-plugin</artifactId>
224-
<version>3.0.0-M4</version>
225-
<configuration>
226-
<forkCount>0</forkCount>
227-
</configuration>
228221
</plugin>
229222
<plugin>
230223
<groupId>org.apache.maven.plugins</groupId>
231224
<artifactId>maven-compiler-plugin</artifactId>
232-
<version>3.8.1</version>
233-
<configuration>
234-
<source>${java.version}</source>
235-
<target>${java.version}</target>
236-
</configuration>
237225
</plugin>
238226
<!--<plugin>-->
239227
<!--<groupId>org.apache.maven.plugins</groupId>-->
@@ -258,12 +246,10 @@
258246
<plugin>
259247
<groupId>org.apache.maven.plugins</groupId>
260248
<artifactId>maven-resources-plugin</artifactId>
261-
<version>3.1.0</version>
262249
</plugin>
263250
<plugin>
264251
<groupId>org.apache.maven.plugins</groupId>
265252
<artifactId>maven-jar-plugin</artifactId>
266-
<version>3.2.0</version>
267253
<configuration>
268254
<excludes>
269255
<exclude>log4j.xml</exclude>
@@ -289,7 +275,7 @@
289275
<version>3.2.0</version>
290276
<configuration>
291277
<encoding>UTF-8</encoding>
292-
<doctitle>WebMagic 0.7.4</doctitle>
278+
<doctitle>WebMagic ${project.version}</doctitle>
293279
<locale>en_US</locale>
294280

295281
<!-- avoid the issue: https://bugs.openjdk.java.net/browse/JDK-8212233 -->
@@ -317,9 +303,147 @@
317303
<artifactId>maven-release-plugin</artifactId>
318304
<version>3.0.0-M1</version>
319305
</plugin>
306+
<plugin>
307+
<groupId>org.jacoco</groupId>
308+
<artifactId>jacoco-maven-plugin</artifactId>
309+
<executions>
310+
<execution>
311+
<goals>
312+
<goal>prepare-agent</goal>
313+
</goals>
314+
</execution>
315+
<execution>
316+
<id>report</id>
317+
<phase>verify</phase>
318+
<goals>
319+
<goal>report</goal>
320+
</goals>
321+
</execution>
322+
</executions>
323+
</plugin>
324+
<plugin>
325+
<groupId>com.amashchenko.maven.plugin</groupId>
326+
<artifactId>gitflow-maven-plugin</artifactId>
327+
<configuration>
328+
<gitFlowConfig>
329+
<versionTagPrefix>WebMagic-</versionTagPrefix>
330+
</gitFlowConfig>
331+
</configuration>
332+
</plugin>
320333
</plugins>
334+
<pluginManagement>
335+
<plugins>
336+
<plugin>
337+
<groupId>org.apache.maven.plugins</groupId>
338+
<artifactId>maven-clean-plugin</artifactId>
339+
<version>3.1.0</version>
340+
</plugin>
341+
<plugin>
342+
<groupId>org.apache.maven.plugins</groupId>
343+
<artifactId>maven-compiler-plugin</artifactId>
344+
<version>3.8.1</version>
345+
</plugin>
346+
<plugin>
347+
<groupId>org.apache.maven.plugins</groupId>
348+
<artifactId>maven-deploy-plugin</artifactId>
349+
<version>3.0.0-M1</version>
350+
</plugin>
351+
<plugin>
352+
<groupId>org.apache.maven.plugins</groupId>
353+
<artifactId>maven-install-plugin</artifactId>
354+
<version>3.0.0-M1</version>
355+
</plugin>
356+
<plugin>
357+
<groupId>org.apache.maven.plugins</groupId>
358+
<artifactId>maven-jar-plugin</artifactId>
359+
<version>3.2.0</version>
360+
</plugin>
361+
<plugin>
362+
<groupId>org.apache.maven.plugins</groupId>
363+
<artifactId>maven-jxr-plugin</artifactId>
364+
<version>3.1.1</version>
365+
</plugin>
366+
<plugin>
367+
<groupId>org.apache.maven.plugins</groupId>
368+
<artifactId>maven-pmd-plugin</artifactId>
369+
<version>3.14.0</version>
370+
</plugin>
371+
<plugin>
372+
<groupId>org.apache.maven.plugins</groupId>
373+
<artifactId>maven-resources-plugin</artifactId>
374+
<version>3.2.0</version>
375+
</plugin>
376+
<plugin>
377+
<groupId>org.apache.maven.plugins</groupId>
378+
<artifactId>maven-site-plugin</artifactId>
379+
<version>3.9.1</version>
380+
</plugin>
381+
<plugin>
382+
<groupId>org.apache.maven.plugins</groupId>
383+
<artifactId>maven-surefire-plugin</artifactId>
384+
<version>3.0.0-M5</version>
385+
</plugin>
386+
<plugin>
387+
<groupId>org.apache.maven.plugins</groupId>
388+
<artifactId>maven-surefire-report-plugin</artifactId>
389+
<version>3.0.0-M5</version>
390+
</plugin>
391+
<plugin>
392+
<groupId>org.codehaus.mojo</groupId>
393+
<artifactId>taglist-maven-plugin</artifactId>
394+
<version>2.4</version>
395+
</plugin>
396+
<plugin>
397+
<groupId>org.jacoco</groupId>
398+
<artifactId>jacoco-maven-plugin</artifactId>
399+
<version>0.8.7</version>
400+
</plugin>
401+
<plugin>
402+
<groupId>com.amashchenko.maven.plugin</groupId>
403+
<artifactId>gitflow-maven-plugin</artifactId>
404+
<version>1.15.0</version>
405+
</plugin>
406+
<plugin>
407+
<groupId>com.github.spotbugs</groupId>
408+
<artifactId>spotbugs-maven-plugin</artifactId>
409+
<version>4.2.3</version>
410+
</plugin>
411+
</plugins>
412+
</pluginManagement>
321413
</build>
322414

415+
<reporting>
416+
<plugins>
417+
<plugin>
418+
<groupId>org.apache.maven.plugins</groupId>
419+
<artifactId>maven-javadoc-plugin</artifactId>
420+
<configuration>
421+
<doclint>none</doclint>
422+
</configuration>
423+
</plugin>
424+
<plugin>
425+
<groupId>org.apache.maven.plugins</groupId>
426+
<artifactId>maven-jxr-plugin</artifactId>
427+
</plugin>
428+
<plugin>
429+
<groupId>org.apache.maven.plugins</groupId>
430+
<artifactId>maven-pmd-plugin</artifactId>
431+
</plugin>
432+
<plugin>
433+
<groupId>org.apache.maven.plugins</groupId>
434+
<artifactId>maven-surefire-report-plugin</artifactId>
435+
</plugin>
436+
<plugin>
437+
<groupId>org.codehaus.mojo</groupId>
438+
<artifactId>taglist-maven-plugin</artifactId>
439+
</plugin>
440+
<plugin>
441+
<groupId>com.github.spotbugs</groupId>
442+
<artifactId>spotbugs-maven-plugin</artifactId>
443+
</plugin>
444+
</plugins>
445+
</reporting>
446+
323447
<profiles>
324448
<profile>
325449
<id>release</id>

0 commit comments

Comments
 (0)