You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by th...@apache.org on 2017/02/25 14:34:54 UTC
[nutch] 03/03: Merge with latest changes from master
This is an automated email from the ASF dual-hosted git repository.
thammegowda pushed a commit to branch NUTCH-2292
in repository https://gitbox.apache.org/repos/asf/nutch.git
commit 62491d5b0ac3349d684a493c9bd121442849ee8c
Author: Thamme Gowda <th...@apache.org>
AuthorDate: Sat Feb 25 06:26:39 2017 -0800
Merge with latest changes from master
---
.../elastic/TestElasticIndexWriter.java | 0
.../src/test/resources}/nutch-site-test.xml | 0
.../parsefilter-regex/README.txt | 0
nutch-plugins/pom.xml | 1 +
nutch-plugins/protocol-httpclient/pom.xml | 20 ++++++++++++--
.../publish-rabbitmq/build-ivy.xml | 0
.../publish-rabbitmq/build.xml | 0
.../publish-rabbitmq/ivy.xml | 0
.../publish-rabbitmq/plugin.xml | 0
.../pom.xml | 32 ++++++++--------------
.../publisher/rabbitmq/RabbitMQPublisherImpl.java | 0
.../nutch/publisher/rabbitmq/package-info.java | 0
12 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/src/plugin/indexer-elastic/src/test/org/apache/nutch/indexwriter/elastic/TestElasticIndexWriter.java b/nutch-plugins/indexer-elastic/src/test/java/org/apache/nutch/indexwriter/elastic/TestElasticIndexWriter.java
similarity index 100%
rename from src/plugin/indexer-elastic/src/test/org/apache/nutch/indexwriter/elastic/TestElasticIndexWriter.java
rename to nutch-plugins/indexer-elastic/src/test/java/org/apache/nutch/indexwriter/elastic/TestElasticIndexWriter.java
diff --git a/src/plugin/indexer-elastic/src/test/conf/nutch-site-test.xml b/nutch-plugins/indexer-elastic/src/test/resources/nutch-site-test.xml
similarity index 100%
rename from src/plugin/indexer-elastic/src/test/conf/nutch-site-test.xml
rename to nutch-plugins/indexer-elastic/src/test/resources/nutch-site-test.xml
diff --git a/src/plugin/parsefilter-regex/README.txt b/nutch-plugins/parsefilter-regex/README.txt
similarity index 100%
rename from src/plugin/parsefilter-regex/README.txt
rename to nutch-plugins/parsefilter-regex/README.txt
diff --git a/nutch-plugins/pom.xml b/nutch-plugins/pom.xml
index e07f487..0fc29e1 100644
--- a/nutch-plugins/pom.xml
+++ b/nutch-plugins/pom.xml
@@ -76,6 +76,7 @@
<module>protocol-httpclient</module>
<module>protocol-interactiveselenium</module>
<module>protocol-selenium</module>
+ <module>publish-rabbitmq</module>
<module>scoring-depth</module>
<module>scoring-link</module>
<module>scoring-opic</module>
diff --git a/nutch-plugins/protocol-httpclient/pom.xml b/nutch-plugins/protocol-httpclient/pom.xml
index 2f2fc7c..4fdac6c 100644
--- a/nutch-plugins/protocol-httpclient/pom.xml
+++ b/nutch-plugins/protocol-httpclient/pom.xml
@@ -33,12 +33,26 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <commons.lang3.version>3.5</commons.lang3.version>
+ <jsoup.version>1.8.1</jsoup.version>
+ <jetty.version>6.1.26</jetty.version>
+ <jsp.version>6.1.14</jsp.version>
</properties>
<dependencies>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
- <version>1.8.1</version>
+ <version>${jsoup.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons.lang3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nutch</groupId>
+ <artifactId>lib-http</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.nutch</groupId>
@@ -48,13 +62,13 @@
<dependency>
<groupId> org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.26</version>
+ <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId> org.mortbay.jetty</groupId>
<artifactId>jsp-2.1</artifactId>
- <version>6.1.14</version>
+ <version>${jsp.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/plugin/publish-rabbitmq/build-ivy.xml b/nutch-plugins/publish-rabbitmq/build-ivy.xml
similarity index 100%
rename from src/plugin/publish-rabbitmq/build-ivy.xml
rename to nutch-plugins/publish-rabbitmq/build-ivy.xml
diff --git a/src/plugin/publish-rabbitmq/build.xml b/nutch-plugins/publish-rabbitmq/build.xml
similarity index 100%
rename from src/plugin/publish-rabbitmq/build.xml
rename to nutch-plugins/publish-rabbitmq/build.xml
diff --git a/src/plugin/publish-rabbitmq/ivy.xml b/nutch-plugins/publish-rabbitmq/ivy.xml
similarity index 100%
rename from src/plugin/publish-rabbitmq/ivy.xml
rename to nutch-plugins/publish-rabbitmq/ivy.xml
diff --git a/src/plugin/publish-rabbitmq/plugin.xml b/nutch-plugins/publish-rabbitmq/plugin.xml
similarity index 100%
rename from src/plugin/publish-rabbitmq/plugin.xml
rename to nutch-plugins/publish-rabbitmq/plugin.xml
diff --git a/nutch-plugins/protocol-httpclient/pom.xml b/nutch-plugins/publish-rabbitmq/pom.xml
similarity index 67%
copy from nutch-plugins/protocol-httpclient/pom.xml
copy to nutch-plugins/publish-rabbitmq/pom.xml
index 2f2fc7c..a8a434d 100644
--- a/nutch-plugins/protocol-httpclient/pom.xml
+++ b/nutch-plugins/publish-rabbitmq/pom.xml
@@ -25,38 +25,28 @@
<version>1.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>protocol-httpclient</artifactId>
+ <artifactId>publish-rabitmq</artifactId>
<packaging>jar</packaging>
- <name>protocol-httpclient</name>
+ <name>publish-rabitmq</name>
<url>http://nutch.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <rabitmq.version>3.6.5</rabitmq.version>
+ <jackson.version>2.8.6</jackson.version>
</properties>
+
<dependencies>
<dependency>
- <groupId>org.jsoup</groupId>
- <artifactId>jsoup</artifactId>
- <version>1.8.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.nutch</groupId>
- <artifactId>lib-http</artifactId>
- <version>${project.parent.version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId> org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.26</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId> org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1</artifactId>
- <version>6.1.14</version>
- <scope>test</scope>
+ <groupId>com.rabbitmq</groupId>
+ <artifactId>amqp-client</artifactId>
+ <version>${rabitmq.version}</version>
</dependency>
</dependencies>
-
</project>
diff --git a/src/plugin/publish-rabbitmq/src/java/org/apache/nutch/publisher/rabbitmq/RabbitMQPublisherImpl.java b/nutch-plugins/publish-rabbitmq/src/main/java/org/apache/nutch/publisher/rabbitmq/RabbitMQPublisherImpl.java
similarity index 100%
rename from src/plugin/publish-rabbitmq/src/java/org/apache/nutch/publisher/rabbitmq/RabbitMQPublisherImpl.java
rename to nutch-plugins/publish-rabbitmq/src/main/java/org/apache/nutch/publisher/rabbitmq/RabbitMQPublisherImpl.java
diff --git a/src/plugin/publish-rabbitmq/src/java/org/apache/nutch/publisher/rabbitmq/package-info.java b/nutch-plugins/publish-rabbitmq/src/main/java/org/apache/nutch/publisher/rabbitmq/package-info.java
similarity index 100%
rename from src/plugin/publish-rabbitmq/src/java/org/apache/nutch/publisher/rabbitmq/package-info.java
rename to nutch-plugins/publish-rabbitmq/src/main/java/org/apache/nutch/publisher/rabbitmq/package-info.java
--
To stop receiving notification emails like this one, please contact
"commits@nutch.apache.org" <co...@nutch.apache.org>.