Revert "Update copyright headers"

9 files changed, 8 insertions, 9 deletions

diff --git a/sample-apps/http-api-using-searcher/pom.xml b/sample-apps/http-api-using-searcher/pom.xml
index c8e222fae4b..6dfee6026ee 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 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2016 Yahoo Inc. 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 8f132254d4a..3c4920a1912 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,4 +1,3 @@
-# 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 e879c3d4595..c1d04daae8f 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 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright 2016 Yahoo Inc. 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 d9761d95b48..2182cebecb9 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 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. 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 e5a293846cc..cf14f6d58cd 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 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. 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 dd5ea469620..979c50f7f8f 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 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. 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 8f57cba6c8b..e749a3c1556 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 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. 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 6b8d2782e1d..9a804089433 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 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright 2016 Yahoo Inc. 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 0fcc176620a..638df584f92 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 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright 2016 Yahoo Inc. 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;