Merge pull request #2774 from yahoo/bratseth/update-copyright-headers

Update copyright headers

93 files changed, 93 insertions, 33 deletions

diff --git a/sample-apps/basic-search-java/pom.xml b/sample-apps/basic-search-java/pom.xml
index e7c5f8a658a..d23671627d6 100644
--- a/sample-apps/basic-search-java/pom.xml
+++ b/sample-apps/basic-search-java/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- 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. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
diff --git a/sample-apps/basic-search-java/src/main/application/hosts.xml b/sample-apps/basic-search-java/src/main/application/hosts.xml
index 3ab86a21aef..541d2f10304 100644
--- a/sample-apps/basic-search-java/src/main/application/hosts.xml
+++ b/sample-apps/basic-search-java/src/main/application/hosts.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. -->
 <hosts>
   <host name="localhost">
     <alias>node1</alias>
diff --git a/sample-apps/basic-search-java/src/main/application/services.xml b/sample-apps/basic-search-java/src/main/application/services.xml
index 95c4ee15f7d..585b02e1d69 100644
--- a/sample-apps/basic-search-java/src/main/application/services.xml
+++ b/sample-apps/basic-search-java/src/main/application/services.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. -->
 <services version="1.0">
     <admin version="2.0">
         <adminserver hostalias="node1"/>
diff --git a/sample-apps/basic-search-java/src/main/java/com/yahoo/example/ExampleProcessor.java b/sample-apps/basic-search-java/src/main/java/com/yahoo/example/ExampleProcessor.java
index 228f6a71b77..ea79997bd46 100644
--- a/sample-apps/basic-search-java/src/main/java/com/yahoo/example/ExampleProcessor.java
+++ b/sample-apps/basic-search-java/src/main/java/com/yahoo/example/ExampleProcessor.java
@@ -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.
 package com.yahoo.example;
 
 import com.google.inject.Inject;
diff --git a/sample-apps/basic-search-java/src/main/java/com/yahoo/example/StringData.java b/sample-apps/basic-search-java/src/main/java/com/yahoo/example/StringData.java
index b177881035a..845f5906a5d 100644
--- a/sample-apps/basic-search-java/src/main/java/com/yahoo/example/StringData.java
+++ b/sample-apps/basic-search-java/src/main/java/com/yahoo/example/StringData.java
@@ -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.
 package com.yahoo.example;
 
 import com.yahoo.processing.Request;
diff --git a/sample-apps/basic-search-java/src/main/resources/configdefinitions/example-processor.def b/sample-apps/basic-search-java/src/main/resources/configdefinitions/example-processor.def
index 1028451c312..7ac13fed3c4 100644
--- a/sample-apps/basic-search-java/src/main/resources/configdefinitions/example-processor.def
+++ b/sample-apps/basic-search-java/src/main/resources/configdefinitions/example-processor.def
@@ -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.
 namespace=example
 message string default=""
diff --git a/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationMain.java b/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationMain.java
index 638df584f92..0fcc176620a 100644
--- a/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationMain.java
+++ b/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationMain.java
@@ -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.
 package com.yahoo.example;
 
 import com.yahoo.application.Networking;
diff --git a/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationTest.java b/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationTest.java
index 943a46c9f0b..65286bec0de 100644
--- a/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationTest.java
+++ b/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ApplicationTest.java
@@ -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.
 package com.yahoo.example;
 
 import com.yahoo.application.Application;
diff --git a/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ExampleProcessorTest.java b/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ExampleProcessorTest.java
index 125cc5cbecc..fd7928e3715 100644
--- a/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ExampleProcessorTest.java
+++ b/sample-apps/basic-search-java/src/test/java/com/yahoo/example/ExampleProcessorTest.java
@@ -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.
 package com.yahoo.example;
 
 import com.yahoo.component.chain.Chain;
diff --git a/sample-apps/basic-search-tensor/pom.xml b/sample-apps/basic-search-tensor/pom.xml
index e0b821272fc..bc9554f9ef4 100644
--- a/sample-apps/basic-search-tensor/pom.xml
+++ b/sample-apps/basic-search-tensor/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- 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. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
diff --git a/sample-apps/basic-search-tensor/src/main/application/hosts.xml b/sample-apps/basic-search-tensor/src/main/application/hosts.xml
index 3ab86a21aef..541d2f10304 100644
--- a/sample-apps/basic-search-tensor/src/main/application/hosts.xml
+++ b/sample-apps/basic-search-tensor/src/main/application/hosts.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. -->
 <hosts>
   <host name="localhost">
     <alias>node1</alias>
diff --git a/sample-apps/basic-search-tensor/src/main/application/search/query-profiles/types/root.xml b/sample-apps/basic-search-tensor/src/main/application/search/query-profiles/types/root.xml
index e06f16c1032..bab072916e9 100644
--- a/sample-apps/basic-search-tensor/src/main/application/search/query-profiles/types/root.xml
+++ b/sample-apps/basic-search-tensor/src/main/application/search/query-profiles/types/root.xml
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <query-profile-type id="root" inherits="native">
     <field name="ranking.features.query(tensor)" type="tensor(x{})" />
 </query-profile-type>
