From f45e2f118b236f7a8e502f015658ce76af153835 Mon Sep 17 00:00:00 2001
From: "yihua.huang" <code4crafter@gmail.com>
Date: Sat, 21 Jan 2017 11:38:36 +0800
Subject: [PATCH] for release

---
 pom.xml                                                  | 4 ++--
 webmagic-core/pom.xml                                    | 2 +-
 webmagic-extension/pom.xml                               | 2 +-
 .../webmagic/downloader/PhantomJSDownloader.java         | 9 ++++++---
 .../us/codecraft/webmagic/monitor/SpiderMonitor.java     | 2 +-
 .../java/us/codecraft/webmagic/utils/DoubleKeyMap.java   | 2 +-
 webmagic-samples/pom.xml                                 | 2 +-
 webmagic-saxon/pom.xml                                   | 2 +-
 webmagic-scripts/pom.xml                                 | 2 +-
 webmagic-selenium/pom.xml                                | 2 +-
 10 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 46b60e8..987b3c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
         <version>7</version>
     </parent>
     <groupId>us.codecraft</groupId>
-    <version>0.6.1-SNAPSHOT</version>
+    <version>0.6.1</version>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <properties>
@@ -38,7 +38,7 @@
         <connection>scm:git:git@github.com:code4craft/webmagic.git</connection>
         <developerConnection>scm:git:git@github.com:code4craft/webmagic.git</developerConnection>
         <url>git@github.com:code4craft/webmagic.git</url>
-      <tag>webmagic-parent-0.6.0</tag>
+      <tag>webmagic-parent-0.6.1</tag>
   </scm>
     <licenses>
         <license>
diff --git a/webmagic-core/pom.xml b/webmagic-core/pom.xml
index d789539..8bda0f6 100644
--- a/webmagic-core/pom.xml
+++ b/webmagic-core/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>us.codecraft</groupId>
         <artifactId>webmagic-parent</artifactId>
-        <version>0.6.1-SNAPSHOT</version>
+        <version>0.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/webmagic-extension/pom.xml b/webmagic-extension/pom.xml
index 76ee2d9..85b869a 100644
--- a/webmagic-extension/pom.xml
+++ b/webmagic-extension/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>us.codecraft</groupId>
         <artifactId>webmagic-parent</artifactId>
-        <version>0.6.1-SNAPSHOT</version>
+        <version>0.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/webmagic-extension/src/main/java/us/codecraft/webmagic/downloader/PhantomJSDownloader.java b/webmagic-extension/src/main/java/us/codecraft/webmagic/downloader/PhantomJSDownloader.java
index a955e73..fa271dd 100644
--- a/webmagic-extension/src/main/java/us/codecraft/webmagic/downloader/PhantomJSDownloader.java
+++ b/webmagic-extension/src/main/java/us/codecraft/webmagic/downloader/PhantomJSDownloader.java
@@ -39,6 +39,7 @@ public class PhantomJSDownloader extends AbstractDownloader {
      *    /usr/local/bin/phantomjs 命令的绝对路径，避免因系统环境变量引起的IOException
      *   
      * @param phantomJsCommand
+     * @return this
      */
     public PhantomJSDownloader(String phantomJsCommand) {
         this.initPhantomjsCrawlPath();
@@ -47,7 +48,7 @@ public class PhantomJSDownloader extends AbstractDownloader {
     
     /**
      * 新增构造函数，支持crawl.js路径自定义，因为当其他项目依赖此jar包时，runtime.exec()执行phantomjs命令时无使用法jar包中的crawl.js
-     * 
+     * <pre>
      * crawl.js start -->>
      * 
      *   var system = require('system');
@@ -69,13 +70,15 @@ public class PhantomJSDownloader extends AbstractDownloader {
      *   });
      *   
      * <<-- crawl.js end
+     * </pre>
      * 具体项目时可以将以上js代码复制下来使用
      *   
      * example:
      *    new PhantomJSDownloader("/your/path/phantomjs", "/your/path/crawl.js");
      * 
-     * @param phantomJsCommand
-     * @param crawlJsPath
+     * @param phantomJsCommand phantomJsCommand
+     * @param crawlJsPath crawlJsPath
+     * @return this
      */
     public PhantomJSDownloader(String phantomJsCommand, String crawlJsPath) {
       PhantomJSDownloader.phantomJsCommand = phantomJsCommand;
diff --git a/webmagic-extension/src/main/java/us/codecraft/webmagic/monitor/SpiderMonitor.java b/webmagic-extension/src/main/java/us/codecraft/webmagic/monitor/SpiderMonitor.java
index a8aaecf..cfb4a82 100644
--- a/webmagic-extension/src/main/java/us/codecraft/webmagic/monitor/SpiderMonitor.java
+++ b/webmagic-extension/src/main/java/us/codecraft/webmagic/monitor/SpiderMonitor.java
@@ -45,7 +45,7 @@ public class SpiderMonitor {
      *
      * @param spiders spiders
      * @return this
-     * @throws JMException
+     * @throws JMException JMException
      */
     public synchronized SpiderMonitor register(Spider... spiders) throws JMException {
         for (Spider spider : spiders) {
diff --git a/webmagic-extension/src/main/java/us/codecraft/webmagic/utils/DoubleKeyMap.java b/webmagic-extension/src/main/java/us/codecraft/webmagic/utils/DoubleKeyMap.java
index 9e83b6d..7695c66 100755
--- a/webmagic-extension/src/main/java/us/codecraft/webmagic/utils/DoubleKeyMap.java
+++ b/webmagic-extension/src/main/java/us/codecraft/webmagic/utils/DoubleKeyMap.java
@@ -102,7 +102,7 @@ public class DoubleKeyMap<K1, K2, V> extends MultiKeyMapBase {
 
     /**
      * @param key1 key1
-     * @return
+     * @return map
      */
     public Map<K2, V> remove(K1 key1) {
         Map<K2, V> remove = map.remove(key1);
diff --git a/webmagic-samples/pom.xml b/webmagic-samples/pom.xml
index 8ac4d5b..bc0595d 100644
--- a/webmagic-samples/pom.xml
+++ b/webmagic-samples/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>webmagic-parent</artifactId>
         <groupId>us.codecraft</groupId>
-        <version>0.6.1-SNAPSHOT</version>
+        <version>0.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/webmagic-saxon/pom.xml b/webmagic-saxon/pom.xml
index bfbe4e3..fbac822 100644
--- a/webmagic-saxon/pom.xml
+++ b/webmagic-saxon/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>webmagic-parent</artifactId>
         <groupId>us.codecraft</groupId>
-        <version>0.6.1-SNAPSHOT</version>
+        <version>0.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/webmagic-scripts/pom.xml b/webmagic-scripts/pom.xml
index 6095a57..0b334c8 100755
--- a/webmagic-scripts/pom.xml
+++ b/webmagic-scripts/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>webmagic-parent</artifactId>
         <groupId>us.codecraft</groupId>
-        <version>0.6.1-SNAPSHOT</version>
+        <version>0.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/webmagic-selenium/pom.xml b/webmagic-selenium/pom.xml
index fdd5dfb..ccd07e3 100644
--- a/webmagic-selenium/pom.xml
+++ b/webmagic-selenium/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>webmagic-parent</artifactId>
 		<groupId>us.codecraft</groupId>
-		<version>0.6.1-SNAPSHOT</version>
+		<version>0.6.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>