From a9785bfd7b01ddc83ac4b6d8d6a0e9f3222b21d4 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <jonbratseth@yahoo.com>
Date: Tue, 13 Jun 2017 20:46:46 +0200
Subject: Revert "Copyright header"

---
 .../src/test/java/com/yahoo/vespa/hadoop/pig/MapReduceTest.java        | 1 -
 .../java/com/yahoo/vespa/hadoop/pig/VespaDocumentOperationTest.java    | 1 -
 .../src/test/java/com/yahoo/vespa/hadoop/pig/VespaQueryTest.java       | 1 -
 .../src/test/java/com/yahoo/vespa/hadoop/pig/VespaStorageTest.java     | 1 -
 .../src/test/java/com/yahoo/vespa/hadoop/util/MockQueryHandler.java    | 1 -
 .../src/test/java/com/yahoo/vespa/hadoop/util/TupleToolsTest.java      | 1 -
 vespa-hadoop/src/test/pig/feed_create_operations.pig                   | 1 -
 vespa-hadoop/src/test/pig/feed_create_operations_short_form.pig        | 1 -
 vespa-hadoop/src/test/pig/feed_multiline_operations.pig                | 1 -
 vespa-hadoop/src/test/pig/feed_operations.pig                          | 3 +--
 vespa-hadoop/src/test/pig/feed_operations_with_json_loader.pig         | 3 +--
 vespa-hadoop/src/test/pig/feed_operations_xml.pig                      | 3 +--
 vespa-hadoop/src/test/pig/feed_visit_data.pig                          | 1 -
 vespa-hadoop/src/test/pig/query.pig                                    | 1 -
 vespa-hadoop/src/test/pig/query_alt_root.pig                           | 1 -
 vespa-hadoop/src/test/resources/operations_data.xml                    | 1 -
 16 files changed, 3 insertions(+), 19 deletions(-)

(limited to 'vespa-hadoop/src/test')

diff --git a/vespa-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 ebb34dbc1b1..a79f63a77ce 100644
--- a/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/MapReduceTest.java
+++ b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/MapReduceTest.java
@@ -1,4 +1,3 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hadoop.pig;
 
 import com.fasterxml.jackson.core.JsonEncoding;
diff --git a/vespa-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 6ff13f5c4fa..0e1a8fba17c 100644
--- a/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaDocumentOperationTest.java
+++ b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaDocumentOperationTest.java
@@ -1,4 +1,3 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hadoop.pig;
 
 import org.apache.pig.data.*;
diff --git a/vespa-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 2d55017b13e..0f123904cfb 100644
--- a/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaQueryTest.java
+++ b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaQueryTest.java
@@ -1,4 +1,3 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hadoop.pig;
 
 import com.sun.net.httpserver.HttpServer;
diff --git a/vespa-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 7ca401a0cc8..322c729b8c5 100644
--- a/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaStorageTest.java
+++ b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/pig/VespaStorageTest.java
@@ -1,4 +1,3 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hadoop.pig;
 
 import static org.junit.Assert.assertEquals;
diff --git a/vespa-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 ab571b284e9..0bf9f6b447e 100644
--- a/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/util/MockQueryHandler.java
+++ b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/util/MockQueryHandler.java
@@ -1,4 +1,3 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hadoop.util;
 
 import com.fasterxml.jackson.core.JsonEncoding;
diff --git a/vespa-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 27080a8b2af..c98e7b1c02c 100644
--- a/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/util/TupleToolsTest.java
+++ b/vespa-hadoop/src/test/java/com/yahoo/vespa/hadoop/util/TupleToolsTest.java
@@ -1,4 +1,3 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hadoop.util;
 
 import com.yahoo.vespa.hadoop.mapreduce.util.TupleTools;
diff --git a/vespa-hadoop/src/test/pig/feed_create_operations.pig b/vespa-hadoop/src/test/pig/feed_create_operations.pig
index 53a5712d0f2..2186935b59a 100644
--- a/vespa-hadoop/src/test/pig/feed_create_operations.pig
+++ b/vespa-hadoop/src/test/pig/feed_create_operations.pig
@@ -1,4 +1,3 @@
--- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 -- REGISTER vespa-hadoop.jar  -- Not needed in tests
 
 -- Create valid Vespa put operations
diff --git a/vespa-hadoop/src/test/pig/feed_create_operations_short_form.pig b/vespa-hadoop/src/test/pig/feed_create_operations_short_form.pig
index ccede2a30b9..348616f00ad 100644
--- a/vespa-hadoop/src/test/pig/feed_create_operations_short_form.pig
+++ b/vespa-hadoop/src/test/pig/feed_create_operations_short_form.pig
@@ -1,4 +1,3 @@
--- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 -- REGISTER vespa-hadoop.jar  -- Not needed in tests
 
 -- Transform tabular data to a Vespa document operation JSON format
diff --git a/vespa-hadoop/src/test/pig/feed_multiline_operations.pig b/vespa-hadoop/src/test/pig/feed_multiline_operations.pig
index bd232c49cb3..e9efb36858b 100644
--- a/vespa-hadoop/src/test/pig/feed_multiline_operations.pig
+++ b/vespa-hadoop/src/test/pig/feed_multiline_operations.pig
@@ -1,4 +1,3 @@
--- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 -- REGISTER vespa-hadoop.jar  -- Not needed in tests
 
 -- Define short name for VespaJsonLoader
