38 files changed, 1 insertions, 1 deletions
diff --git a/pom.xml b/pom.xml
index 3e4ce0fbc6d..05d0743bf10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1133,7 +1133,6 @@
         <module>filedistribution</module>
         <module>filedistribution_test</module>
         <module>fsa</module>
-        <module>hadoop</module>
         <module>indexinglanguage</module>
         <module>jaxrs_client_utils</module>
         <module>jaxrs_utils</module>
@@ -1180,6 +1179,7 @@
         <module>vespa-application-maven-plugin</module>
         <module>vespa-documentgen-plugin</module>
         <module>vespa_feed_perf</module>
+        <module>vespa-hadoop</module>
         <module>vespa-http-client</module>
         <module>vespa_jersey2</module>
         <module>vespajlib</module>
diff --git a/hadoop/OWNERS b/vespa-hadoop/OWNERS
index 6b09ce48bd4..6b09ce48bd4 100644
--- a/hadoop/OWNERS
+++ b/vespa-hadoop/OWNERS
diff --git a/hadoop/README b/vespa-hadoop/README
index 1b567b88c1d..1b567b88c1d 100644
--- a/hadoop/README
+++ b/vespa-hadoop/README
diff --git a/hadoop/pom.xml b/vespa-hadoop/pom.xml
index f23b73abc54..f23b73abc54 100644
--- a/hadoop/pom.xml
+++ b/vespa-hadoop/pom.xml
diff --git a/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaOutputCommitter.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaOutputCommitter.java
index cd0f65496d0..cd0f65496d0 100644
--- a/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaOutputCommitter.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaOutputCommitter.java
diff --git a/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaOutputFormat.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaOutputFormat.java
index 720a6adf477..720a6adf477 100644
--- a/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaOutputFormat.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaOutputFormat.java
diff --git a/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java
index 8072e99e2ab..8072e99e2ab 100644
--- a/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java
diff --git a/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaSimpleJsonInputFormat.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaSimpleJsonInputFormat.java
index d7bdc592fd5..d7bdc592fd5 100644
--- a/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaSimpleJsonInputFormat.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaSimpleJsonInputFormat.java
diff --git a/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/TupleTools.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/TupleTools.java
index 1d11a3f9fdd..1d11a3f9fdd 100644
--- a/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/TupleTools.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/TupleTools.java
diff --git a/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java
index 6e35e5e465a..6e35e5e465a 100644
--- a/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java
diff --git a/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaCounters.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaCounters.java
index dbe47c23814..dbe47c23814 100644
--- a/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaCounters.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaCounters.java
diff --git a/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaHttpClient.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaHttpClient.java
index 50a089c8b45..50a089c8b45 100644
--- a/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaHttpClient.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaHttpClient.java
diff --git a/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaQuerySchema.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaQuerySchema.java
index 0208b4165d3..0208b4165d3 100644
--- a/hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaQuerySchema.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaQuerySchema.java
diff --git a/hadoop/src/main/java/com/yahoo/vespa/hadoop/pig/VespaDocumentOperation.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/pig/VespaDocumentOperation.java
index 017ffcdd215..017ffcdd215 100644
--- a/hadoop/src/main/java/com/yahoo/vespa/hadoop/pig/VespaDocumentOperation.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/pig/VespaDocumentOperation.java
diff --git a/hadoop/src/main/java/com/yahoo/vespa/hadoop/pig/VespaQuery.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/pig/VespaQuery.java
index e38e87dda57..e38e87dda57 100644
--- a/hadoop/src/main/java/com/yahoo/vespa/hadoop/pig/VespaQuery.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/pig/VespaQuery.java
diff --git a/hadoop/src/main/java/com/yahoo/vespa/hadoop/pig/VespaSimpleJsonLoader.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/pig/VespaSimpleJsonLoader.java
index 66f04be657f..66f04be657f 100644
--- a/hadoop/src/main/java/com/yahoo/vespa/hadoop/pig/VespaSimpleJsonLoader.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/pig/VespaSimpleJsonLoader.java
diff --git a/hadoop/src/main/java/com/yahoo/vespa/hadoop/pig/VespaStorage.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/pig/VespaStorage.java
index d5000b2b328..d5000b2b328 100644
--- a/hadoop/src/main/java/com/yahoo/vespa/hadoop/pig/VespaStorage.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/pig/VespaStorage.java
diff --git a/hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/MapReduceTest.java b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/MapReduceTest.java
index a79f63a77ce..a79f63a77ce 100644
--- a/hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/MapReduceTest.java
+++ b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/MapReduceTest.java
diff --git a/hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaDocumentOperationTest.java b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaDocumentOperationTest.java
index 0e1a8fba17c..0e1a8fba17c 100644
--- a/hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaDocumentOperationTest.java
+++ b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaDocumentOperationTest.java
diff --git a/hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaQueryTest.java b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaQueryTest.java
index 0f123904cfb..0f123904cfb 100644
--- a/hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaQueryTest.java
+++ b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaQueryTest.java
diff --git a/hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaStorageTest.java b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaStorageTest.java
index 322c729b8c5..322c729b8c5 100644
--- a/hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaStorageTest.java
+++ b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaStorageTest.java
diff --git a/hadoop/src/test/java/com/yahoo/vespa/hadoop/util/MockQueryHandler.java b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/util/MockQueryHandler.java
index 0bf9f6b447e..0bf9f6b447e 100644
--- a/hadoop/src/test/java/com/yahoo/vespa/hadoop/util/MockQueryHandler.java
+++ b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/util/MockQueryHandler.java
diff --git a/hadoop/src/test/java/com/yahoo/vespa/hadoop/util/TupleToolsTest.java b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/util/TupleToolsTest.java
index c98e7b1c02c..c98e7b1c02c 100644
--- a/hadoop/src/test/java/com/yahoo/vespa/hadoop/util/TupleToolsTest.java
+++ b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/util/TupleToolsTest.java
diff --git a/hadoop/src/test/pig/feed_create_operations.pig b/vespa-hadoop/src/test/pig/feed_create_operations.pig
index 2186935b59a..2186935b59a 100644
--- a/hadoop/src/test/pig/feed_create_operations.pig
+++ b/vespa-hadoop/src/test/pig/feed_create_operations.pig
diff --git a/hadoop/src/test/pig/feed_create_operations_short_form.pig b/vespa-hadoop/src/test/pig/feed_create_operations_short_form.pig
index 348616f00ad..348616f00ad 100644
--- a/hadoop/src/test/pig/feed_create_operations_short_form.pig
+++ b/vespa-hadoop/src/test/pig/feed_create_operations_short_form.pig
diff --git a/hadoop/src/test/pig/feed_multiline_operations.pig b/vespa-hadoop/src/test/pig/feed_multiline_operations.pig
index e9efb36858b..e9efb36858b 100644
--- a/hadoop/src/test/pig/feed_multiline_operations.pig
+++ b/vespa-hadoop/src/test/pig/feed_multiline_operations.pig
diff --git a/hadoop/src/test/pig/feed_operations.pig b/vespa-hadoop/src/test/pig/feed_operations.pig
index 327181d4410..327181d4410 100644
--- a/hadoop/src/test/pig/feed_operations.pig
+++ b/vespa-hadoop/src/test/pig/feed_operations.pig
diff --git a/hadoop/src/test/pig/feed_operations_with_json_loader.pig b/vespa-hadoop/src/test/pig/feed_operations_with_json_loader.pig
index 6d31201e4eb..6d31201e4eb 100644
--- a/hadoop/src/test/pig/feed_operations_with_json_loader.pig
+++ b/vespa-hadoop/src/test/pig/feed_operations_with_json_loader.pig
diff --git a/hadoop/src/test/pig/feed_operations_xml.pig b/vespa-hadoop/src/test/pig/feed_operations_xml.pig
index d109d56ad1e..d109d56ad1e 100644
--- a/hadoop/src/test/pig/feed_operations_xml.pig
+++ b/vespa-hadoop/src/test/pig/feed_operations_xml.pig
diff --git a/hadoop/src/test/pig/feed_visit_data.pig b/vespa-hadoop/src/test/pig/feed_visit_data.pig
index 14010c38336..14010c38336 100644
--- a/hadoop/src/test/pig/feed_visit_data.pig
+++ b/vespa-hadoop/src/test/pig/feed_visit_data.pig
diff --git a/hadoop/src/test/pig/query.pig b/vespa-hadoop/src/test/pig/query.pig
index 70f53a992e2..70f53a992e2 100644
--- a/hadoop/src/test/pig/query.pig
+++ b/vespa-hadoop/src/test/pig/query.pig
diff --git a/hadoop/src/test/pig/query_alt_root.pig b/vespa-hadoop/src/test/pig/query_alt_root.pig
index 8995990e398..8995990e398 100644
--- a/hadoop/src/test/pig/query_alt_root.pig
+++ b/vespa-hadoop/src/test/pig/query_alt_root.pig
diff --git a/hadoop/src/test/resources/operations_data.json b/vespa-hadoop/src/test/resources/operations_data.json
index 5af436dbfe7..5af436dbfe7 100644
--- a/hadoop/src/test/resources/operations_data.json
+++ b/vespa-hadoop/src/test/resources/operations_data.json
diff --git a/hadoop/src/test/resources/operations_data.xml b/vespa-hadoop/src/test/resources/operations_data.xml
index cdf1ca78c1d..cdf1ca78c1d 100644
--- a/hadoop/src/test/resources/operations_data.xml
+++ b/vespa-hadoop/src/test/resources/operations_data.xml
diff --git a/hadoop/src/test/resources/operations_multiline_data.json b/vespa-hadoop/src/test/resources/operations_multiline_data.json
index 2b51698d9b7..2b51698d9b7 100644
--- a/hadoop/src/test/resources/operations_multiline_data.json
+++ b/vespa-hadoop/src/test/resources/operations_multiline_data.json
diff --git a/hadoop/src/test/resources/tabular_data.csv b/vespa-hadoop/src/test/resources/tabular_data.csv
index 541597998e9..541597998e9 100644
--- a/hadoop/src/test/resources/tabular_data.csv
+++ b/vespa-hadoop/src/test/resources/tabular_data.csv
diff --git a/hadoop/src/test/resources/user_ids.csv b/vespa-hadoop/src/test/resources/user_ids.csv
index 5875a3b9a7c..5875a3b9a7c 100644
--- a/hadoop/src/test/resources/user_ids.csv
+++ b/vespa-hadoop/src/test/resources/user_ids.csv
diff --git a/hadoop/src/test/resources/visit_data.json b/vespa-hadoop/src/test/resources/visit_data.json
index a48fc9cf1c0..a48fc9cf1c0 100644
--- a/hadoop/src/test/resources/visit_data.json
+++ b/vespa-hadoop/src/test/resources/visit_data.json