Revert "Update copyright headers"

26 files changed, 26 insertions, 26 deletions

diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml
index fb2794670a2..1d2b9c65473 100644
--- a/container-search-and-docproc/pom.xml
+++ b/container-search-and-docproc/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/container-search-and-docproc/src/main/java/com/yahoo/container/handler/observability/ApplicationStatusHandler.java b/container-search-and-docproc/src/main/java/com/yahoo/container/handler/observability/ApplicationStatusHandler.java
index 05d14e6e1d6..b4627af8e4e 100644
--- a/container-search-and-docproc/src/main/java/com/yahoo/container/handler/observability/ApplicationStatusHandler.java
+++ b/container-search-and-docproc/src/main/java/com/yahoo/container/handler/observability/ApplicationStatusHandler.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.container.handler.observability;
 
 import com.google.inject.Inject;
diff --git a/container-search-and-docproc/src/main/java/com/yahoo/container/handler/observability/package-info.java b/container-search-and-docproc/src/main/java/com/yahoo/container/handler/observability/package-info.java
index 99545e0e7fd..0f903c42562 100644
--- a/container-search-and-docproc/src/main/java/com/yahoo/container/handler/observability/package-info.java
+++ b/container-search-and-docproc/src/main/java/com/yahoo/container/handler/observability/package-info.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.
 @ExportPackage
 package com.yahoo.container.handler.observability;
 
diff --git a/container-search-and-docproc/src/main/java/org/apache/commons/codec/binary/package-info.java b/container-search-and-docproc/src/main/java/org/apache/commons/codec/binary/package-info.java
index 80f76e6b263..f9309677f2f 100644
--- a/container-search-and-docproc/src/main/java/org/apache/commons/codec/binary/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/commons/codec/binary/package-info.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.
 @ExportPackage(version = @Version(major = 1, minor = 4, micro = 0))
 package org.apache.commons.codec.binary;
 
diff --git a/container-search-and-docproc/src/main/java/org/apache/commons/codec/digest/package-info.java b/container-search-and-docproc/src/main/java/org/apache/commons/codec/digest/package-info.java
index 117120c1641..60a67fb11e4 100644
--- a/container-search-and-docproc/src/main/java/org/apache/commons/codec/digest/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/commons/codec/digest/package-info.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.
 @ExportPackage(version = @Version(major = 1, minor = 4, micro = 0))
 package org.apache.commons.codec.digest;
 
diff --git a/container-search-and-docproc/src/main/java/org/apache/commons/codec/language/package-info.java b/container-search-and-docproc/src/main/java/org/apache/commons/codec/language/package-info.java
index de288618ad9..225284f9c78 100644
--- a/container-search-and-docproc/src/main/java/org/apache/commons/codec/language/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/commons/codec/language/package-info.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.
 @ExportPackage(version = @Version(major = 1, minor = 4, micro = 0))
 package org.apache.commons.codec.language;
 
diff --git a/container-search-and-docproc/src/main/java/org/apache/commons/codec/net/package-info.java b/container-search-and-docproc/src/main/java/org/apache/commons/codec/net/package-info.java
index 49510c6feac..43b384bb605 100644
--- a/container-search-and-docproc/src/main/java/org/apache/commons/codec/net/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/commons/codec/net/package-info.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.
 @ExportPackage(version = @Version(major = 1, minor = 4, micro = 0))
 package org.apache.commons.codec.net;
 