diff --git a/vespa-hadoop/src/test/pig/feed_operations.pig b/vespa-hadoop/src/test/pig/feed_operations.pig
index d2d1af4c417..327181d4410 100644
--- a/vespa-hadoop/src/test/pig/feed_operations.pig
+++ b/vespa-hadoop/src/test/pig/feed_operations.pig
@@ -1,4 +1,3 @@
--- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 -- REGISTER vespa-hadoop.jar  -- Not needed in tests
 
 -- Define short name for VespaStorage
@@ -8,4 +7,4 @@ DEFINE VespaStorage com.yahoo.vespa.hadoop.pig.VespaStorage();
 metrics = LOAD 'src/test/resources/operations_data.json' AS (data:chararray);
 
 -- Store into Vespa
-STORE metrics INTO '$ENDPOINT' USING VespaStorage();
+STORE metrics INTO '$ENDPOINT' USING VespaStorage();
\ No newline at end of file
diff --git a/vespa-hadoop/src/test/pig/feed_operations_with_json_loader.pig b/vespa-hadoop/src/test/pig/feed_operations_with_json_loader.pig
index a1788db8570..6d31201e4eb 100644
--- a/vespa-hadoop/src/test/pig/feed_operations_with_json_loader.pig
+++ b/vespa-hadoop/src/test/pig/feed_operations_with_json_loader.pig
@@ -1,4 +1,3 @@
--- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 -- REGISTER vespa-hadoop.jar  -- Not needed in tests
 
 -- Define short name for VespaJsonLoader
@@ -11,4 +10,4 @@ DEFINE VespaStorage com.yahoo.vespa.hadoop.pig.VespaStorage();
 metrics = LOAD 'src/test/resources/operations_data.json' USING VespaJsonLoader() AS (data:chararray);
 
 -- Store into Vespa
-STORE metrics INTO '$ENDPOINT' USING VespaStorage();
+STORE metrics INTO '$ENDPOINT' USING VespaStorage();
\ No newline at end of file
diff --git a/vespa-hadoop/src/test/pig/feed_operations_xml.pig b/vespa-hadoop/src/test/pig/feed_operations_xml.pig
index 835c2a033e3..d109d56ad1e 100644
--- a/vespa-hadoop/src/test/pig/feed_operations_xml.pig
+++ b/vespa-hadoop/src/test/pig/feed_operations_xml.pig
@@ -1,4 +1,3 @@
--- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 -- REGISTER vespa-hadoop.jar  -- Not needed in tests
 
 -- Define short name for VespaStorage
@@ -8,4 +7,4 @@ DEFINE VespaStorage com.yahoo.vespa.hadoop.pig.VespaStorage();
 data = LOAD 'src/test/resources/operations_data.xml' AS (data:chararray);
 
 -- Store into Vespa
-STORE data INTO '$ENDPOINT' USING VespaStorage();
+STORE data INTO '$ENDPOINT' USING VespaStorage();
\ No newline at end of file
diff --git a/vespa-hadoop/src/test/pig/feed_visit_data.pig b/vespa-hadoop/src/test/pig/feed_visit_data.pig
index 28d7d4be353..14010c38336 100644
--- a/vespa-hadoop/src/test/pig/feed_visit_data.pig
+++ b/vespa-hadoop/src/test/pig/feed_visit_data.pig
@@ -1,4 +1,3 @@
--- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 -- REGISTER vespa-hadoop.jar  -- Not needed in tests
 
 -- Define short name for VespaStorage
diff --git a/vespa-hadoop/src/test/pig/query.pig b/vespa-hadoop/src/test/pig/query.pig
index ee8e0d3848e..70f53a992e2 100644
--- a/vespa-hadoop/src/test/pig/query.pig
+++ b/vespa-hadoop/src/test/pig/query.pig
@@ -1,4 +1,3 @@
--- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 -- REGISTER vespa-hadoop.jar  -- Not needed in tests
 
 -- Define Vespa query for retrieving blog posts
diff --git a/vespa-hadoop/src/test/pig/query_alt_root.pig b/vespa-hadoop/src/test/pig/query_alt_root.pig
index 18ead97dde1..8995990e398 100644
--- a/vespa-hadoop/src/test/pig/query_alt_root.pig
+++ b/vespa-hadoop/src/test/pig/query_alt_root.pig
@@ -1,4 +1,3 @@
--- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 -- REGISTER vespa-hadoop.jar  -- Not needed in tests
 
 -- Define Vespa query for retrieving blog posts
diff --git a/vespa-hadoop/src/test/resources/operations_data.xml b/vespa-hadoop/src/test/resources/operations_data.xml
index d8399675211..cdf1ca78c1d 100644
--- a/vespa-hadoop/src/test/resources/operations_data.xml
+++ b/vespa-hadoop/src/test/resources/operations_data.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <vespafeed>
     <document documenttype="music" documentid="id:music:music::http://music.yahoo.com/a-ha/Scoundrel+Days"> <url>http://music.yahoo.com/a-ha/Scoundrel+Days</url> <title><![CDATA[Scoundrel Days]]></title> <artist><![CDATA[a-ha]]></artist> <year>0</year> <popularity>290</popularity> </document>
     <document documenttype="music" documentid="id:music:music::http://music.yahoo.com/Accept/Restless+And+Wild"> <url>http://music.yahoo.com/Accept/Restless+And+Wild</url> <title><![CDATA[Restless And Wild]]></title> <artist><![CDATA[Accept]]></artist> <year>0</year> <popularity>75</popularity> </document>
-- 
cgit v1.2.3