diff --git a/sample-apps/basic-search-tensor/src/main/application/searchdefinitions/music.sd b/sample-apps/basic-search-tensor/src/main/application/searchdefinitions/music.sd
index 85d59504321..e9675b612cc 100644
--- a/sample-apps/basic-search-tensor/src/main/application/searchdefinitions/music.sd
+++ b/sample-apps/basic-search-tensor/src/main/application/searchdefinitions/music.sd
@@ -1,3 +1,4 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 search music {
     document music {
         field artist type string {
diff --git a/sample-apps/basic-search-tensor/src/main/application/services.xml b/sample-apps/basic-search-tensor/src/main/application/services.xml
index 246ffff94de..d422fb2ba2f 100644
--- a/sample-apps/basic-search-tensor/src/main/application/services.xml
+++ b/sample-apps/basic-search-tensor/src/main/application/services.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. -->
 <services version="1.0">
 
     <admin version="2.0">
diff --git a/sample-apps/basic-search-tensor/src/main/java/com/yahoo/example/ExampleTensorSearcher.java b/sample-apps/basic-search-tensor/src/main/java/com/yahoo/example/ExampleTensorSearcher.java
index 375ad7c98cb..426e6ee451e 100644
--- a/sample-apps/basic-search-tensor/src/main/java/com/yahoo/example/ExampleTensorSearcher.java
+++ b/sample-apps/basic-search-tensor/src/main/java/com/yahoo/example/ExampleTensorSearcher.java
@@ -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.
 package com.yahoo.example;
 
 import com.yahoo.processing.request.CompoundName;
diff --git a/sample-apps/basic-search/src/main/application/hosts.xml b/sample-apps/basic-search/src/main/application/hosts.xml
index 632e48db321..65c6373d70c 100644
--- a/sample-apps/basic-search/src/main/application/hosts.xml
+++ b/sample-apps/basic-search/src/main/application/hosts.xml
@@ -1,4 +1,5 @@
 <?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. -->
 <hosts>
   <host name="localhost">
     <alias>node1</alias>
diff --git a/sample-apps/basic-search/src/main/application/searchdefinitions/music.sd b/sample-apps/basic-search/src/main/application/searchdefinitions/music.sd
index c450c07d34b..6bb7ce8cd94 100644
--- a/sample-apps/basic-search/src/main/application/searchdefinitions/music.sd
+++ b/sample-apps/basic-search/src/main/application/searchdefinitions/music.sd
@@ -1,3 +1,4 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 search music {
     document music {
         field artist type string {
diff --git a/sample-apps/basic-search/src/main/application/services.xml b/sample-apps/basic-search/src/main/application/services.xml
index 69899bcd1c6..9ca75b536e2 100644
--- a/sample-apps/basic-search/src/main/application/services.xml
+++ b/sample-apps/basic-search/src/main/application/services.xml
@@ -1,4 +1,5 @@
 <?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. -->
 <services version="1.0">
 
   <jdisc version="1.0" id="container">
diff --git a/sample-apps/blog-recommendation/pom.xml b/sample-apps/blog-recommendation/pom.xml
index d4afac565a7..2f1582d4fbe 100644
--- a/sample-apps/blog-recommendation/pom.xml
+++ b/sample-apps/blog-recommendation/pom.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0                              http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.yahoo.example</groupId>
diff --git a/sample-apps/blog-recommendation/src/main/application/deployment.xml b/sample-apps/blog-recommendation/src/main/application/deployment.xml
index 0a2397bbca9..bb37f77412b 100644
--- a/sample-apps/blog-recommendation/src/main/application/deployment.xml
+++ b/sample-apps/blog-recommendation/src/main/application/deployment.xml
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <deployment version='1.0'>
   <test />
   <staging />
diff --git a/sample-apps/blog-recommendation/src/main/application/hosts.xml b/sample-apps/blog-recommendation/src/main/application/hosts.xml
index 632e48db321..65c6373d70c 100644
--- a/sample-apps/blog-recommendation/src/main/application/hosts.xml
+++ b/sample-apps/blog-recommendation/src/main/application/hosts.xml
@@ -1,4 +1,5 @@
 <?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. -->
 <hosts>
   <host name="localhost">
     <alias>node1</alias>
diff --git a/sample-apps/blog-recommendation/src/main/application/search/query-profiles/types/root.xml b/sample-apps/blog-recommendation/src/main/application/search/query-profiles/types/root.xml
index 6362bbe48ce..f034e2dc5e3 100644
--- a/sample-apps/blog-recommendation/src/main/application/search/query-profiles/types/root.xml
+++ b/sample-apps/blog-recommendation/src/main/application/search/query-profiles/types/root.xml
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <query-profile-type id="root" inherits="native">
     <field name="ranking.features.query(user_item_cf)" type="tensor(user_item_cf[10])" />
 </query-profile-type>
diff --git a/sample-apps/blog-recommendation/src/main/application/searchdefinitions/blog_post.sd b/sample-apps/blog-recommendation/src/main/application/searchdefinitions/blog_post.sd
index b0b53032216..6aec8961475 100644
--- a/sample-apps/blog-recommendation/src/main/application/searchdefinitions/blog_post.sd
+++ b/sample-apps/blog-recommendation/src/main/application/searchdefinitions/blog_post.sd
@@ -1,3 +1,4 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 search blog_post {
     document blog_post {
         field date_gmt type string {
diff --git a/sample-apps/blog-recommendation/src/main/application/searchdefinitions/user.sd b/sample-apps/blog-recommendation/src/main/application/searchdefinitions/user.sd
index 0c2a6e50aa6..3f545ef406c 100644
--- a/sample-apps/blog-recommendation/src/main/application/searchdefinitions/user.sd
+++ b/sample-apps/blog-recommendation/src/main/application/searchdefinitions/user.sd
@@ -1,3 +1,4 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 search user {
     document user {
 
diff --git a/sample-apps/blog-recommendation/src/main/application/services.xml b/sample-apps/blog-recommendation/src/main/application/services.xml
index c81cbde6027..d58211bb8c9 100644
--- a/sample-apps/blog-recommendation/src/main/application/services.xml
+++ b/sample-apps/blog-recommendation/src/main/application/services.xml
@@ -1,4 +1,5 @@
 <?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. -->
 <services version='1.0' xmlns:deploy="vespa" xmlns:preprocess="properties">
 
   <jdisc id='default' version='1.0'>
diff --git a/sample-apps/blog-recommendation/src/main/java/com/yahoo/example/BlogTensorSearcher.java b/sample-apps/blog-recommendation/src/main/java/com/yahoo/example/BlogTensorSearcher.java
index 3a2a3df455f..44fdcef583b 100644
--- a/sample-apps/blog-recommendation/src/main/java/com/yahoo/example/BlogTensorSearcher.java
+++ b/sample-apps/blog-recommendation/src/main/java/com/yahoo/example/BlogTensorSearcher.java
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.example;
 
 import com.yahoo.data.access.Inspectable;
diff --git a/sample-apps/blog-recommendation/src/main/java/com/yahoo/example/UserProfileSearcher.java b/sample-apps/blog-recommendation/src/main/java/com/yahoo/example/UserProfileSearcher.java
index eead82d7299..aca2d2b9cce 100644
--- a/sample-apps/blog-recommendation/src/main/java/com/yahoo/example/UserProfileSearcher.java
+++ b/sample-apps/blog-recommendation/src/main/java/com/yahoo/example/UserProfileSearcher.java
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.example;
 
 import com.yahoo.data.access.Inspectable;
diff --git a/sample-apps/blog-recommendation/src/pig/feed_content_and_tensor_vespa.pig b/sample-apps/blog-recommendation/src/pig/feed_content_and_tensor_vespa.pig
index 9a536f38779..70d14dc1cc1 100644
--- a/sample-apps/blog-recommendation/src/pig/feed_content_and_tensor_vespa.pig
+++ b/sample-apps/blog-recommendation/src/pig/feed_content_and_tensor_vespa.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 REGISTER vespa-hadoop.jar
 
 -- Create valid Vespa put operations
diff --git a/sample-apps/blog-recommendation/src/pig/feed_content_vespa.pig b/sample-apps/blog-recommendation/src/pig/feed_content_vespa.pig
index 347958bfb84..d6379649789 100644
--- a/sample-apps/blog-recommendation/src/pig/feed_content_vespa.pig
+++ b/sample-apps/blog-recommendation/src/pig/feed_content_vespa.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 REGISTER vespa-hadoop.jar
 
 -- UDF to create valid Vespa document operation in JSON format
diff --git a/sample-apps/blog-recommendation/src/pig/feed_user_item_cf_vespa.pig b/sample-apps/blog-recommendation/src/pig/feed_user_item_cf_vespa.pig
index fd06394c3af..66cb6c5d5c6 100644
--- a/sample-apps/blog-recommendation/src/pig/feed_user_item_cf_vespa.pig
+++ b/sample-apps/blog-recommendation/src/pig/feed_user_item_cf_vespa.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 REGISTER vespa-hadoop.jar
 
 -- Create valid Vespa put operations
diff --git a/sample-apps/blog-recommendation/src/pig/generate_user_item_cf_dataset.pig b/sample-apps/blog-recommendation/src/pig/generate_user_item_cf_dataset.pig
index 2e71dcbe9e3..feea22263d9 100644
--- a/sample-apps/blog-recommendation/src/pig/generate_user_item_cf_dataset.pig
+++ b/sample-apps/blog-recommendation/src/pig/generate_user_item_cf_dataset.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 -- Load data from any source - here we load using PigStorage
 data = LOAD 'blog-recommendation/trainPostsFinal' USING JsonLoader('date_gmt:chararray, language:chararray, author:chararray, url:chararray, title:chararray, blog:chararray, post_id:chararray, tags:{T:(tag_name:chararray)}, blogname:chararray, date:chararray, content:chararray, categories:{T:(category_name:chararray)}, likes:{T:(dt:chararray, uid:chararray)}');
 
diff --git a/sample-apps/blog-recommendation/src/pig/get_recommendations.pig b/sample-apps/blog-recommendation/src/pig/get_recommendations.pig
index 00b03b0f49a..ad97e8361a2 100644
--- a/sample-apps/blog-recommendation/src/pig/get_recommendations.pig
+++ b/sample-apps/blog-recommendation/src/pig/get_recommendations.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 -- REGISTER $VESPA_HADOOP_JAR
 REGISTER vespa-hadoop.jar
 -- REGISTER parquet-pig-bundle-1.8.1.jar
diff --git a/sample-apps/blog-recommendation/src/pig/tutorial_blog_popularity.pig b/sample-apps/blog-recommendation/src/pig/tutorial_blog_popularity.pig
index 4dac36a717f..25c3b4ab711 100644
--- a/sample-apps/blog-recommendation/src/pig/tutorial_blog_popularity.pig
+++ b/sample-apps/blog-recommendation/src/pig/tutorial_blog_popularity.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 REGISTER '$VESPA_HADOOP_JAR'
 
 -- UDF to create valid Vespa document operation in JSON format
diff --git a/sample-apps/blog-recommendation/src/pig/tutorial_feed_content_and_tensor_vespa.pig b/sample-apps/blog-recommendation/src/pig/tutorial_feed_content_and_tensor_vespa.pig
index 77943fd842a..b000037f25a 100644
--- a/sample-apps/blog-recommendation/src/pig/tutorial_feed_content_and_tensor_vespa.pig
+++ b/sample-apps/blog-recommendation/src/pig/tutorial_feed_content_and_tensor_vespa.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 REGISTER '$VESPA_HADOOP_JAR'
 
 -- Create valid Vespa put operations
diff --git a/sample-apps/blog-recommendation/src/pig/tutorial_feed_content_vespa.pig b/sample-apps/blog-recommendation/src/pig/tutorial_feed_content_vespa.pig
index d20ccf505a9..6fff700881a 100644
--- a/sample-apps/blog-recommendation/src/pig/tutorial_feed_content_vespa.pig
+++ b/sample-apps/blog-recommendation/src/pig/tutorial_feed_content_vespa.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 REGISTER '$VESPA_HADOOP_JAR'
 -- REGISTER vespa-hadoop.jar
 
diff --git a/sample-apps/blog-recommendation/src/spark/collaborative_filtering_example.scala b/sample-apps/blog-recommendation/src/spark/collaborative_filtering_example.scala
index 1a2c8f92730..2118862f063 100644
--- a/sample-apps/blog-recommendation/src/spark/collaborative_filtering_example.scala
+++ b/sample-apps/blog-recommendation/src/spark/collaborative_filtering_example.scala
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 import org.apache.spark.mllib.recommendation.ALS
 import org.apache.spark.mllib.recommendation.MatrixFactorizationModel
 import org.apache.spark.mllib.recommendation.Rating
diff --git a/sample-apps/blog-recommendation/src/spark/data_exploration.scala b/sample-apps/blog-recommendation/src/spark/data_exploration.scala
index 228834cfb4b..d9f3abc9cd8 100644
--- a/sample-apps/blog-recommendation/src/spark/data_exploration.scala
+++ b/sample-apps/blog-recommendation/src/spark/data_exploration.scala
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // sc is an existing SparkContext.
 val sqlContext = new org.apache.spark.sql.SQLContext(sc)
 
diff --git a/sample-apps/blog-recommendation/src/spark/expected_percentile.scala b/sample-apps/blog-recommendation/src/spark/expected_percentile.scala
index 7236f8e8150..b1fd05f6f04 100644
--- a/sample-apps/blog-recommendation/src/spark/expected_percentile.scala
+++ b/sample-apps/blog-recommendation/src/spark/expected_percentile.scala
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 val test_file_path = "data/cv/test_set_exploded"
 val blog_recom_file_path = "data/recommendations"
 val size_recommendation_list = 100
diff --git a/sample-apps/blog-recommendation/src/spark/full_dataset_cf.scala b/sample-apps/blog-recommendation/src/spark/full_dataset_cf.scala
index 0b76e8b8b1c..405105eb663 100644
--- a/sample-apps/blog-recommendation/src/spark/full_dataset_cf.scala
+++ b/sample-apps/blog-recommendation/src/spark/full_dataset_cf.scala
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 import org.apache.spark.mllib.recommendation.ALS
 import org.apache.spark.mllib.recommendation.MatrixFactorizationModel
 import org.apache.spark.mllib.recommendation.Rating
diff --git a/sample-apps/blog-recommendation/src/spark/train_test_set_division.scala b/sample-apps/blog-recommendation/src/spark/train_test_set_division.scala
index d21f96028bc..224ea74cb4e 100644
--- a/sample-apps/blog-recommendation/src/spark/train_test_set_division.scala
+++ b/sample-apps/blog-recommendation/src/spark/train_test_set_division.scala
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 import org.apache.spark.sql.functions.udf
 
 // Inputs
diff --git a/sample-apps/blog-search-initial/pom.xml b/sample-apps/blog-search-initial/pom.xml
index cbe5967537a..71a02075a6b 100644
--- a/sample-apps/blog-search-initial/pom.xml
+++ b/sample-apps/blog-search-initial/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- 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. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
diff --git a/sample-apps/blog-search-initial/src/main/application/deployment.xml b/sample-apps/blog-search-initial/src/main/application/deployment.xml
index 0a2397bbca9..bb37f77412b 100644
--- a/sample-apps/blog-search-initial/src/main/application/deployment.xml
+++ b/sample-apps/blog-search-initial/src/main/application/deployment.xml
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <deployment version='1.0'>
   <test />
   <staging />
diff --git a/sample-apps/blog-search-initial/src/main/application/hosts.xml b/sample-apps/blog-search-initial/src/main/application/hosts.xml
index 3ab86a21aef..541d2f10304 100644
--- a/sample-apps/blog-search-initial/src/main/application/hosts.xml
+++ b/sample-apps/blog-search-initial/src/main/application/hosts.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. -->
 <hosts>
   <host name="localhost">
     <alias>node1</alias>
diff --git a/sample-apps/blog-search-initial/src/main/application/searchdefinitions/blog_post.sd b/sample-apps/blog-search-initial/src/main/application/searchdefinitions/blog_post.sd
index 8d94d0bf6ba..b3667c28168 100644
--- a/sample-apps/blog-search-initial/src/main/application/searchdefinitions/blog_post.sd
+++ b/sample-apps/blog-search-initial/src/main/application/searchdefinitions/blog_post.sd
@@ -1,3 +1,4 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 search blog_post {
     document blog_post {
         field date_gmt type string {
diff --git a/sample-apps/blog-search-initial/src/main/application/services.xml b/sample-apps/blog-search-initial/src/main/application/services.xml
index 1cb90214e2b..8cda4126afc 100644
--- a/sample-apps/blog-search-initial/src/main/application/services.xml
+++ b/sample-apps/blog-search-initial/src/main/application/services.xml
@@ -1,4 +1,5 @@
 <?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. -->
 <services version='1.0'>
 
   <jdisc id='default' version='1.0'>
diff --git a/sample-apps/blog-search/pom.xml b/sample-apps/blog-search/pom.xml
index 33913190d92..fb457e109aa 100644
--- a/sample-apps/blog-search/pom.xml
+++ b/sample-apps/blog-search/pom.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0                              http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.yahoo.example</groupId>
diff --git a/sample-apps/blog-search/src/main/application/deployment.xml b/sample-apps/blog-search/src/main/application/deployment.xml
index 0a2397bbca9..bb37f77412b 100644
--- a/sample-apps/blog-search/src/main/application/deployment.xml
+++ b/sample-apps/blog-search/src/main/application/deployment.xml
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <deployment version='1.0'>
   <test />
   <staging />
diff --git a/sample-apps/blog-search/src/main/application/searchdefinitions/blog_post.sd b/sample-apps/blog-search/src/main/application/searchdefinitions/blog_post.sd
index 0f3c21dffa9..8fc95109e78 100644
--- a/sample-apps/blog-search/src/main/application/searchdefinitions/blog_post.sd
+++ b/sample-apps/blog-search/src/main/application/searchdefinitions/blog_post.sd
@@ -1,3 +1,4 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 search blog_post {
     document blog_post {
         field date_gmt type string {
diff --git a/sample-apps/blog-search/src/main/application/services.xml b/sample-apps/blog-search/src/main/application/services.xml
index e850f1fc456..161d0f732e3 100644
--- a/sample-apps/blog-search/src/main/application/services.xml
+++ b/sample-apps/blog-search/src/main/application/services.xml
@@ -1,4 +1,5 @@
 <?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. -->
 <services version='1.0' xmlns:deploy="vespa" xmlns:preprocess="properties">
 
   <jdisc id='default' version='1.0'>
diff --git a/sample-apps/blog-tutorial-shared/build.sbt b/sample-apps/blog-tutorial-shared/build.sbt
index 4c94a7d15e0..a36a87205a4 100644
--- a/sample-apps/blog-tutorial-shared/build.sbt
+++ b/sample-apps/blog-tutorial-shared/build.sbt
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 name := "blog-support"
 
 version := "0.1"
diff --git a/sample-apps/blog-tutorial-shared/src/R/generateDataset.R b/sample-apps/blog-tutorial-shared/src/R/generateDataset.R
index b410ad4094c..461a75c6506 100644
--- a/sample-apps/blog-tutorial-shared/src/R/generateDataset.R
+++ b/sample-apps/blog-tutorial-shared/src/R/generateDataset.R
@@ -1,3 +1,4 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 library(jsonlite)
 library(dplyr)
 
diff --git a/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_compute_metric.pig b/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_compute_metric.pig
index 7bde9b5c2b7..61ca9bc7cb2 100644
--- a/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_compute_metric.pig
+++ b/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_compute_metric.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 REGISTER $VESPA_HADOOP_JAR
 
 DEFINE  BlogPostRecommendations
diff --git a/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_feed_content_and_tensor_vespa.pig b/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_feed_content_and_tensor_vespa.pig
index a7863a6f78d..50152318d04 100644
--- a/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_feed_content_and_tensor_vespa.pig
+++ b/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_feed_content_and_tensor_vespa.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 REGISTER '$VESPA_HADOOP_JAR'
 
 -- Create valid Vespa put operations
diff --git a/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_feed_content_vespa.pig b/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_feed_content_vespa.pig
index 6150b38e80c..62b8a676cfc 100644
--- a/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_feed_content_vespa.pig
+++ b/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_feed_content_vespa.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 REGISTER '$VESPA_HADOOP_JAR'
 
 -- UDF to create valid Vespa document operation in JSON format
diff --git a/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_get_recommendation_list.pig b/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_get_recommendation_list.pig
index ab4245eaa25..dcaffabba2d 100644
--- a/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_get_recommendation_list.pig
+++ b/sample-apps/blog-tutorial-shared/src/main/pig/tutorial_get_recommendation_list.pig
@@ -1,3 +1,4 @@
+-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 REGISTER $VESPA_HADOOP_JAR
 
 DEFINE  BlogPostRecommendations
diff --git a/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/BlogRecommendationApp.scala b/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/BlogRecommendationApp.scala
index 83d56718823..30be7da2727 100644
--- a/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/BlogRecommendationApp.scala
+++ b/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/BlogRecommendationApp.scala
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.example.blog
 
 import org.apache.spark.sql.SparkSession
diff --git a/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/CollaborativeFiltering.scala b/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/CollaborativeFiltering.scala
index f20e23321a1..56828c828a5 100644
--- a/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/CollaborativeFiltering.scala
+++ b/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/CollaborativeFiltering.scala
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.example.blog
 
 import org.apache.spark.ml.recommendation.{ALS, ALSModel}
diff --git a/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/SplitFullSetIntoTrainAndTestSets.scala b/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/SplitFullSetIntoTrainAndTestSets.scala
index 41b9b2b2dd4..feff388618e 100644
--- a/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/SplitFullSetIntoTrainAndTestSets.scala
+++ b/sample-apps/blog-tutorial-shared/src/main/scala/com/yahoo/example/blog/SplitFullSetIntoTrainAndTestSets.scala
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.example.blog
 
 import org.apache.spark.sql.{SparkSession, DataFrame}
diff --git a/sample-apps/blog-tutorial-shared/src/python/parse.py b/sample-apps/blog-tutorial-shared/src/python/parse.py
index 0d5f892eebc..207f8a14740 100644
--- a/sample-apps/blog-tutorial-shared/src/python/parse.py
+++ b/sample-apps/blog-tutorial-shared/src/python/parse.py
@@ -1,3 +1,4 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 import json
 import argparse
 
diff --git a/sample-apps/blog-tutorial-shared/src/python/vespaModel.py b/sample-apps/blog-tutorial-shared/src/python/vespaModel.py
index fd0718721eb..7f2a0c06014 100755
--- a/sample-apps/blog-tutorial-shared/src/python/vespaModel.py
+++ b/sample-apps/blog-tutorial-shared/src/python/vespaModel.py
@@ -1,4 +1,5 @@
 #! /Users/tmartins/anaconda/envs/tensorflow/bin/python
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 """
 Train a 2 layers neural network to compute the probability of a user 
diff --git a/sample-apps/blog-tutorial-shared/src/test/python/parse-unittest.py b/sample-apps/blog-tutorial-shared/src/test/python/parse-unittest.py
index d1fc725597d..1a75994c740 100644
--- a/sample-apps/blog-tutorial-shared/src/test/python/parse-unittest.py
+++ b/sample-apps/blog-tutorial-shared/src/test/python/parse-unittest.py
@@ -1,3 +1,4 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 import os
 import sys
 import unittest
diff --git a/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/BlogRecommendationAppTest.scala b/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/BlogRecommendationAppTest.scala
index 7ae8b8a8b06..bd73c088e3e 100644
--- a/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/BlogRecommendationAppTest.scala
+++ b/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/BlogRecommendationAppTest.scala
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.example.blog
 
 import org.scalatest.FunSuite
diff --git a/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/CollaborativeFilteringTest.scala b/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/CollaborativeFilteringTest.scala
index c660b45630a..07df1ebf622 100644
--- a/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/CollaborativeFilteringTest.scala
+++ b/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/CollaborativeFilteringTest.scala
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.example.blog
 
 import org.apache.spark.ml.recommendation.ALSModel
diff --git a/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/SplitFullSetIntoTrainAndTestSetsTest.scala b/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/SplitFullSetIntoTrainAndTestSetsTest.scala
index 43c08492c71..395cc99f8c5 100644
--- a/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/SplitFullSetIntoTrainAndTestSetsTest.scala
+++ b/sample-apps/blog-tutorial-shared/src/test/scala/com/yahoo/example/blog/SplitFullSetIntoTrainAndTestSetsTest.scala
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.example.blog
 
 import org.apache.spark.sql.{SparkSession, DataFrame}
diff --git a/sample-apps/boolean-search/adsdata.xml b/sample-apps/boolean-search/adsdata.xml
index 70c7519d902..e5992a9b1a0 100644
--- a/sample-apps/boolean-search/adsdata.xml
+++ b/sample-apps/boolean-search/adsdata.xml
@@ -1,4 +1,5 @@
 <?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 type="ad" documentid="id:sampleapp:ad::http://example.com/sled">
diff --git a/sample-apps/boolean-search/pom.xml b/sample-apps/boolean-search/pom.xml
index f3e6bcd14d2..944511e37b2 100644
--- a/sample-apps/boolean-search/pom.xml
+++ b/sample-apps/boolean-search/pom.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0                              http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.yahoo.example</groupId>
diff --git a/sample-apps/boolean-search/src/main/application/deployment.xml b/sample-apps/boolean-search/src/main/application/deployment.xml
index 454e2cb861d..b36abba9d57 100644
--- a/sample-apps/boolean-search/src/main/application/deployment.xml
+++ b/sample-apps/boolean-search/src/main/application/deployment.xml
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <deployment version='1.0'>
   <test />
   <staging />
diff --git a/sample-apps/boolean-search/src/main/application/searchdefinitions/ad.sd b/sample-apps/boolean-search/src/main/application/searchdefinitions/ad.sd
index 704c9712bcb..10724eb7b09 100644
--- a/sample-apps/boolean-search/src/main/application/searchdefinitions/ad.sd
+++ b/sample-apps/boolean-search/src/main/application/searchdefinitions/ad.sd
@@ -1,3 +1,4 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 search ad {
   
   document ad {
diff --git a/sample-apps/boolean-search/src/main/application/services.xml b/sample-apps/boolean-search/src/main/application/services.xml
index e19a46b055a..2f2febd719f 100644
--- a/sample-apps/boolean-search/src/main/application/services.xml
+++ b/sample-apps/boolean-search/src/main/application/services.xml
@@ -1,4 +1,5 @@
 <?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. -->
 <services version='1.0'>
 
   <admin version='3.0'>
diff --git a/sample-apps/boolean-search/src/main/java/com/yahoo/example/SubqueriesSearcher.java b/sample-apps/boolean-search/src/main/java/com/yahoo/example/SubqueriesSearcher.java
index 0243cd4e431..f8107c33eb2 100644
--- a/sample-apps/boolean-search/src/main/java/com/yahoo/example/SubqueriesSearcher.java
+++ b/sample-apps/boolean-search/src/main/java/com/yahoo/example/SubqueriesSearcher.java
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.example;
 
 import com.yahoo.data.access.Inspectable;
diff --git a/sample-apps/boolean-search/src/test/application/services.xml b/sample-apps/boolean-search/src/test/application/services.xml
index 1444a26c59f..fcb7455d959 100644
--- a/sample-apps/boolean-search/src/test/application/services.xml
+++ b/sample-apps/boolean-search/src/test/application/services.xml
@@ -1,4 +1,5 @@
 <?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. -->
 <services version='1.0'>
   <admin version='3.0'>
     <nodes count="1" />
diff --git a/sample-apps/boolean-search/src/test/java/com/yahoo/example/MockBackend.java b/sample-apps/boolean-search/src/test/java/com/yahoo/example/MockBackend.java
index 0c92eec1c2f..ca2dc924893 100644
--- a/sample-apps/boolean-search/src/test/java/com/yahoo/example/MockBackend.java
+++ b/sample-apps/boolean-search/src/test/java/com/yahoo/example/MockBackend.java
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.example;
 
 import com.yahoo.data.access.simple.Value;
diff --git a/sample-apps/boolean-search/src/test/java/com/yahoo/example/SubqueriesSearcherTest.java b/sample-apps/boolean-search/src/test/java/com/yahoo/example/SubqueriesSearcherTest.java
index ea29533081a..3bef09454de 100644
--- a/sample-apps/boolean-search/src/test/java/com/yahoo/example/SubqueriesSearcherTest.java
+++ b/sample-apps/boolean-search/src/test/java/com/yahoo/example/SubqueriesSearcherTest.java
@@ -1,3 +1,4 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.example;
 
 import com.yahoo.application.Application;
diff --git a/sample-apps/boolean-search/src/test/resources/adsdata.xml b/sample-apps/boolean-search/src/test/resources/adsdata.xml
index e4c23ae983a..b5e49263cbd 100644
--- a/sample-apps/boolean-search/src/test/resources/adsdata.xml
+++ b/sample-apps/boolean-search/src/test/resources/adsdata.xml
@@ -1,4 +1,5 @@
 <?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 type="ad" documentid="id:sampleapp:ad::http://example.com/sled">
diff --git a/sample-apps/http-api-using-request-handlers-and-processors/pom.xml b/sample-apps/http-api-using-request-handlers-and-processors/pom.xml
index 8141a0b91b1..6e7d0da75db 100644
--- a/sample-apps/http-api-using-request-handlers-and-processors/pom.xml
+++ b/sample-apps/http-api-using-request-handlers-and-processors/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- 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. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
diff --git a/sample-apps/http-api-using-request-handlers-and-processors/src/main/application/services.xml b/sample-apps/http-api-using-request-handlers-and-processors/src/main/application/services.xml
index add155c2279..70d20b52860 100644
--- a/sample-apps/http-api-using-request-handlers-and-processors/src/main/application/services.xml
+++ b/sample-apps/http-api-using-request-handlers-and-processors/src/main/application/services.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. -->
 <services version="1.0">
     <container id="default" version="1.0">
         <processing>
diff --git a/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/AnnotatingProcessor.java b/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/AnnotatingProcessor.java
index ec2080bad00..69418a47aa5 100644
--- a/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/AnnotatingProcessor.java
+++ b/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/AnnotatingProcessor.java
@@ -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.
 package com.yahoo.demo;
 
 import com.google.common.base.Splitter;
diff --git a/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DataProcessor.java b/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DataProcessor.java
index d7f074d398f..36e2609b6fa 100644
--- a/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DataProcessor.java
+++ b/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DataProcessor.java
@@ -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.
 package com.yahoo.demo;
 
 import com.yahoo.component.provider.ListenableFreezableClass;
diff --git a/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoComponent.java b/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoComponent.java
index 455784525e1..17f08472db4 100644
--- a/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoComponent.java
+++ b/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoComponent.java
@@ -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.
 package com.yahoo.demo;
 
 import com.yahoo.component.AbstractComponent;
diff --git a/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoHandler.java b/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoHandler.java
index b7ceab55609..2f86cc4fb6f 100644
--- a/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoHandler.java
+++ b/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoHandler.java
@@ -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.
 package com.yahoo.demo;
 
 import com.google.inject.Inject;
diff --git a/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoRenderer.java b/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoRenderer.java
index c30adbcf7aa..bb6642bf488 100644
--- a/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoRenderer.java
+++ b/sample-apps/http-api-using-request-handlers-and-processors/src/main/java/com/yahoo/demo/DemoRenderer.java
@@ -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.
 package com.yahoo.demo;
 
 import com.yahoo.processing.Response;
diff --git a/sample-apps/http-api-using-request-handlers-and-processors/src/main/resources/configdefinitions/demo.def b/sample-apps/http-api-using-request-handlers-and-processors/src/main/resources/configdefinitions/demo.def
index 9a804089433..6b8d2782e1d 100644
--- a/sample-apps/http-api-using-request-handlers-and-processors/src/main/resources/configdefinitions/demo.def
+++ b/sample-apps/http-api-using-request-handlers-and-processors/src/main/resources/configdefinitions/demo.def
@@ -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.
 namespace=demo
 
 demo[].term string
diff --git a/sample-apps/http-api-using-request-handlers-and-processors/src/test/java/com/yahoo/example/ApplicationMain.java b/sample-apps/http-api-using-request-handlers-and-processors/src/test/java/com/yahoo/example/ApplicationMain.java
index 638df584f92..0fcc176620a 100644
--- a/sample-apps/http-api-using-request-handlers-and-processors/src/test/java/com/yahoo/example/ApplicationMain.java
+++ b/sample-apps/http-api-using-request-handlers-and-processors/src/test/java/com/yahoo/example/ApplicationMain.java
@@ -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.
 package com.yahoo.example;
 
 import com.yahoo.application.Networking;
diff --git a/sample-apps/http-api-using-searcher/pom.xml b/sample-apps/http-api-using-searcher/pom.xml
index 6dfee6026ee..c8e222fae4b 100644
--- a/sample-apps/http-api-using-searcher/pom.xml
+++ b/sample-apps/http-api-using-searcher/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- 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. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
diff --git a/sample-apps/http-api-using-searcher/src/main/application/searchdefinitions/basic.sd b/sample-apps/http-api-using-searcher/src/main/application/searchdefinitions/basic.sd
index 3c4920a1912..8f132254d4a 100644
--- a/sample-apps/http-api-using-searcher/src/main/application/searchdefinitions/basic.sd
+++ b/sample-apps/http-api-using-searcher/src/main/application/searchdefinitions/basic.sd
@@ -1,3 +1,4 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 search basic {
 
   document basic {
diff --git a/sample-apps/http-api-using-searcher/src/main/application/services.xml b/sample-apps/http-api-using-searcher/src/main/application/services.xml
index c1d04daae8f..e879c3d4595 100644
--- a/sample-apps/http-api-using-searcher/src/main/application/services.xml
+++ b/sample-apps/http-api-using-searcher/src/main/application/services.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. -->
 <services version="1.0">
 
     <container id="default" version="1.0">
diff --git a/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoComponent.java b/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoComponent.java
index 2182cebecb9..d9761d95b48 100644
--- a/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoComponent.java
+++ b/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoComponent.java
@@ -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.
 package com.yahoo.demo;
 
 import com.yahoo.component.AbstractComponent;
diff --git a/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoHandler.java b/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoHandler.java
index cf14f6d58cd..e5a293846cc 100644
--- a/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoHandler.java
+++ b/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoHandler.java
@@ -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.
 package com.yahoo.demo;
 
 import com.google.inject.Inject;
diff --git a/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoRenderer.java b/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoRenderer.java
index 979c50f7f8f..dd5ea469620 100644
--- a/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoRenderer.java
+++ b/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoRenderer.java
@@ -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.
 package com.yahoo.demo;
 
 import com.yahoo.search.Result;
diff --git a/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoSearcher.java b/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoSearcher.java
index e749a3c1556..8f57cba6c8b 100644
--- a/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoSearcher.java
+++ b/sample-apps/http-api-using-searcher/src/main/java/com/yahoo/demo/DemoSearcher.java
@@ -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.
 package com.yahoo.demo;
 
 import com.yahoo.component.chain.dependencies.After;
diff --git a/sample-apps/http-api-using-searcher/src/main/resources/configdefinitions/demo.def b/sample-apps/http-api-using-searcher/src/main/resources/configdefinitions/demo.def
index 9a804089433..6b8d2782e1d 100644
--- a/sample-apps/http-api-using-searcher/src/main/resources/configdefinitions/demo.def
+++ b/sample-apps/http-api-using-searcher/src/main/resources/configdefinitions/demo.def
@@ -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.
 namespace=demo
 
 demo[].term string
diff --git a/sample-apps/http-api-using-searcher/src/test/java/com/yahoo/example/ApplicationMain.java b/sample-apps/http-api-using-searcher/src/test/java/com/yahoo/example/ApplicationMain.java
index 638df584f92..0fcc176620a 100644
--- a/sample-apps/http-api-using-searcher/src/test/java/com/yahoo/example/ApplicationMain.java
+++ b/sample-apps/http-api-using-searcher/src/test/java/com/yahoo/example/ApplicationMain.java
@@ -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.
 package com.yahoo.example;
 
 import com.yahoo.application.Networking;
diff --git a/sample-apps/pom.xml b/sample-apps/pom.xml
index d39e3d1e13f..cd054953152 100644
--- a/sample-apps/pom.xml
+++ b/sample-apps/pom.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. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.yahoo.vespa</groupId>