diff --git a/container-search-and-docproc/src/main/java/org/apache/commons/codec/package-info.java b/container-search-and-docproc/src/main/java/org/apache/commons/codec/package-info.java
index c698ba0233a..6f4bbeff143 100644
--- a/container-search-and-docproc/src/main/java/org/apache/commons/codec/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/commons/codec/package-info.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.
 @ExportPackage(version = @Version(major = 1, minor = 4, micro = 0))
 package org.apache.commons.codec;
 
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/auth/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/auth/package-info.java
index dbf6d408a2f..424833a69a8 100644
--- a/container-search-and-docproc/src/main/java/org/apache/http/auth/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/http/auth/package-info.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.
 /*
  * Exported due to usage in HTTPSearcher API
  */
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/client/entity/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/client/entity/package-info.java
index c3bb1fbbf3e..b81f5bb0372 100644
--- a/container-search-and-docproc/src/main/java/org/apache/http/client/entity/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/http/client/entity/package-info.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.
 @ExportPackage(version = @Version(major = 4, minor = 3, micro = 6))
 package org.apache.http.client.entity;
 
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/client/methods/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/client/methods/package-info.java
index c938418fa71..86a30dc68aa 100644
--- a/container-search-and-docproc/src/main/java/org/apache/http/client/methods/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/http/client/methods/package-info.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.
 @ExportPackage(version = @Version(major = 4, minor = 3, micro = 6))
 package org.apache.http.client.methods;
 
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/client/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/client/package-info.java
index 85e68ea27b6..7a989ea74e6 100644
--- a/container-search-and-docproc/src/main/java/org/apache/http/client/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/http/client/package-info.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.
 @ExportPackage(version = @Version(major = 4, minor = 3, micro = 6))
 package org.apache.http.client;
 
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/conn/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/conn/package-info.java
index c8e606d25ee..ae002eb33bb 100644
--- a/container-search-and-docproc/src/main/java/org/apache/http/conn/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/http/conn/package-info.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.
 @ExportPackage(version = @Version(major = 4, minor = 3, micro = 6))
 package org.apache.http.conn;
 
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/conn/params/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/conn/params/package-info.java
index 9469bfc7333..6b8e00ea45f 100644
--- a/container-search-and-docproc/src/main/java/org/apache/http/conn/params/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/http/conn/params/package-info.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.
 @ExportPackage(version = @Version(major = 4, minor = 3, micro = 6))
 package org.apache.http.conn.params;
 
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/conn/scheme/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/conn/scheme/package-info.java
index bd54cb060a9..28999dd4bb6 100644
--- a/container-search-and-docproc/src/main/java/org/apache/http/conn/scheme/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/http/conn/scheme/package-info.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.
 @ExportPackage(version = @Version(major = 4, minor = 3, micro = 6))
 package org.apache.http.conn.scheme;
 
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/conn/ssl/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/conn/ssl/package-info.java
index 2dd9254cdb0..deebc48ceef 100644
--- a/container-search-and-docproc/src/main/java/org/apache/http/conn/ssl/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/http/conn/ssl/package-info.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.
 @ExportPackage(version = @Version(major = 4, minor = 3, micro = 6))
 package org.apache.http.conn.ssl;
 
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/entity/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/entity/package-info.java
index a843aa9ceb2..177c77da9dc 100644
--- a/container-search-and-docproc/src/main/java/org/apache/http/entity/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/http/entity/package-info.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.
 @ExportPackage(version = @Version(major = 4, minor = 3, micro = 3))
 package org.apache.http.entity;
 
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/impl/client/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/impl/client/package-info.java
index 89973cb6cc5..fa0116f7eb0 100644
--- a/container-search-and-docproc/src/main/java/org/apache/http/impl/client/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/http/impl/client/package-info.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.
 /*
  * Exported due to usage in HTTPSearcher API
  */
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/impl/conn/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/impl/conn/package-info.java
index 4d167d5e627..b9f14170a3f 100644
--- a/container-search-and-docproc/src/main/java/org/apache/http/impl/conn/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/http/impl/conn/package-info.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.
 /*
  * Exported due to usage in HTTPSearcher API
  */
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/message/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/message/package-info.java
index 7430e71d0c7..b12addfebcb 100644
--- a/container-search-and-docproc/src/main/java/org/apache/http/message/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/http/message/package-info.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.
 @ExportPackage(version = @Version(major = 4, minor = 3, micro = 3))
 package org.apache.http.message;
 
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/package-info.java
index 9dcfc75e5a4..9548eaafc8c 100644
--- a/container-search-and-docproc/src/main/java/org/apache/http/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/http/package-info.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.
 /*
  * Exported due to usage in HTTPSearcher API
  */
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/params/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/params/package-info.java
index 9bfd6e48404..25db8447659 100644
--- a/container-search-and-docproc/src/main/java/org/apache/http/params/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/http/params/package-info.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.
 @ExportPackage(version = @Version(major = 4, minor = 3, micro = 3))
 package org.apache.http.params;
 
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/protocol/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/protocol/package-info.java
index 7bb784f7197..5ee75d2dc0d 100644
--- a/container-search-and-docproc/src/main/java/org/apache/http/protocol/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/http/protocol/package-info.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.
 @ExportPackage(version = @Version(major = 4, minor = 3, micro = 3))
 package org.apache.http.protocol;
 
diff --git a/container-search-and-docproc/src/main/java/org/apache/http/util/package-info.java b/container-search-and-docproc/src/main/java/org/apache/http/util/package-info.java
index 89f73ab1a12..17395c45ac0 100644
--- a/container-search-and-docproc/src/main/java/org/apache/http/util/package-info.java
+++ b/container-search-and-docproc/src/main/java/org/apache/http/util/package-info.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.
 @ExportPackage(version = @Version(major = 4, minor = 3, micro = 3))
 package org.apache.http.util;
 
diff --git a/container-search-and-docproc/src/main/resources/configdefinitions/application-userdata.def b/container-search-and-docproc/src/main/resources/configdefinitions/application-userdata.def
index 0f3884b222f..78d4522706f 100644
--- a/container-search-and-docproc/src/main/resources/configdefinitions/application-userdata.def
+++ b/container-search-and-docproc/src/main/resources/configdefinitions/application-userdata.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.
 # Contains user generated info about one deployed application
 # The values in this config are set by config overrides in vespa-services
 
diff --git a/container-search-and-docproc/src/test/java/com/yahoo/container/handler/observability/ApplicationStatusHandlerTest.java b/container-search-and-docproc/src/test/java/com/yahoo/container/handler/observability/ApplicationStatusHandlerTest.java
index e42a8c3d523..8e88f174adc 100644
--- a/container-search-and-docproc/src/test/java/com/yahoo/container/handler/observability/ApplicationStatusHandlerTest.java
+++ b/container-search-and-docproc/src/test/java/com/yahoo/container/handler/observability/ApplicationStatusHandlerTest.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.container.handler.observability;
 
 import com.yahoo.component.ComponentId;