aboutsummaryrefslogtreecommitdiffstats
path: root/document/src/tests
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-06-14 18:25:40 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2017-06-14 18:25:40 +0200
commitcedacfeac5330e4acd7a49bcbb37a1d8de9b6348 (patch)
treef81f4112051da0bfb5c840c6cee3891991f5a8e3 /document/src/tests
parent84560e700ad98068e2fa360c97ed5e99d826efd2 (diff)
Update copyright headers
Diffstat (limited to 'document/src/tests')
-rw-r--r--document/src/tests/CMakeLists.txt2
-rw-r--r--document/src/tests/annotation/CMakeLists.txt2
-rw-r--r--document/src/tests/annotation/annotation_test.cpp2
-rw-r--r--document/src/tests/arrayfieldvaluetest.cpp2
-rw-r--r--document/src/tests/arrayfieldvaluetest.h2
-rw-r--r--document/src/tests/base/CMakeLists.txt2
-rw-r--r--document/src/tests/base/documentid_benchmark.cpp2
-rw-r--r--document/src/tests/base/documentid_test.cpp2
-rw-r--r--document/src/tests/bucketselectortest.cpp2
-rw-r--r--document/src/tests/buckettest.cpp2
-rw-r--r--document/src/tests/datatype/CMakeLists.txt2
-rw-r--r--document/src/tests/datatype/datatype_test.cpp2
-rw-r--r--document/src/tests/datatype/referencedatatype_test.cpp2
-rw-r--r--document/src/tests/documentcalculatortestcase.cpp2
-rw-r--r--document/src/tests/documentidtest.cpp2
-rw-r--r--document/src/tests/documentselectparsertest.cpp2
-rw-r--r--document/src/tests/documentselecttest.h2
-rw-r--r--document/src/tests/documenttestcase.cpp2
-rw-r--r--document/src/tests/documenttypetestcase.cpp2
-rw-r--r--document/src/tests/documentupdatetestcase.cpp2
-rw-r--r--document/src/tests/documentupdatetestcase.h2
-rw-r--r--document/src/tests/fieldpathupdatetestcase.cpp2
-rw-r--r--document/src/tests/fieldsettest.cpp2
-rw-r--r--document/src/tests/fieldtestcase.h2
-rw-r--r--document/src/tests/fieldvalue/CMakeLists.txt2
-rw-r--r--document/src/tests/fieldvalue/document_test.cpp2
-rw-r--r--document/src/tests/fieldvalue/fieldvalue_test.cpp2
-rw-r--r--document/src/tests/fieldvalue/predicatefieldvalue_test.cpp2
-rw-r--r--document/src/tests/fieldvalue/referencefieldvalue_test.cpp2
-rw-r--r--document/src/tests/forcelinktest.cpp2
-rw-r--r--document/src/tests/gid_filter_test.cpp2
-rw-r--r--document/src/tests/globalidtest.cpp2
-rw-r--r--document/src/tests/heapdebugger.h2
-rw-r--r--document/src/tests/heapdebuggerlinux.cpp2
-rw-r--r--document/src/tests/heapdebuggerother.cpp2
-rw-r--r--document/src/tests/orderingselectortest.cpp2
-rw-r--r--document/src/tests/positiontypetest.cpp2
-rw-r--r--document/src/tests/predicate/CMakeLists.txt2
-rw-r--r--document/src/tests/predicate/predicate_builder_test.cpp2
-rw-r--r--document/src/tests/predicate/predicate_printer_test.cpp2
-rw-r--r--document/src/tests/predicate/predicate_test.cpp2
-rw-r--r--document/src/tests/primitivefieldvaluetest.cpp2
-rw-r--r--document/src/tests/repo/CMakeLists.txt2
-rw-r--r--document/src/tests/repo/documenttyperepo_test.cpp2
-rw-r--r--document/src/tests/serialization/CMakeLists.txt2
-rw-r--r--document/src/tests/serialization/annotationserializer_test.cpp2
-rw-r--r--document/src/tests/serialization/compression_test.cpp2
-rw-r--r--document/src/tests/serialization/vespadocumentserializer_test.cpp2
-rw-r--r--document/src/tests/setfieldvaluetest.h2
-rw-r--r--document/src/tests/stringtokenizertest.cpp2
-rw-r--r--document/src/tests/struct_anno/CMakeLists.txt2
-rw-r--r--document/src/tests/struct_anno/struct_anno_test.cpp2
-rw-r--r--document/src/tests/structfieldvaluetest.cpp2
-rw-r--r--document/src/tests/tensor_fieldvalue/CMakeLists.txt2
-rw-r--r--document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp2
-rw-r--r--document/src/tests/testbytebuffer.cpp2
-rw-r--r--document/src/tests/testbytebuffer.h2
-rw-r--r--document/src/tests/testcase.h2
-rw-r--r--document/src/tests/testdocmantest.cpp2
-rw-r--r--document/src/tests/testrunner.cpp2
-rw-r--r--document/src/tests/teststringutil.cpp2
-rw-r--r--document/src/tests/teststringutil.h2
-rw-r--r--document/src/tests/testxml.cpp2
-rw-r--r--document/src/tests/urltypetest.cpp2
-rwxr-xr-xdocument/src/tests/vespaxml/fieldpathupdates.xml2
-rw-r--r--document/src/tests/vespaxml/test1.expected.xml2
-rw-r--r--document/src/tests/vespaxml/test1.xml2
-rw-r--r--document/src/tests/vespaxml/test10.xml2
-rw-r--r--document/src/tests/vespaxml/test11.xml2
-rw-r--r--document/src/tests/vespaxml/test12.xml2
-rw-r--r--document/src/tests/vespaxml/test13.xml2
-rw-r--r--document/src/tests/vespaxml/test14.xml2
-rw-r--r--document/src/tests/vespaxml/test15.xml2
-rw-r--r--document/src/tests/vespaxml/test16.xml2
-rw-r--r--document/src/tests/vespaxml/test17.xml2
-rw-r--r--document/src/tests/vespaxml/test18.xml2
-rw-r--r--document/src/tests/vespaxml/test2.expected.xml2
-rw-r--r--document/src/tests/vespaxml/test2.xml2
-rw-r--r--document/src/tests/vespaxml/test20.xml2
-rw-r--r--document/src/tests/vespaxml/test21.xml2
-rw-r--r--document/src/tests/vespaxml/test22.xml2
-rw-r--r--document/src/tests/vespaxml/test23.xml2
-rw-r--r--document/src/tests/vespaxml/test24.xml2
-rw-r--r--document/src/tests/vespaxml/test25.xml2
-rw-r--r--document/src/tests/vespaxml/test26.xml2
-rw-r--r--document/src/tests/vespaxml/test27.xml2
-rw-r--r--document/src/tests/vespaxml/test28.xml2
-rw-r--r--document/src/tests/vespaxml/test29.xml2
-rw-r--r--document/src/tests/vespaxml/test3.xml2
-rw-r--r--document/src/tests/vespaxml/test30.xml2
-rw-r--r--document/src/tests/vespaxml/test32.xml2
-rw-r--r--document/src/tests/vespaxml/test33.xml2
-rw-r--r--document/src/tests/vespaxml/test34.xml2
-rw-r--r--document/src/tests/vespaxml/test35.xml2
-rw-r--r--document/src/tests/vespaxml/test36.xml2
-rw-r--r--document/src/tests/vespaxml/test37.xml2
-rw-r--r--document/src/tests/vespaxml/test4.xml2
-rw-r--r--document/src/tests/vespaxml/test40.xml2
-rw-r--r--document/src/tests/vespaxml/test41.xml2
-rw-r--r--document/src/tests/vespaxml/test42.xml2
-rw-r--r--document/src/tests/vespaxml/test43.xml2
-rw-r--r--document/src/tests/vespaxml/test45.xml2
-rw-r--r--document/src/tests/vespaxml/test46.xml2
-rw-r--r--document/src/tests/vespaxml/test47.xml2
-rw-r--r--document/src/tests/vespaxml/test48.xml2
-rw-r--r--document/src/tests/vespaxml/test49.xml2
-rw-r--r--document/src/tests/vespaxml/test5.expected.xml2
-rw-r--r--document/src/tests/vespaxml/test5.xml2
-rw-r--r--document/src/tests/vespaxml/test50.xml2
-rw-r--r--document/src/tests/vespaxml/test51.xml2
-rw-r--r--document/src/tests/vespaxml/test52.xml2
-rw-r--r--document/src/tests/vespaxml/test53.xml2
-rw-r--r--document/src/tests/vespaxml/test54.xml2
-rw-r--r--document/src/tests/vespaxml/test55.xml2
-rw-r--r--document/src/tests/vespaxml/test56.xml2
-rw-r--r--document/src/tests/vespaxml/test57.xml2
-rw-r--r--document/src/tests/vespaxml/test58.xml2
-rw-r--r--document/src/tests/vespaxml/test59.xml2
-rw-r--r--document/src/tests/vespaxml/test6.xml2
-rw-r--r--document/src/tests/vespaxml/test7.xml2
-rw-r--r--document/src/tests/vespaxml/test8.xml2
-rw-r--r--document/src/tests/vespaxml/test9.xml2
-rw-r--r--document/src/tests/vespaxml/test_arraystruct.xml2
-rw-r--r--document/src/tests/vespaxml/test_doc5.xml2
-rw-r--r--document/src/tests/vespaxml/test_doc6.xml2
-rw-r--r--document/src/tests/vespaxml/test_doc8.xml2
-rw-r--r--document/src/tests/vespaxml/test_externalentity.xml2
-rw-r--r--document/src/tests/vespaxml/test_idprefix.xml2
-rw-r--r--document/src/tests/vespaxml/test_struct.xml2
-rw-r--r--document/src/tests/vespaxml/test_update1.xml2
-rw-r--r--document/src/tests/weightedsetfieldvaluetest.cpp2
-rw-r--r--document/src/tests/weightedsetfieldvaluetest.h2
132 files changed, 132 insertions, 132 deletions
diff --git a/document/src/tests/CMakeLists.txt b/document/src/tests/CMakeLists.txt
index df024925199..197f7cc508a 100644
--- a/document/src/tests/CMakeLists.txt
+++ b/document/src/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_add_executable(document_testrunner_app TEST
SOURCES
teststringutil.cpp
diff --git a/document/src/tests/annotation/CMakeLists.txt b/document/src/tests/annotation/CMakeLists.txt
index 5ecb7213266..f0f205c2676 100644
--- a/document/src/tests/annotation/CMakeLists.txt
+++ b/document/src/tests/annotation/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_add_executable(document_annotation_test_app TEST
SOURCES
annotation_test.cpp
diff --git a/document/src/tests/annotation/annotation_test.cpp b/document/src/tests/annotation/annotation_test.cpp
index 7a6cf3fdf46..846504fda94 100644
--- a/document/src/tests/annotation/annotation_test.cpp
+++ b/document/src/tests/annotation/annotation_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
// Unit tests for annotation.
#include <stdlib.h>
diff --git a/document/src/tests/arrayfieldvaluetest.cpp b/document/src/tests/arrayfieldvaluetest.cpp
index 0535edc495b..c9a35bacf1c 100644
--- a/document/src/tests/arrayfieldvaluetest.cpp
+++ b/document/src/tests/arrayfieldvaluetest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/fieldvalue/fieldvalues.h>
#include <vespa/document/serialization/vespadocumentdeserializer.h>
diff --git a/document/src/tests/arrayfieldvaluetest.h b/document/src/tests/arrayfieldvaluetest.h
index 8118d57021a..b8ae6a20b8d 100644
--- a/document/src/tests/arrayfieldvaluetest.h
+++ b/document/src/tests/arrayfieldvaluetest.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/* $Id$*/
#pragma once
diff --git a/document/src/tests/base/CMakeLists.txt b/document/src/tests/base/CMakeLists.txt
index b5099443252..da751679c36 100644
--- a/document/src/tests/base/CMakeLists.txt
+++ b/document/src/tests/base/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_add_executable(document_documentid_test_app TEST
SOURCES
documentid_test.cpp
diff --git a/document/src/tests/base/documentid_benchmark.cpp b/document/src/tests/base/documentid_benchmark.cpp
index 16f9c9016d7..632c47507bd 100644
--- a/document/src/tests/base/documentid_benchmark.cpp
+++ b/document/src/tests/base/documentid_benchmark.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/base/documentid.h>
using namespace document;
diff --git a/document/src/tests/base/documentid_test.cpp b/document/src/tests/base/documentid_test.cpp
index 7f17685f84e..adb999d7430 100644
--- a/document/src/tests/base/documentid_test.cpp
+++ b/document/src/tests/base/documentid_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
// Unit tests for documentid.
#include <vespa/document/base/documentid.h>
diff --git a/document/src/tests/bucketselectortest.cpp b/document/src/tests/bucketselectortest.cpp
index e91243cbcb8..d2a66737d19 100644
--- a/document/src/tests/bucketselectortest.cpp
+++ b/document/src/tests/bucketselectortest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/bucket/bucketselector.h>
diff --git a/document/src/tests/buckettest.cpp b/document/src/tests/buckettest.cpp
index be5f9cb6cdb..2aae0c87102 100644
--- a/document/src/tests/buckettest.cpp
+++ b/document/src/tests/buckettest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <cppunit/extensions/HelperMacros.h>
#include <vespa/document/bucket/bucketidfactory.h>
diff --git a/document/src/tests/datatype/CMakeLists.txt b/document/src/tests/datatype/CMakeLists.txt
index 7b46ca675b3..173a877be72 100644
--- a/document/src/tests/datatype/CMakeLists.txt
+++ b/document/src/tests/datatype/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_add_executable(document_datatype_test_app TEST
SOURCES
datatype_test.cpp
diff --git a/document/src/tests/datatype/datatype_test.cpp b/document/src/tests/datatype/datatype_test.cpp
index 07a660a5e97..a04e37e3eca 100644
--- a/document/src/tests/datatype/datatype_test.cpp
+++ b/document/src/tests/datatype/datatype_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
// Unit tests for datatype.
#include <vespa/document/base/field.h>
diff --git a/document/src/tests/datatype/referencedatatype_test.cpp b/document/src/tests/datatype/referencedatatype_test.cpp
index 2844a84b6cc..496295275fe 100644
--- a/document/src/tests/datatype/referencedatatype_test.cpp
+++ b/document/src/tests/datatype/referencedatatype_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/base/field.h>
#include <vespa/document/datatype/referencedatatype.h>
diff --git a/document/src/tests/documentcalculatortestcase.cpp b/document/src/tests/documentcalculatortestcase.cpp
index bc112c80a8c..e313f3f33b5 100644
--- a/document/src/tests/documentcalculatortestcase.cpp
+++ b/document/src/tests/documentcalculatortestcase.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/base/testdocrepo.h>
#include <vespa/vespalib/io/fileutil.h>
diff --git a/document/src/tests/documentidtest.cpp b/document/src/tests/documentidtest.cpp
index d92219f9b31..ae5c25a22ef 100644
--- a/document/src/tests/documentidtest.cpp
+++ b/document/src/tests/documentidtest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <cppunit/extensions/HelperMacros.h>
#include <vespa/vespalib/testkit/test_kit.h>
diff --git a/document/src/tests/documentselectparsertest.cpp b/document/src/tests/documentselectparsertest.cpp
index 7fb7703c04a..b6bfaece448 100644
--- a/document/src/tests/documentselectparsertest.cpp
+++ b/document/src/tests/documentselectparsertest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <cppunit/TestFixture.h>
diff --git a/document/src/tests/documentselecttest.h b/document/src/tests/documentselecttest.h
index d8cb4d427e1..e50dd984b65 100644
--- a/document/src/tests/documentselecttest.h
+++ b/document/src/tests/documentselecttest.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/* $Id$*/
#pragma once
diff --git a/document/src/tests/documenttestcase.cpp b/document/src/tests/documenttestcase.cpp
index 1aa6f5fcaa2..4a93d45831d 100644
--- a/document/src/tests/documenttestcase.cpp
+++ b/document/src/tests/documenttestcase.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/base/testdocman.h>
#include <vespa/vespalib/io/fileutil.h>
diff --git a/document/src/tests/documenttypetestcase.cpp b/document/src/tests/documenttypetestcase.cpp
index c7856ff9cf5..dfca4a67e31 100644
--- a/document/src/tests/documenttypetestcase.cpp
+++ b/document/src/tests/documenttypetestcase.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/base/testdocrepo.h>
#include <vespa/document/datatype/documenttype.h>
#include <vespa/document/fieldvalue/fieldvalues.h>
diff --git a/document/src/tests/documentupdatetestcase.cpp b/document/src/tests/documentupdatetestcase.cpp
index e3cab489aab..2324d21cd24 100644
--- a/document/src/tests/documentupdatetestcase.cpp
+++ b/document/src/tests/documentupdatetestcase.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/fieldvalue/fieldvalues.h>
#include <vespa/document/update/documentupdate.h>
diff --git a/document/src/tests/documentupdatetestcase.h b/document/src/tests/documentupdatetestcase.h
index b8d8294ec0d..ebe5f1b144a 100644
--- a/document/src/tests/documentupdatetestcase.h
+++ b/document/src/tests/documentupdatetestcase.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/* $Id$*/
#pragma once
diff --git a/document/src/tests/fieldpathupdatetestcase.cpp b/document/src/tests/fieldpathupdatetestcase.cpp
index 2cf29e4cc53..e37b8c4f2b9 100644
--- a/document/src/tests/fieldpathupdatetestcase.cpp
+++ b/document/src/tests/fieldpathupdatetestcase.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/base/testdocman.h>
#include <vespa/document/fieldvalue/fieldvalues.h>
#include <vespa/document/fieldvalue/iteratorhandler.h>
diff --git a/document/src/tests/fieldsettest.cpp b/document/src/tests/fieldsettest.cpp
index 647535410bd..0599ce723a6 100644
--- a/document/src/tests/fieldsettest.cpp
+++ b/document/src/tests/fieldsettest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/base/testdocman.h>
#include <vespa/document/fieldset/fieldsetrepo.h>
diff --git a/document/src/tests/fieldtestcase.h b/document/src/tests/fieldtestcase.h
index 0001b8fce1f..68c375ae103 100644
--- a/document/src/tests/fieldtestcase.h
+++ b/document/src/tests/fieldtestcase.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/* $Id$*/
#pragma once
diff --git a/document/src/tests/fieldvalue/CMakeLists.txt b/document/src/tests/fieldvalue/CMakeLists.txt
index 852ff35ea52..e213df4a58f 100644
--- a/document/src/tests/fieldvalue/CMakeLists.txt
+++ b/document/src/tests/fieldvalue/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_add_executable(document_document_test_app TEST
SOURCES
document_test.cpp
diff --git a/document/src/tests/fieldvalue/document_test.cpp b/document/src/tests/fieldvalue/document_test.cpp
index b834b34706b..b2f6f3a1999 100644
--- a/document/src/tests/fieldvalue/document_test.cpp
+++ b/document/src/tests/fieldvalue/document_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
// Unit tests for document.
#include <vespa/document/base/documentid.h>
diff --git a/document/src/tests/fieldvalue/fieldvalue_test.cpp b/document/src/tests/fieldvalue/fieldvalue_test.cpp
index 18a16f3c101..6d3b1de0b2f 100644
--- a/document/src/tests/fieldvalue/fieldvalue_test.cpp
+++ b/document/src/tests/fieldvalue/fieldvalue_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
// Unit tests for fieldvalue.
#include <vespa/log/log.h>
diff --git a/document/src/tests/fieldvalue/predicatefieldvalue_test.cpp b/document/src/tests/fieldvalue/predicatefieldvalue_test.cpp
index a444c17a037..41df9f9967b 100644
--- a/document/src/tests/fieldvalue/predicatefieldvalue_test.cpp
+++ b/document/src/tests/fieldvalue/predicatefieldvalue_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
// Unit tests for predicatefieldvalue.
#include <vespa/log/log.h>
diff --git a/document/src/tests/fieldvalue/referencefieldvalue_test.cpp b/document/src/tests/fieldvalue/referencefieldvalue_test.cpp
index 254bd546926..d34bbff8a54 100644
--- a/document/src/tests/fieldvalue/referencefieldvalue_test.cpp
+++ b/document/src/tests/fieldvalue/referencefieldvalue_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/base/field.h>
#include <vespa/document/datatype/referencedatatype.h>
diff --git a/document/src/tests/forcelinktest.cpp b/document/src/tests/forcelinktest.cpp
index 121e900b6e7..6839843c7aa 100644
--- a/document/src/tests/forcelinktest.cpp
+++ b/document/src/tests/forcelinktest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/base/forcelink.h>
#include <cppunit/extensions/HelperMacros.h>
diff --git a/document/src/tests/gid_filter_test.cpp b/document/src/tests/gid_filter_test.cpp
index 02a47bffe6f..fea4cdbfe95 100644
--- a/document/src/tests/gid_filter_test.cpp
+++ b/document/src/tests/gid_filter_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
// Copyright 2016 Yahoo! Technologies Norway AS
#include <cppunit/TestFixture.h>
diff --git a/document/src/tests/globalidtest.cpp b/document/src/tests/globalidtest.cpp
index cc4e0a6b687..c72ede2f20e 100644
--- a/document/src/tests/globalidtest.cpp
+++ b/document/src/tests/globalidtest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <cppunit/extensions/HelperMacros.h>
#include <vespa/document/bucket/bucketidfactory.h>
#include <vespa/document/base/documentid.h>
diff --git a/document/src/tests/heapdebugger.h b/document/src/tests/heapdebugger.h
index deb862fbec3..84ce5bd1454 100644
--- a/document/src/tests/heapdebugger.h
+++ b/document/src/tests/heapdebugger.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* @file heapdebugger.h
*
diff --git a/document/src/tests/heapdebuggerlinux.cpp b/document/src/tests/heapdebuggerlinux.cpp
index c9e266602a1..125bb2cce24 100644
--- a/document/src/tests/heapdebuggerlinux.cpp
+++ b/document/src/tests/heapdebuggerlinux.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
*
* @author Ove Martin Malm
diff --git a/document/src/tests/heapdebuggerother.cpp b/document/src/tests/heapdebuggerother.cpp
index f5522488348..a98203bd8c8 100644
--- a/document/src/tests/heapdebuggerother.cpp
+++ b/document/src/tests/heapdebuggerother.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
*
* @author Ove Martin Malm
diff --git a/document/src/tests/orderingselectortest.cpp b/document/src/tests/orderingselectortest.cpp
index 3157dfbf281..c80d81c8e01 100644
--- a/document/src/tests/orderingselectortest.cpp
+++ b/document/src/tests/orderingselectortest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/select/orderingselector.h>
#include <vespa/document/bucket/bucketidfactory.h>
diff --git a/document/src/tests/positiontypetest.cpp b/document/src/tests/positiontypetest.cpp
index 14e070b371e..f8c3434ca39 100644
--- a/document/src/tests/positiontypetest.cpp
+++ b/document/src/tests/positiontypetest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/datatype/positiondatatype.h>
#include <cppunit/extensions/HelperMacros.h>
diff --git a/document/src/tests/predicate/CMakeLists.txt b/document/src/tests/predicate/CMakeLists.txt
index d1181340852..2d5098dfe11 100644
--- a/document/src/tests/predicate/CMakeLists.txt
+++ b/document/src/tests/predicate/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_add_executable(document_predicate_test_app TEST
SOURCES
predicate_test.cpp
diff --git a/document/src/tests/predicate/predicate_builder_test.cpp b/document/src/tests/predicate/predicate_builder_test.cpp
index da3541e9536..8497d580776 100644
--- a/document/src/tests/predicate/predicate_builder_test.cpp
+++ b/document/src/tests/predicate/predicate_builder_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
// Unit tests for predicate_builder.
#include <vespa/log/log.h>
diff --git a/document/src/tests/predicate/predicate_printer_test.cpp b/document/src/tests/predicate/predicate_printer_test.cpp
index ff9a7d3fee9..906229920ad 100644
--- a/document/src/tests/predicate/predicate_printer_test.cpp
+++ b/document/src/tests/predicate/predicate_printer_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
// Unit tests for predicate_printer.
#include <vespa/log/log.h>
diff --git a/document/src/tests/predicate/predicate_test.cpp b/document/src/tests/predicate/predicate_test.cpp
index 2ac7c921a10..e8db197fdad 100644
--- a/document/src/tests/predicate/predicate_test.cpp
+++ b/document/src/tests/predicate/predicate_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
// Unit tests for predicate.
#include <vespa/log/log.h>
diff --git a/document/src/tests/primitivefieldvaluetest.cpp b/document/src/tests/primitivefieldvaluetest.cpp
index 018408a2d02..39abba58e6f 100644
--- a/document/src/tests/primitivefieldvaluetest.cpp
+++ b/document/src/tests/primitivefieldvaluetest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/fieldvalue/fieldvalues.h>
#include <vespa/document/serialization/vespadocumentdeserializer.h>
diff --git a/document/src/tests/repo/CMakeLists.txt b/document/src/tests/repo/CMakeLists.txt
index 8b268d1f719..762d3106dbc 100644
--- a/document/src/tests/repo/CMakeLists.txt
+++ b/document/src/tests/repo/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_add_executable(document_documenttyperepo_test_app TEST
SOURCES
documenttyperepo_test.cpp
diff --git a/document/src/tests/repo/documenttyperepo_test.cpp b/document/src/tests/repo/documenttyperepo_test.cpp
index 38ae51b980f..508e6f237cf 100644
--- a/document/src/tests/repo/documenttyperepo_test.cpp
+++ b/document/src/tests/repo/documenttyperepo_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
// Unit tests for documenttyperepo.
#include <vespa/document/base/testdocrepo.h>
diff --git a/document/src/tests/serialization/CMakeLists.txt b/document/src/tests/serialization/CMakeLists.txt
index cd645adf0ad..5b23bffad26 100644
--- a/document/src/tests/serialization/CMakeLists.txt
+++ b/document/src/tests/serialization/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_add_executable(document_vespadocumentserializer_test_app TEST
SOURCES
vespadocumentserializer_test.cpp
diff --git a/document/src/tests/serialization/annotationserializer_test.cpp b/document/src/tests/serialization/annotationserializer_test.cpp
index 49860df128d..9f045980f92 100644
--- a/document/src/tests/serialization/annotationserializer_test.cpp
+++ b/document/src/tests/serialization/annotationserializer_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/base/testdocrepo.h>
#include <vespa/document/annotation/alternatespanlist.h>
diff --git a/document/src/tests/serialization/compression_test.cpp b/document/src/tests/serialization/compression_test.cpp
index 240a309d180..6574b4ac34c 100644
--- a/document/src/tests/serialization/compression_test.cpp
+++ b/document/src/tests/serialization/compression_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/vespalib/testkit/test_kit.h>
#include <vespa/vespalib/stllike/string.h>
diff --git a/document/src/tests/serialization/vespadocumentserializer_test.cpp b/document/src/tests/serialization/vespadocumentserializer_test.cpp
index 253b34d7e82..4b4f46bbaa9 100644
--- a/document/src/tests/serialization/vespadocumentserializer_test.cpp
+++ b/document/src/tests/serialization/vespadocumentserializer_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
// Unit tests for vespadocumentserializer.
#include <vespa/document/annotation/annotation.h>
diff --git a/document/src/tests/setfieldvaluetest.h b/document/src/tests/setfieldvaluetest.h
index a27aeedf11d..9ba8a1e3371 100644
--- a/document/src/tests/setfieldvaluetest.h
+++ b/document/src/tests/setfieldvaluetest.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/* $Id$*/
#pragma once
diff --git a/document/src/tests/stringtokenizertest.cpp b/document/src/tests/stringtokenizertest.cpp
index 0432db58624..8af90d3b436 100644
--- a/document/src/tests/stringtokenizertest.cpp
+++ b/document/src/tests/stringtokenizertest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <cppunit/extensions/HelperMacros.h>
#include <iostream>
diff --git a/document/src/tests/struct_anno/CMakeLists.txt b/document/src/tests/struct_anno/CMakeLists.txt
index 495d58a4d55..7a4f19be647 100644
--- a/document/src/tests/struct_anno/CMakeLists.txt
+++ b/document/src/tests/struct_anno/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_add_executable(document_struct_anno_test_app TEST
SOURCES
struct_anno_test.cpp
diff --git a/document/src/tests/struct_anno/struct_anno_test.cpp b/document/src/tests/struct_anno/struct_anno_test.cpp
index 9feb5b8a040..32d880c50c3 100644
--- a/document/src/tests/struct_anno/struct_anno_test.cpp
+++ b/document/src/tests/struct_anno/struct_anno_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/base/testdocrepo.h>
#include <vespa/document/annotation/alternatespanlist.h>
diff --git a/document/src/tests/structfieldvaluetest.cpp b/document/src/tests/structfieldvaluetest.cpp
index 1b2fa17a79a..38e915ec82d 100644
--- a/document/src/tests/structfieldvaluetest.cpp
+++ b/document/src/tests/structfieldvaluetest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/fieldvalue/fieldvalues.h>
#include <vespa/document/datatype/documenttype.h>
diff --git a/document/src/tests/tensor_fieldvalue/CMakeLists.txt b/document/src/tests/tensor_fieldvalue/CMakeLists.txt
index 4456d5a0c2b..0c80f5af704 100644
--- a/document/src/tests/tensor_fieldvalue/CMakeLists.txt
+++ b/document/src/tests/tensor_fieldvalue/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
vespa_add_executable(document_tensor_fieldvalue_test_app TEST
SOURCES
tensor_fieldvalue_test.cpp
diff --git a/document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp b/document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp
index 5adab10e2cc..c796a7c94c7 100644
--- a/document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp
+++ b/document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
// Unit tests for tensor_fieldvalue.
#include <vespa/log/log.h>
diff --git a/document/src/tests/testbytebuffer.cpp b/document/src/tests/testbytebuffer.cpp
index 911a15da64b..baa4bb65249 100644
--- a/document/src/tests/testbytebuffer.cpp
+++ b/document/src/tests/testbytebuffer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/util/stringutil.h>
#include <vespa/document/util/bytebuffer.h>
diff --git a/document/src/tests/testbytebuffer.h b/document/src/tests/testbytebuffer.h
index baeccef979a..d7dfc835d3c 100644
--- a/document/src/tests/testbytebuffer.h
+++ b/document/src/tests/testbytebuffer.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/* $Id$*/
#pragma once
diff --git a/document/src/tests/testcase.h b/document/src/tests/testcase.h
index 68ac5066c2d..3e52b2c82b8 100644
--- a/document/src/tests/testcase.h
+++ b/document/src/tests/testcase.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/* $Id$*/
#pragma once
diff --git a/document/src/tests/testdocmantest.cpp b/document/src/tests/testdocmantest.cpp
index 2decb984556..7714644cad2 100644
--- a/document/src/tests/testdocmantest.cpp
+++ b/document/src/tests/testdocmantest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/* $Id$*/
diff --git a/document/src/tests/testrunner.cpp b/document/src/tests/testrunner.cpp
index 815476a3f41..abe9c53debb 100644
--- a/document/src/tests/testrunner.cpp
+++ b/document/src/tests/testrunner.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/vdstestlib/cppunit/cppunittestrunner.h>
diff --git a/document/src/tests/teststringutil.cpp b/document/src/tests/teststringutil.cpp
index 54c7457a10d..3d741d4827f 100644
--- a/document/src/tests/teststringutil.cpp
+++ b/document/src/tests/teststringutil.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
* Test program for StringUtil methods
*
diff --git a/document/src/tests/teststringutil.h b/document/src/tests/teststringutil.h
index cba15682d7e..bcc7617d1d4 100644
--- a/document/src/tests/teststringutil.h
+++ b/document/src/tests/teststringutil.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#pragma once
diff --git a/document/src/tests/testxml.cpp b/document/src/tests/testxml.cpp
index a9abae531fa..fc398eb28a2 100644
--- a/document/src/tests/testxml.cpp
+++ b/document/src/tests/testxml.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/base/testdocrepo.h>
diff --git a/document/src/tests/urltypetest.cpp b/document/src/tests/urltypetest.cpp
index 6abe5e66a0c..75cc16d6915 100644
--- a/document/src/tests/urltypetest.cpp
+++ b/document/src/tests/urltypetest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/datatype/urldatatype.h>
#include <cppunit/extensions/HelperMacros.h>
diff --git a/document/src/tests/vespaxml/fieldpathupdates.xml b/document/src/tests/vespaxml/fieldpathupdates.xml
index c775509f070..3b81aaf4ba2 100755
--- a/document/src/tests/vespaxml/fieldpathupdates.xml
+++ b/document/src/tests/vespaxml/fieldpathupdates.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<update documenttype="news" documentid="doc:test:http://www.ntnu.no/">
<assign fieldpath="url">assignUrl</assign>
diff --git a/document/src/tests/vespaxml/test1.expected.xml b/document/src/tests/vespaxml/test1.expected.xml
index a369cfff4a6..198ed29690d 100644
--- a/document/src/tests/vespaxml/test1.expected.xml
+++ b/document/src/tests/vespaxml/test1.expected.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<document documenttype="news" documentid="doc:crawler:http://www.ntnu.no/">
<title>TestTitle</title>
<last_downloaded>100</last_downloaded>
diff --git a/document/src/tests/vespaxml/test1.xml b/document/src/tests/vespaxml/test1.xml
index 1c155182b14..1ec09a0b61f 100644
--- a/document/src/tests/vespaxml/test1.xml
+++ b/document/src/tests/vespaxml/test1.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd idprefix="doc:crawler:">
<document documenttype="news" documentid="http://www.ntnu.no/">
diff --git a/document/src/tests/vespaxml/test10.xml b/document/src/tests/vespaxml/test10.xml
index b310f14da1c..832734faf48 100644
--- a/document/src/tests/vespaxml/test10.xml
+++ b/document/src/tests/vespaxml/test10.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd>
<document type="news" id="doc:crawler/http://www.ntnu.no/">
diff --git a/document/src/tests/vespaxml/test11.xml b/document/src/tests/vespaxml/test11.xml
index d8cdb32697e..10daff34be3 100644
--- a/document/src/tests/vespaxml/test11.xml
+++ b/document/src/tests/vespaxml/test11.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vesparemove>
<document type="news" id="doc:crawler/http://www.ntnu���.no/">
diff --git a/document/src/tests/vespaxml/test12.xml b/document/src/tests/vespaxml/test12.xml
index 1f2f3375ade..3bfd2658404 100644
--- a/document/src/tests/vespaxml/test12.xml
+++ b/document/src/tests/vespaxml/test12.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd>
<document type="news" id="doc:crawler/http://www.ntnu.no/">
diff --git a/document/src/tests/vespaxml/test13.xml b/document/src/tests/vespaxml/test13.xml
index 8f12ea42c93..4e55558abc6 100644
--- a/document/src/tests/vespaxml/test13.xml
+++ b/document/src/tests/vespaxml/test13.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<document type="news" id="doc:crawler:http://www.ntnu.no/">
<title>TestTitle</title>
diff --git a/document/src/tests/vespaxml/test14.xml b/document/src/tests/vespaxml/test14.xml
index 7e0eaa270ae..8b345f8c654 100644
--- a/document/src/tests/vespaxml/test14.xml
+++ b/document/src/tests/vespaxml/test14.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd>
<document type="news" id="doc:crawler/http://www.ntnu.no/">
diff --git a/document/src/tests/vespaxml/test15.xml b/document/src/tests/vespaxml/test15.xml
index f4b25cd0aea..32707f1636b 100644
--- a/document/src/tests/vespaxml/test15.xml
+++ b/document/src/tests/vespaxml/test15.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd>
<document type="news" id="doc:crawler/http://www.ntnu.no/">
diff --git a/document/src/tests/vespaxml/test16.xml b/document/src/tests/vespaxml/test16.xml
index 727e1dc834b..3b3179446e9 100644
--- a/document/src/tests/vespaxml/test16.xml
+++ b/document/src/tests/vespaxml/test16.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd>
<documentid type="news" id="doc:crawler:http://www.ntnu.no/">
diff --git a/document/src/tests/vespaxml/test17.xml b/document/src/tests/vespaxml/test17.xml
index c0046253c79..aefcc5708e7 100644
--- a/document/src/tests/vespaxml/test17.xml
+++ b/document/src/tests/vespaxml/test17.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespaadd>
<document type="news" id="doc:crawler/http://www.ntnu.no/1">
</document>
diff --git a/document/src/tests/vespaxml/test18.xml b/document/src/tests/vespaxml/test18.xml
index c8798f8fc43..852dd55c134 100644
--- a/document/src/tests/vespaxml/test18.xml
+++ b/document/src/tests/vespaxml/test18.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd>
<document type="article" id="doc:crawler/http://www.ntnu.no/">
diff --git a/document/src/tests/vespaxml/test2.expected.xml b/document/src/tests/vespaxml/test2.expected.xml
index a369cfff4a6..198ed29690d 100644
--- a/document/src/tests/vespaxml/test2.expected.xml
+++ b/document/src/tests/vespaxml/test2.expected.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<document documenttype="news" documentid="doc:crawler:http://www.ntnu.no/">
<title>TestTitle</title>
<last_downloaded>100</last_downloaded>
diff --git a/document/src/tests/vespaxml/test2.xml b/document/src/tests/vespaxml/test2.xml
index 9dae17e830f..8194fb1de5e 100644
--- a/document/src/tests/vespaxml/test2.xml
+++ b/document/src/tests/vespaxml/test2.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<document documenttype="news" documentid="doc:crawler:http://www.ntnu.no/">
<title>TestTitle</title>
diff --git a/document/src/tests/vespaxml/test20.xml b/document/src/tests/vespaxml/test20.xml
index 867c4829c36..ca502100f67 100644
--- a/document/src/tests/vespaxml/test20.xml
+++ b/document/src/tests/vespaxml/test20.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<endoffeed>
<name>default</name>
diff --git a/document/src/tests/vespaxml/test21.xml b/document/src/tests/vespaxml/test21.xml
index daad994b84b..45ef52a3e67 100644
--- a/document/src/tests/vespaxml/test21.xml
+++ b/document/src/tests/vespaxml/test21.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd>
<document type="news" id="doc:crawler/http://www.ntnu.no/">
diff --git a/document/src/tests/vespaxml/test22.xml b/document/src/tests/vespaxml/test22.xml
index ec20024693d..c9f5a0af841 100644
--- a/document/src/tests/vespaxml/test22.xml
+++ b/document/src/tests/vespaxml/test22.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd>
<document type="news" id="doc:crawler:http://www.ntnu.no/">
diff --git a/document/src/tests/vespaxml/test23.xml b/document/src/tests/vespaxml/test23.xml
index 68afd6ec565..e052c3f2c7f 100644
--- a/document/src/tests/vespaxml/test23.xml
+++ b/document/src/tests/vespaxml/test23.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd>
<document type="news" id="doc:crawler:http://www.ntnu.no/">
diff --git a/document/src/tests/vespaxml/test24.xml b/document/src/tests/vespaxml/test24.xml
index b386bb2c092..3d36eea7dc8 100644
--- a/document/src/tests/vespaxml/test24.xml
+++ b/document/src/tests/vespaxml/test24.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd>
<document type="news" id="doc:crawler:http://www.ntnu.no/">
diff --git a/document/src/tests/vespaxml/test25.xml b/document/src/tests/vespaxml/test25.xml
index 72a19e8da60..9a499195a6b 100644
--- a/document/src/tests/vespaxml/test25.xml
+++ b/document/src/tests/vespaxml/test25.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd>
<document type="news" id="doc:crawler/http://www.ntnu.no/">
diff --git a/document/src/tests/vespaxml/test26.xml b/document/src/tests/vespaxml/test26.xml
index 698e615c274..2d6ae226c68 100644
--- a/document/src/tests/vespaxml/test26.xml
+++ b/document/src/tests/vespaxml/test26.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd>
<document type="news" id="doc:crawler:http://www.ntnu.no/">
diff --git a/document/src/tests/vespaxml/test27.xml b/document/src/tests/vespaxml/test27.xml
index 94c5f3c1d32..f8adb8b11f8 100644
--- a/document/src/tests/vespaxml/test27.xml
+++ b/document/src/tests/vespaxml/test27.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd>
<document type="news" id="doc:crawler/http://www.ntnu.no/">
diff --git a/document/src/tests/vespaxml/test28.xml b/document/src/tests/vespaxml/test28.xml
index f1995d295bb..929ba7415d0 100644
--- a/document/src/tests/vespaxml/test28.xml
+++ b/document/src/tests/vespaxml/test28.xml
@@ -1,5 +1,5 @@
<!-- Test content -->
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd>
<document type="news" id="doc:crawler:http://www.ntnu.no/">
diff --git a/document/src/tests/vespaxml/test29.xml b/document/src/tests/vespaxml/test29.xml
index 1f33b9f7555..1b863e5637e 100644
--- a/document/src/tests/vespaxml/test29.xml
+++ b/document/src/tests/vespaxml/test29.xml
@@ -1,5 +1,5 @@
<!-- Test field attribute -->
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd>
<document type="news">
diff --git a/document/src/tests/vespaxml/test3.xml b/document/src/tests/vespaxml/test3.xml
index 81d87679211..f328115b5ca 100644
--- a/document/src/tests/vespaxml/test3.xml
+++ b/document/src/tests/vespaxml/test3.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vesparemove idprefix="doc:crawler:">
<documentid type="news">
diff --git a/document/src/tests/vespaxml/test30.xml b/document/src/tests/vespaxml/test30.xml
index 6fbb6fae8ba..fa24e99cd83 100644
--- a/document/src/tests/vespaxml/test30.xml
+++ b/document/src/tests/vespaxml/test30.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed xmlns:xsd="http://www.w3.org/2001/XMLSchema-datatypes"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<vespaadd>
diff --git a/document/src/tests/vespaxml/test32.xml b/document/src/tests/vespaxml/test32.xml
index b2f7976c124..53993f57d19 100644
--- a/document/src/tests/vespaxml/test32.xml
+++ b/document/src/tests/vespaxml/test32.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vesparemove>
<documentid id="doc:crawler:http://www.ntnu���.no/"/>
diff --git a/document/src/tests/vespaxml/test33.xml b/document/src/tests/vespaxml/test33.xml
index 264be7f3e02..d63c059aa6e 100644
--- a/document/src/tests/vespaxml/test33.xml
+++ b/document/src/tests/vespaxml/test33.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vesparemove>
<documentid>
diff --git a/document/src/tests/vespaxml/test34.xml b/document/src/tests/vespaxml/test34.xml
index a3c80415899..384c7ae8111 100644
--- a/document/src/tests/vespaxml/test34.xml
+++ b/document/src/tests/vespaxml/test34.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vesparemove>
<documentid id="http://www.ntnu.no/"/>
diff --git a/document/src/tests/vespaxml/test35.xml b/document/src/tests/vespaxml/test35.xml
index e02a755cc99..e69f032ef49 100644
--- a/document/src/tests/vespaxml/test35.xml
+++ b/document/src/tests/vespaxml/test35.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd>
<document type="news" id="doc:crawler:http://www.ntnu.no/">
diff --git a/document/src/tests/vespaxml/test36.xml b/document/src/tests/vespaxml/test36.xml
index 3eed0c4cb2a..bfd4547b6c8 100644
--- a/document/src/tests/vespaxml/test36.xml
+++ b/document/src/tests/vespaxml/test36.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd idprefix="doc:crawler:">
<document type="news" id="http://www.ntnu.no/1">
diff --git a/document/src/tests/vespaxml/test37.xml b/document/src/tests/vespaxml/test37.xml
index 1c2f6e01006..8993dd99640 100644
--- a/document/src/tests/vespaxml/test37.xml
+++ b/document/src/tests/vespaxml/test37.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd idprefix="doc:crawler:">
<document type="news" id="http://www.ntnu.no/1">
diff --git a/document/src/tests/vespaxml/test4.xml b/document/src/tests/vespaxml/test4.xml
index 7c0c3682cd3..8a4777344d6 100644
--- a/document/src/tests/vespaxml/test4.xml
+++ b/document/src/tests/vespaxml/test4.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd idprefix="doc:crawler:">
diff --git a/document/src/tests/vespaxml/test40.xml b/document/src/tests/vespaxml/test40.xml
index ecfb745415a..68210920df2 100644
--- a/document/src/tests/vespaxml/test40.xml
+++ b/document/src/tests/vespaxml/test40.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<update documenttype="news" documentid="doc:crawler:http://www.ntnu.no/">
<assign field="title">TestTitle</assign>
diff --git a/document/src/tests/vespaxml/test41.xml b/document/src/tests/vespaxml/test41.xml
index 052f4076025..b92c2e586a8 100644
--- a/document/src/tests/vespaxml/test41.xml
+++ b/document/src/tests/vespaxml/test41.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<update documenttype="news" documentid="doc:crawler:http://www.ntnu.no/">
<assign field="stringarr">
diff --git a/document/src/tests/vespaxml/test42.xml b/document/src/tests/vespaxml/test42.xml
index da3e94410df..479509776fa 100644
--- a/document/src/tests/vespaxml/test42.xml
+++ b/document/src/tests/vespaxml/test42.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<update documenttype="news" documentid="doc:crawler:http://www.ntnu.no/">
<assign field="weightedsetstring">
diff --git a/document/src/tests/vespaxml/test43.xml b/document/src/tests/vespaxml/test43.xml
index 16944dde9fa..874deada10c 100644
--- a/document/src/tests/vespaxml/test43.xml
+++ b/document/src/tests/vespaxml/test43.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<document documenttype="news" documentid="doc:crawler:http://www.ntnu.no/">
<value_long>1008</value_long>
diff --git a/document/src/tests/vespaxml/test45.xml b/document/src/tests/vespaxml/test45.xml
index eb13e59a0da..ccc1a475a86 100644
--- a/document/src/tests/vespaxml/test45.xml
+++ b/document/src/tests/vespaxml/test45.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<update documenttype="news" documentid="doc:crawler:http://www.ntnu.no/">
<remove field="floatarr" />
diff --git a/document/src/tests/vespaxml/test46.xml b/document/src/tests/vespaxml/test46.xml
index 75d69f3a8b5..118dfdd810d 100644
--- a/document/src/tests/vespaxml/test46.xml
+++ b/document/src/tests/vespaxml/test46.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<document documenttype="news" documentid="doc:crawler:http://www.blargh.example.com/" lastmodified="98798787">
<value_long>1008</value_long>
diff --git a/document/src/tests/vespaxml/test47.xml b/document/src/tests/vespaxml/test47.xml
index 5944158c7c6..e9499c32810 100644
--- a/document/src/tests/vespaxml/test47.xml
+++ b/document/src/tests/vespaxml/test47.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<!-- VERY BAD: -->
<vespaadd>
diff --git a/document/src/tests/vespaxml/test48.xml b/document/src/tests/vespaxml/test48.xml
index a9bdd94d098..119d3ea82d4 100644
--- a/document/src/tests/vespaxml/test48.xml
+++ b/document/src/tests/vespaxml/test48.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<!-- VERY BAD: -->
<documentid type="news" id="doc:this:is:even:worse" />
diff --git a/document/src/tests/vespaxml/test49.xml b/document/src/tests/vespaxml/test49.xml
index dc8a67c64bb..d3fa4dc9637 100644
--- a/document/src/tests/vespaxml/test49.xml
+++ b/document/src/tests/vespaxml/test49.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<!-- VERY BAD: -->
<documentid type="news">
diff --git a/document/src/tests/vespaxml/test5.expected.xml b/document/src/tests/vespaxml/test5.expected.xml
index 164799749c8..5b851a4601e 100644
--- a/document/src/tests/vespaxml/test5.expected.xml
+++ b/document/src/tests/vespaxml/test5.expected.xml
@@ -1,3 +1,3 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<remove documentid="doc:crawler:http://www.ntnu.no/"/>
diff --git a/document/src/tests/vespaxml/test5.xml b/document/src/tests/vespaxml/test5.xml
index a6a6f8f0f9f..bdfa496cb86 100644
--- a/document/src/tests/vespaxml/test5.xml
+++ b/document/src/tests/vespaxml/test5.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vesparemove>
<documentid documentid="doc:crawler:http://www.ntnu.no/"/>
diff --git a/document/src/tests/vespaxml/test50.xml b/document/src/tests/vespaxml/test50.xml
index 0909bcf2795..45c4c0a4d13 100644
--- a/document/src/tests/vespaxml/test50.xml
+++ b/document/src/tests/vespaxml/test50.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<!-- OK: -->
<vesparemove>
diff --git a/document/src/tests/vespaxml/test51.xml b/document/src/tests/vespaxml/test51.xml
index 698a305d33c..9e91d45d930 100644
--- a/document/src/tests/vespaxml/test51.xml
+++ b/document/src/tests/vespaxml/test51.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<!-- OK: -->
<remove documentid="doc:this:is:also:an:ok:removal"/>
diff --git a/document/src/tests/vespaxml/test52.xml b/document/src/tests/vespaxml/test52.xml
index d569f5ada1b..a8617df42da 100644
--- a/document/src/tests/vespaxml/test52.xml
+++ b/document/src/tests/vespaxml/test52.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<!-- OK: -->
<vespaadd>
diff --git a/document/src/tests/vespaxml/test53.xml b/document/src/tests/vespaxml/test53.xml
index 28c2161c956..6449436ff54 100644
--- a/document/src/tests/vespaxml/test53.xml
+++ b/document/src/tests/vespaxml/test53.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<!-- HALF BAD, BUT NOT ALLOWED: -->
<vespaadd>
diff --git a/document/src/tests/vespaxml/test54.xml b/document/src/tests/vespaxml/test54.xml
index 90f41b6d32d..7535f4b93ea 100644
--- a/document/src/tests/vespaxml/test54.xml
+++ b/document/src/tests/vespaxml/test54.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<!-- VERY BAD: -->
<vesparemove>
diff --git a/document/src/tests/vespaxml/test55.xml b/document/src/tests/vespaxml/test55.xml
index 8fcd4a31d1f..b2134a29a46 100644
--- a/document/src/tests/vespaxml/test55.xml
+++ b/document/src/tests/vespaxml/test55.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<!-- HALF BAD, BUT NOT ALLOWED: -->
<vesparemove>
diff --git a/document/src/tests/vespaxml/test56.xml b/document/src/tests/vespaxml/test56.xml
index 489ff494fc0..1dd36a57b68 100644
--- a/document/src/tests/vespaxml/test56.xml
+++ b/document/src/tests/vespaxml/test56.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<!-- VERY BAD: -->
<vesparemove>
diff --git a/document/src/tests/vespaxml/test57.xml b/document/src/tests/vespaxml/test57.xml
index 6653b0260af..d75e6d4d099 100644
--- a/document/src/tests/vespaxml/test57.xml
+++ b/document/src/tests/vespaxml/test57.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<!-- OK: -->
<document documentid="doc:blih:blih:blih" documenttype="news">
diff --git a/document/src/tests/vespaxml/test58.xml b/document/src/tests/vespaxml/test58.xml
index 2577f3a0e26..8711a2a49e4 100644
--- a/document/src/tests/vespaxml/test58.xml
+++ b/document/src/tests/vespaxml/test58.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<document type="news" id="doc:music:http://music.yahoo.com">
diff --git a/document/src/tests/vespaxml/test59.xml b/document/src/tests/vespaxml/test59.xml
index 970f5232e7b..e7708351c93 100644
--- a/document/src/tests/vespaxml/test59.xml
+++ b/document/src/tests/vespaxml/test59.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<update documentid="doc:blih:blih:blih" documenttype="news">
<increment field="title" by="3549" />
diff --git a/document/src/tests/vespaxml/test6.xml b/document/src/tests/vespaxml/test6.xml
index c67352bbb22..3739690d2fe 100644
--- a/document/src/tests/vespaxml/test6.xml
+++ b/document/src/tests/vespaxml/test6.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vesparemove>
<documentid type="news" id="doc:crawler:http://www.ntnu���.no/"/>
diff --git a/document/src/tests/vespaxml/test7.xml b/document/src/tests/vespaxml/test7.xml
index 2c346a5b5cf..129773678f1 100644
--- a/document/src/tests/vespaxml/test7.xml
+++ b/document/src/tests/vespaxml/test7.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed idprefix="doc:crawler:">
<vespaadd>
<document type="news" id="http://www.ntnu.no/">
diff --git a/document/src/tests/vespaxml/test8.xml b/document/src/tests/vespaxml/test8.xml
index cb9617fefd8..272791511c1 100644
--- a/document/src/tests/vespaxml/test8.xml
+++ b/document/src/tests/vespaxml/test8.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd>
<document type="news" id="doc:crawler:http://www.ntnu.no/">
diff --git a/document/src/tests/vespaxml/test9.xml b/document/src/tests/vespaxml/test9.xml
index 8b86da414b8..b733c66a797 100644
--- a/document/src/tests/vespaxml/test9.xml
+++ b/document/src/tests/vespaxml/test9.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vesparemove>
<documentid id="doc:crawler/http://www.ntnu���.no/"/>
diff --git a/document/src/tests/vespaxml/test_arraystruct.xml b/document/src/tests/vespaxml/test_arraystruct.xml
index 5eeae4aab2d..ba5c3233e16 100644
--- a/document/src/tests/vespaxml/test_arraystruct.xml
+++ b/document/src/tests/vespaxml/test_arraystruct.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<document documenttype="news" documentid="doc:test:struct">
<mystructarr>
diff --git a/document/src/tests/vespaxml/test_doc5.xml b/document/src/tests/vespaxml/test_doc5.xml
index fa6d9c4726e..30ce5f7b8f8 100644
--- a/document/src/tests/vespaxml/test_doc5.xml
+++ b/document/src/tests/vespaxml/test_doc5.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<endoffeed>
<name>default</name>
diff --git a/document/src/tests/vespaxml/test_doc6.xml b/document/src/tests/vespaxml/test_doc6.xml
index 2f32701d88e..52015073f96 100644
--- a/document/src/tests/vespaxml/test_doc6.xml
+++ b/document/src/tests/vespaxml/test_doc6.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<endoffeed>
<name>default</name>
diff --git a/document/src/tests/vespaxml/test_doc8.xml b/document/src/tests/vespaxml/test_doc8.xml
index d636e7baa96..f5c7a2090ae 100644
--- a/document/src/tests/vespaxml/test_doc8.xml
+++ b/document/src/tests/vespaxml/test_doc8.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd>
<document type="news" version="13" id="http://www.ntnu.no/">
diff --git a/document/src/tests/vespaxml/test_externalentity.xml b/document/src/tests/vespaxml/test_externalentity.xml
index 1d87319b106..014d67d32bc 100644
--- a/document/src/tests/vespaxml/test_externalentity.xml
+++ b/document/src/tests/vespaxml/test_externalentity.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<!DOCTYPE vespafeed [<!ENTITY xxe SYSTEM "xxe.txt">]>
<vespafeed>
<vespaadd idprefix="doc:crawler:">
diff --git a/document/src/tests/vespaxml/test_idprefix.xml b/document/src/tests/vespaxml/test_idprefix.xml
index e3a177d6606..2b0487d0b94 100644
--- a/document/src/tests/vespaxml/test_idprefix.xml
+++ b/document/src/tests/vespaxml/test_idprefix.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<document type="news" id="http://music.yahoo.com/bobdylan/BestOf">
diff --git a/document/src/tests/vespaxml/test_struct.xml b/document/src/tests/vespaxml/test_struct.xml
index c18c9263b4a..251b8b4896d 100644
--- a/document/src/tests/vespaxml/test_struct.xml
+++ b/document/src/tests/vespaxml/test_struct.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<document documenttype="news" documentid="doc:test:struct">
<mystruct>
diff --git a/document/src/tests/vespaxml/test_update1.xml b/document/src/tests/vespaxml/test_update1.xml
index 27c7d6214d3..89dcb978e3b 100644
--- a/document/src/tests/vespaxml/test_update1.xml
+++ b/document/src/tests/vespaxml/test_update1.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<vespafeed>
<vespaadd idprefix="doc:crawler:">
<document type="news" id="http://www.ntnu.no/">
diff --git a/document/src/tests/weightedsetfieldvaluetest.cpp b/document/src/tests/weightedsetfieldvaluetest.cpp
index 68b94cd2f16..c14044b1940 100644
--- a/document/src/tests/weightedsetfieldvaluetest.cpp
+++ b/document/src/tests/weightedsetfieldvaluetest.cpp
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/document/fieldvalue/fieldvalues.h>
#include <vespa/document/serialization/vespadocumentdeserializer.h>
diff --git a/document/src/tests/weightedsetfieldvaluetest.h b/document/src/tests/weightedsetfieldvaluetest.h
index 8cf52d9ea0e..df20221ed97 100644
--- a/document/src/tests/weightedsetfieldvaluetest.h
+++ b/document/src/tests/weightedsetfieldvaluetest.h
@@ -1,4 +1,4 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/* $Id$*/
#pragma once