diff --git a/pom.xml b/pom.xml index f0b3a7d..086437d 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,6 @@ webmagic-core webmagic-plugin/ webmagic-samples/ - webmagic-selenium diff --git a/webmagic-plugin/pom.xml b/webmagic-plugin/pom.xml index b75dc9e..2225722 100644 --- a/webmagic-plugin/pom.xml +++ b/webmagic-plugin/pom.xml @@ -7,7 +7,12 @@ webmagic 0.1.0 + pom 4.0.0 + + webmagic-misc + webmagic-selenium + webmagic-plugin @@ -21,16 +26,6 @@ junit junit - - org.freemarker - freemarker - 2.3.15 - - - redis.clients - jedis - 2.0.0 - \ No newline at end of file diff --git a/webmagic-plugin/webmagic-misc/pom.xml b/webmagic-plugin/webmagic-misc/pom.xml new file mode 100644 index 0000000..c545615 --- /dev/null +++ b/webmagic-plugin/webmagic-misc/pom.xml @@ -0,0 +1,27 @@ + + + + us.codecraft + webmagic-plugin + 0.1.0 + + 4.0.0 + + webmagic-misc + + + + org.freemarker + freemarker + 2.3.15 + + + redis.clients + jedis + 2.0.0 + + + + \ No newline at end of file diff --git a/webmagic-plugin/src/main/java/us/codecraft/webmagic/pipeline/FreemarkerPipeline.java b/webmagic-plugin/webmagic-misc/src/main/java/us/codecraft/webmagic/pipeline/FreemarkerPipeline.java similarity index 100% rename from webmagic-plugin/src/main/java/us/codecraft/webmagic/pipeline/FreemarkerPipeline.java rename to webmagic-plugin/webmagic-misc/src/main/java/us/codecraft/webmagic/pipeline/FreemarkerPipeline.java diff --git a/webmagic-plugin/src/main/java/us/codecraft/webmagic/scheduler/RedisScheduler.java b/webmagic-plugin/webmagic-misc/src/main/java/us/codecraft/webmagic/scheduler/RedisScheduler.java similarity index 100% rename from webmagic-plugin/src/main/java/us/codecraft/webmagic/scheduler/RedisScheduler.java rename to webmagic-plugin/webmagic-misc/src/main/java/us/codecraft/webmagic/scheduler/RedisScheduler.java diff --git a/webmagic-plugin/src/main/resources/ftl/wordpress.ftl b/webmagic-plugin/webmagic-misc/src/main/resources/ftl/wordpress.ftl similarity index 100% rename from webmagic-plugin/src/main/resources/ftl/wordpress.ftl rename to webmagic-plugin/webmagic-misc/src/main/resources/ftl/wordpress.ftl diff --git a/webmagic-plugin/src/test/java/us/codecraft/webmagic/FreemarkerPipelineTest.java b/webmagic-plugin/webmagic-misc/src/test/java/us/codecraft/webmagic/FreemarkerPipelineTest.java similarity index 100% rename from webmagic-plugin/src/test/java/us/codecraft/webmagic/FreemarkerPipelineTest.java rename to webmagic-plugin/webmagic-misc/src/test/java/us/codecraft/webmagic/FreemarkerPipelineTest.java diff --git a/webmagic-plugin/src/test/java/us/codecraft/webmagic/scheduler/RedisSchedulerTest.java b/webmagic-plugin/webmagic-misc/src/test/java/us/codecraft/webmagic/scheduler/RedisSchedulerTest.java similarity index 100% rename from webmagic-plugin/src/test/java/us/codecraft/webmagic/scheduler/RedisSchedulerTest.java rename to webmagic-plugin/webmagic-misc/src/test/java/us/codecraft/webmagic/scheduler/RedisSchedulerTest.java diff --git a/webmagic-selenium/README.md b/webmagic-plugin/webmagic-selenium/README.md similarity index 100% rename from webmagic-selenium/README.md rename to webmagic-plugin/webmagic-selenium/README.md diff --git a/webmagic-selenium/pom.xml b/webmagic-plugin/webmagic-selenium/pom.xml similarity index 55% rename from webmagic-selenium/pom.xml rename to webmagic-plugin/webmagic-selenium/pom.xml index 209fbe8..0da4504 100644 --- a/webmagic-selenium/pom.xml +++ b/webmagic-plugin/webmagic-selenium/pom.xml @@ -5,27 +5,13 @@ us.codecraft - webmagic + webmagic-plugin 0.1.0 4.0.0 webmagic-selenium - - us.codecraft - webmagic-core - ${project.version} - - - us.codecraft - webmagic-plugin - ${project.version} - - - junit - junit - org.seleniumhq.selenium selenium-java diff --git a/webmagic-samples/pom.xml b/webmagic-samples/pom.xml index 8af7672..b845490 100644 --- a/webmagic-samples/pom.xml +++ b/webmagic-samples/pom.xml @@ -19,7 +19,7 @@ us.codecraft - webmagic-plugin + webmagic-misc ${project.version}