Mobai
/
magic-Dependency
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix test failure and javadoc failure.

master
Sutra Zhou 2020-05-28 19:05:17 +08:00
parent 4078766d0e
commit ab5ac9d796
3 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pom.xml
View File

@ -7,8 +7,8 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring-version>4.0.0.RELEASE</spring-version> <spring-version>4.0.0.RELEASE</spring-version>
</properties> </properties>
<artifactId>webmagic-parent</artifactId> <artifactId>webmagic-parent</artifactId>
<name>webmagic-parent</name> <name>webmagic-parent</name>
@ -103,7 +103,7 @@
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>1.2.28</version> <version>1.2.56</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.dreamhead</groupId> <groupId>com.github.dreamhead</groupId>
@ -162,7 +162,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.18</version> <version>3.0.0-M4</version>
<configuration> <configuration>
<forkCount>0</forkCount> <forkCount>0</forkCount>
</configuration> </configuration>
@ -170,11 +170,10 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version> <version>3.7.0</version>
<configuration> <configuration>
<source>1.6</source> <source>${java.version}</source>
<target>1.6</target> <target>${java.version}</target>
<encoding>UTF-8</encoding>
</configuration> </configuration>
</plugin> </plugin>
<!--<plugin>--> <!--<plugin>-->
@ -230,11 +229,15 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version> <version>3.2.0</version>
<configuration> <configuration>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
<doctitle>WebMagic 0.7.3</doctitle> <doctitle>WebMagic 0.7.3</doctitle>
<locale>en_US</locale> <locale>en_US</locale>
<!-- avoid the issue: https://bugs.openjdk.java.net/browse/JDK-8212233 -->
<detectJavaApiLink>false</detectJavaApiLink>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>

2
webmagic-core/src/main/java/us/codecraft/webmagic/selector/RegexSelector.java
View File

@ -41,7 +41,7 @@ public class RegexSelector implements Selector {
/** /**
* Create a RegexSelector. When there is no capture group, the value is set to 0 else set to 1. * Create a RegexSelector. When there is no capture group, the value is set to 0 else set to 1.
* @param regexStr * @param regexStr the regular expression.
*/ */
public RegexSelector(String regexStr) { public RegexSelector(String regexStr) {
this.compileRegex(regexStr); this.compileRegex(regexStr);

16
webmagic-scripts/pom.xml
View File

@ -7,7 +7,6 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>us.codecraft</groupId>
<artifactId>webmagic-scripts</artifactId> <artifactId>webmagic-scripts</artifactId>
<properties> <properties>
<kotlin.version>1.1.2-2</kotlin.version> <kotlin.version>1.1.2-2</kotlin.version>
@ -63,21 +62,6 @@
<build> <build>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory> <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<plugins> <plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>