Copyright header

58 files changed, 217 insertions, 216 deletions

diff --git a/application/pom.xml b/application/pom.xml
index 376a7449afb..5276e8e48b2 100644
--- a/application/pom.xml
+++ b/application/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 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
diff --git a/application/src/main/java/com/yahoo/application/Application.java b/application/src/main/java/com/yahoo/application/Application.java
index 5b91c8ff89c..bb29ff05fb8 100644
--- a/application/src/main/java/com/yahoo/application/Application.java
+++ b/application/src/main/java/com/yahoo/application/Application.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.application;
 
 import com.google.common.annotations.Beta;
diff --git a/application/src/main/java/com/yahoo/application/ApplicationBuilder.java b/application/src/main/java/com/yahoo/application/ApplicationBuilder.java
index 812f29b9f44..1d288759d23 100644
--- a/application/src/main/java/com/yahoo/application/ApplicationBuilder.java
+++ b/application/src/main/java/com/yahoo/application/ApplicationBuilder.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.application;
 
 import com.google.common.annotations.Beta;
diff --git a/application/src/main/java/com/yahoo/application/Networking.java b/application/src/main/java/com/yahoo/application/Networking.java
index cc09256203b..b23d2e58456 100644
--- a/application/src/main/java/com/yahoo/application/Networking.java
+++ b/application/src/main/java/com/yahoo/application/Networking.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.application;
 
 import com.google.common.annotations.Beta;
diff --git a/application/src/main/java/com/yahoo/application/container/ApplicationException.java b/application/src/main/java/com/yahoo/application/container/ApplicationException.java
index 175b6dc5fd7..d3e4100cfef 100644
--- a/application/src/main/java/com/yahoo/application/container/ApplicationException.java
+++ b/application/src/main/java/com/yahoo/application/container/ApplicationException.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.application.container;
 
 /**
diff --git a/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java b/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java
index d263c1d1591..2cf46c43d06 100644
--- a/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java
+++ b/application/src/main/java/com/yahoo/application/container/DocumentProcessing.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.application.container;
 
 import com.google.common.annotations.Beta;
diff --git a/application/src/main/java/com/yahoo/application/container/JDisc.java b/application/src/main/java/com/yahoo/application/container/JDisc.java
index dba16a0e3fe..216fe6d809c 100644
--- a/application/src/main/java/com/yahoo/application/container/JDisc.java
+++ b/application/src/main/java/com/yahoo/application/container/JDisc.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.application.container;
 
 import com.google.common.annotations.Beta;
diff --git a/application/src/main/java/com/yahoo/application/container/Processing.java b/application/src/main/java/com/yahoo/application/container/Processing.java
index 085067f707c..5fc9abce8fe 100644
--- a/application/src/main/java/com/yahoo/application/container/Processing.java
+++ b/application/src/main/java/com/yahoo/application/container/Processing.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.application.container;
 
 import com.google.common.annotations.Beta;
diff --git a/application/src/main/java/com/yahoo/application/container/ProcessingBase.java b/application/src/main/java/com/yahoo/application/container/ProcessingBase.java
index 6637669874d..14ba6eb394e 100644
--- a/application/src/main/java/com/yahoo/application/container/ProcessingBase.java
+++ b/application/src/main/java/com/yahoo/application/container/ProcessingBase.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.application.container;
 
 import com.google.common.annotations.Beta;
diff --git a/application/src/main/java/com/yahoo/application/container/Search.java b/application/src/main/java/com/yahoo/application/container/Search.java
index dbb655926be..ba241c70b5b 100644
--- a/application/src/main/java/com/yahoo/application/container/Search.java
+++ b/application/src/main/java/com/yahoo/application/container/Search.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.application.container;
 
 import com.google.common.annotations.Beta;
diff --git a/application/src/main/java/com/yahoo/application/container/SynchronousRequestResponseHandler.java b/application/src/main/java/com/yahoo/application/container/SynchronousRequestResponseHandler.java
index 4702c9fd782..1d64d2df2a9 100644
--- a/application/src/main/java/com/yahoo/application/container/SynchronousRequestResponseHandler.java
+++ b/application/src/main/java/com/yahoo/application/container/SynchronousRequestResponseHandler.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.application.container;
 
 import com.google.common.annotations.Beta;
diff --git a/application/src/main/java/com/yahoo/application/container/handler/Headers.java b/application/src/main/java/com/yahoo/application/container/handler/Headers.java
index 834ce7802f8..3b5a62471ac 100644
--- a/application/src/main/java/com/yahoo/application/container/handler/Headers.java
+++ b/application/src/main/java/com/yahoo/application/container/handler/Headers.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.application.container.handler;
 
 import com.google.common.annotations.Beta;
diff --git a/application/src/main/java/com/yahoo/application/container/handler/Request.java b/application/src/main/java/com/yahoo/application/container/handler/Request.java
index 56163622961..fef0f275be1 100644
--- a/application/src/main/java/com/yahoo/application/container/handler/Request.java
+++ b/application/src/main/java/com/yahoo/application/container/handler/Request.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.application.container.handler;
 
 import com.google.common.annotations.Beta;
diff --git a/application/src/main/java/com/yahoo/application/container/handler/Response.java b/application/src/main/java/com/yahoo/application/container/handler/Response.java
index 37450e9d33f..6502cfe6da2 100644
--- a/application/src/main/java/com/yahoo/application/container/handler/Response.java
+++ b/application/src/main/java/com/yahoo/application/container/handler/Response.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.application.container.handler;
 
 import com.google.common.annotations.Beta;
diff --git a/application/src/main/java/com/yahoo/application/container/handler/package-info.java b/application/src/main/java/com/yahoo/application/container/handler/package-info.java
index 7ae19acccdf..bededff50c5 100644
--- a/application/src/main/java/com/yahoo/application/container/handler/package-info.java
+++ b/application/src/main/java/com/yahoo/application/container/handler/package-info.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.
 /**
  * API for passing requests and inspecting responses to a locally instantiated container.
  */
diff --git a/application/src/main/java/com/yahoo/application/container/package-info.java b/application/src/main/java/com/yahoo/application/container/package-info.java
index 2b3a4156ba2..1c9d200d19a 100644
--- a/application/src/main/java/com/yahoo/application/container/package-info.java
+++ b/application/src/main/java/com/yahoo/application/container/package-info.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.
 /**
  * API for interacting with a locally instantiated jDisc container.
  */
diff --git a/application/src/main/java/com/yahoo/application/content/ContentCluster.java b/application/src/main/java/com/yahoo/application/content/ContentCluster.java
index 8679fa9273e..f68e329c12f 100644
--- a/application/src/main/java/com/yahoo/application/content/ContentCluster.java
+++ b/application/src/main/java/com/yahoo/application/content/ContentCluster.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.application.content;
 
 import java.nio.file.Path;
diff --git a/application/src/main/java/com/yahoo/application/package-info.java b/application/src/main/java/com/yahoo/application/package-info.java
index f374659f435..f786129dd5c 100644
--- a/application/src/main/java/com/yahoo/application/package-info.java
+++ b/application/src/main/java/com/yahoo/application/package-info.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.
 /**
  * This package provides an API for building Vespa or jDisc applications programmatically or from
  * an application package source, and instantiating those applications inside the current Java runtime.
diff --git a/application/src/main/scala/com/yahoo/application/container/StackTrace.scala b/application/src/main/scala/com/yahoo/application/container/StackTrace.scala
index 09cdb569028..c66a9de4894 100644
--- a/application/src/main/scala/com/yahoo/application/container/StackTrace.scala
+++ b/application/src/main/scala/com/yahoo/application/container/StackTrace.scala
@@ -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.application.container
 
 /**
diff --git a/application/src/test/app-packages/filedistribution/services.xml b/application/src/test/app-packages/filedistribution/services.xml
index 80c761492d2..c5ec4aeb155 100644
--- a/application/src/test/app-packages/filedistribution/services.xml
+++ b/application/src/test/app-packages/filedistribution/services.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. -->
 <jdisc version="1.0">
     <component id="com.yahoo.example.MyComponent" bundle="basic-application">
         <config name="example.my-component">
diff --git a/application/src/test/app-packages/searcher-app/services.xml b/application/src/test/app-packages/searcher-app/services.xml
index f99fbb51621..0fd37554c3b 100644
--- a/application/src/test/app-packages/searcher-app/services.xml
+++ b/application/src/test/app-packages/searcher-app/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. -->
 <container version='1.0'>
   <search>
     <chain id="default">
diff --git a/application/src/test/app-packages/withcontent/searchdefinitions/mydoc.sd b/application/src/test/app-packages/withcontent/searchdefinitions/mydoc.sd
index 4e557a0fc04..3a0b829d60c 100644
--- a/application/src/test/app-packages/withcontent/searchdefinitions/mydoc.sd
+++ b/application/src/test/app-packages/withcontent/searchdefinitions/mydoc.sd
@@ -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.
 search mydoc {
 
   document mydoc {
diff --git a/application/src/test/app-packages/withcontent/services.xml b/application/src/test/app-packages/withcontent/services.xml
index 8f19a2f0bc8..37c3fef017d 100644
--- a/application/src/test/app-packages/withcontent/services.xml
+++ b/application/src/test/app-packages/withcontent/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>
 
   <jdisc version="1.0">
diff --git a/application/src/test/java/com/yahoo/application/ApplicationFacade.java b/application/src/test/java/com/yahoo/application/ApplicationFacade.java
index 41631e67c6d..65f36b0804f 100644
--- a/application/src/test/java/com/yahoo/application/ApplicationFacade.java
+++ b/application/src/test/java/com/yahoo/application/ApplicationFacade.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.application;
 
 import com.google.common.annotations.Beta;
diff --git a/application/src/test/java/com/yahoo/application/ApplicationTest.java b/application/src/test/java/com/yahoo/application/ApplicationTest.java
index 395151d740f..fd060f3419f 100644
--- a/application/src/test/java/com/yahoo/application/ApplicationTest.java
+++ b/application/src/test/java/com/yahoo/application/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.application;
 
 import com.yahoo.application.container.MockClient;
diff --git a/application/src/test/java/com/yahoo/application/MockResultSearcher.java b/application/src/test/java/com/yahoo/application/MockResultSearcher.java
index a429785640e..ac837d8cfa5 100644
--- a/application/src/test/java/com/yahoo/application/MockResultSearcher.java
+++ b/application/src/test/java/com/yahoo/application/MockResultSearcher.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.application;
 
 import com.yahoo.search.Query;
diff --git a/application/src/test/java/com/yahoo/application/TestDocProc.java b/application/src/test/java/com/yahoo/application/TestDocProc.java
index 1631c7cd812..492b1ebe6bd 100644
--- a/application/src/test/java/com/yahoo/application/TestDocProc.java
+++ b/application/src/test/java/com/yahoo/application/TestDocProc.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.application;
 
 import com.yahoo.config.subscription.ConfigSubscriber;
diff --git a/application/src/test/java/com/yahoo/application/container/JDiscContainerDocprocTest.java b/application/src/test/java/com/yahoo/application/container/JDiscContainerDocprocTest.java
index ea7b37db520..2ce11335894 100644
--- a/application/src/test/java/com/yahoo/application/container/JDiscContainerDocprocTest.java
+++ b/application/src/test/java/com/yahoo/application/container/JDiscContainerDocprocTest.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.application.container;
 
 import com.yahoo.application.Application;
diff --git a/application/src/test/java/com/yahoo/application/container/JDiscContainerProcessingTest.java b/application/src/test/java/com/yahoo/application/container/JDiscContainerProcessingTest.java
index a95068ce3a4..134d7d64f20 100644
--- a/application/src/test/java/com/yahoo/application/container/JDiscContainerProcessingTest.java
+++ b/application/src/test/java/com/yahoo/application/container/JDiscContainerProcessingTest.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.application.container;
 
 import com.yahoo.application.Networking;
diff --git a/application/src/test/java/com/yahoo/application/container/JDiscContainerRequestTest.java b/application/src/test/java/com/yahoo/application/container/JDiscContainerRequestTest.java
index 0916b57394d..9f5555069cd 100644
--- a/application/src/test/java/com/yahoo/application/container/JDiscContainerRequestTest.java
+++ b/application/src/test/java/com/yahoo/application/container/JDiscContainerRequestTest.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.application.container;
 
 import com.yahoo.application.Networking;
diff --git a/application/src/test/java/com/yahoo/application/container/MockClient.java b/application/src/test/java/com/yahoo/application/container/MockClient.java
index 1f885cfb737..5479f4db58e 100644
--- a/application/src/test/java/com/yahoo/application/container/MockClient.java
+++ b/application/src/test/java/com/yahoo/application/container/MockClient.java
@@ -1,43 +1,43 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.application.container;

-

-import com.yahoo.jdisc.Request;

-import com.yahoo.jdisc.Response;

-import com.yahoo.jdisc.handler.CompletionHandler;

-import com.yahoo.jdisc.handler.ContentChannel;

-import com.yahoo.jdisc.handler.ResponseHandler;

-import com.yahoo.jdisc.service.AbstractClientProvider;

-

-import java.util.concurrent.atomic.AtomicInteger;

-

-/**

- *

- * @author Christian Andersen

- */

-public class MockClient extends AbstractClientProvider {

-    private final AtomicInteger counter = new AtomicInteger();

-

-    @Override

-    public ContentChannel handleRequest(Request request, ResponseHandler handler) {

-        counter.incrementAndGet();

-        final ContentChannel responseContentChannel = handler.handleResponse(new Response(200));

-        responseContentChannel.close(NOOP_COMPLETION_HANDLER);

-        return null;

-    }

-

-    public int getCounter() {

-        return counter.get();

-    }

-

-    private static final CompletionHandler NOOP_COMPLETION_HANDLER = new CompletionHandler() {

-        @Override

-        public void completed() {

-            // Ignored

-        }

-

-        @Override

-        public void failed(Throwable t) {

-            // Ignored

-        }

-    };

-}

+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.application.container;
+
+import com.yahoo.jdisc.Request;
+import com.yahoo.jdisc.Response;
+import com.yahoo.jdisc.handler.CompletionHandler;
+import com.yahoo.jdisc.handler.ContentChannel;
+import com.yahoo.jdisc.handler.ResponseHandler;
+import com.yahoo.jdisc.service.AbstractClientProvider;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ *
+ * @author Christian Andersen
+ */
+public class MockClient extends AbstractClientProvider {
+    private final AtomicInteger counter = new AtomicInteger();
+
+    @Override
+    public ContentChannel handleRequest(Request request, ResponseHandler handler) {
+        counter.incrementAndGet();
+        final ContentChannel responseContentChannel = handler.handleResponse(new Response(200));
+        responseContentChannel.close(NOOP_COMPLETION_HANDLER);
+        return null;
+    }
+
+    public int getCounter() {
+        return counter.get();
+    }
+
+    private static final CompletionHandler NOOP_COMPLETION_HANDLER = new CompletionHandler() {
+        @Override
+        public void completed() {
+            // Ignored
+        }
+
+        @Override
+        public void failed(Throwable t) {
+            // Ignored
+        }
+    };
+}
diff --git a/application/src/test/java/com/yahoo/application/container/MockServer.java b/application/src/test/java/com/yahoo/application/container/MockServer.java
index bc79671c13a..d8d7d927f7d 100644
--- a/application/src/test/java/com/yahoo/application/container/MockServer.java
+++ b/application/src/test/java/com/yahoo/application/container/MockServer.java
@@ -1,31 +1,31 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.application.container;

-

-import com.yahoo.jdisc.service.AbstractServerProvider;

-import com.yahoo.jdisc.service.CurrentContainer;

-

-/**

- *

- * @author Christian Andersen

- */

-public class MockServer extends AbstractServerProvider {

-    private boolean started = false;

-

-    public MockServer(CurrentContainer container) {

-        super(container);

-    }

-

-    @Override

-    public void start() {

-        started = true;

-    }

-

-    @Override

-    public void close() {

-

-    }

-

-    public boolean isStarted() {

-        return started;

-    }

-}

+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.application.container;
+
+import com.yahoo.jdisc.service.AbstractServerProvider;
+import com.yahoo.jdisc.service.CurrentContainer;
+
+/**
+ *
+ * @author Christian Andersen
+ */
+public class MockServer extends AbstractServerProvider {
+    private boolean started = false;
+
+    public MockServer(CurrentContainer container) {
+        super(container);
+    }
+
+    @Override
+    public void start() {
+        started = true;
+    }
+
+    @Override
+    public void close() {
+
+    }
+
+    public boolean isStarted() {
+        return started;
+    }
+}
diff --git a/application/src/test/java/com/yahoo/application/container/docprocs/MockDispatchDocproc.java b/application/src/test/java/com/yahoo/application/container/docprocs/MockDispatchDocproc.java
index 3c11cbdad8a..d91522ee5ed 100644
--- a/application/src/test/java/com/yahoo/application/container/docprocs/MockDispatchDocproc.java
+++ b/application/src/test/java/com/yahoo/application/container/docprocs/MockDispatchDocproc.java
@@ -1,65 +1,65 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.application.container.docprocs;

-

-import com.google.common.util.concurrent.ListenableFuture;

-import com.yahoo.docproc.DocumentProcessor;

-import com.yahoo.docproc.Processing;

-import com.yahoo.document.Document;

-import com.yahoo.document.DocumentOperation;

-import com.yahoo.document.DocumentPut;

-import com.yahoo.documentapi.messagebus.protocol.DocumentMessage;

-import com.yahoo.documentapi.messagebus.protocol.PutDocumentMessage;

-import com.yahoo.jdisc.Request;

-import com.yahoo.jdisc.Response;

-import com.yahoo.jdisc.handler.RequestDispatch;

-import com.yahoo.jdisc.service.CurrentContainer;

-import com.yahoo.messagebus.jdisc.MbusRequest;

-import com.yahoo.messagebus.routing.Route;

-

-import java.net.URI;

-import java.util.ArrayList;

-import java.util.List;

-import java.util.concurrent.ExecutionException;

-

-/**

- * @author Christian Andersen

- */

-public class MockDispatchDocproc extends DocumentProcessor {

-    private final Route route;

-    private final URI uri;

-    private final CurrentContainer currentContainer;

-    private final List<Response> responses = new ArrayList<>();

-

-    public MockDispatchDocproc(CurrentContainer currentContainer) {

-        this.route = Route.parse("default");

-        this.uri = URI.create("mbus://remotehost/source");

-        this.currentContainer = currentContainer;

-    }

-

-    @Override

-    public Progress process(Processing processing) {

-        for (DocumentOperation op : processing.getDocumentOperations()) {

-            PutDocumentMessage message = new PutDocumentMessage((DocumentPut)op);

-            ListenableFuture<Response> future = createRequest(message).dispatch();

-            try {

-                responses.add(future.get());

-            } catch (ExecutionException | InterruptedException e) {

-                throw new RuntimeException(e);

-            }

-        }

-        return Progress.DONE;

-    }

-

-    private RequestDispatch createRequest(final DocumentMessage message) {

-        return new RequestDispatch() {

-            @Override

-            protected Request newRequest() {

-                return new MbusRequest(currentContainer, uri, message.setRoute(route)).setServerRequest(false);

-            }

-        };

-    }

-

-    public List<Response> getResponses() {

-        return responses;

-    }

-}

+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.application.container.docprocs;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import com.yahoo.docproc.DocumentProcessor;
+import com.yahoo.docproc.Processing;
+import com.yahoo.document.Document;
+import com.yahoo.document.DocumentOperation;
+import com.yahoo.document.DocumentPut;
+import com.yahoo.documentapi.messagebus.protocol.DocumentMessage;
+import com.yahoo.documentapi.messagebus.protocol.PutDocumentMessage;
+import com.yahoo.jdisc.Request;
+import com.yahoo.jdisc.Response;
+import com.yahoo.jdisc.handler.RequestDispatch;
+import com.yahoo.jdisc.service.CurrentContainer;
+import com.yahoo.messagebus.jdisc.MbusRequest;
+import com.yahoo.messagebus.routing.Route;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
+/**
+ * @author Christian Andersen
+ */
+public class MockDispatchDocproc extends DocumentProcessor {
+    private final Route route;
+    private final URI uri;
+    private final CurrentContainer currentContainer;
+    private final List<Response> responses = new ArrayList<>();
+
+    public MockDispatchDocproc(CurrentContainer currentContainer) {
+        this.route = Route.parse("default");
+        this.uri = URI.create("mbus://remotehost/source");
+        this.currentContainer = currentContainer;
+    }
+
+    @Override
+    public Progress process(Processing processing) {
+        for (DocumentOperation op : processing.getDocumentOperations()) {
+            PutDocumentMessage message = new PutDocumentMessage((DocumentPut)op);
+            ListenableFuture<Response> future = createRequest(message).dispatch();
+            try {
+                responses.add(future.get());
+            } catch (ExecutionException | InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return Progress.DONE;
+    }
+
+    private RequestDispatch createRequest(final DocumentMessage message) {
+        return new RequestDispatch() {
+            @Override
+            protected Request newRequest() {
+                return new MbusRequest(currentContainer, uri, message.setRoute(route)).setServerRequest(false);
+            }
+        };
+    }
+
+    public List<Response> getResponses() {
+        return responses;
+    }
+}
diff --git a/application/src/test/java/com/yahoo/application/container/docprocs/MockDocproc.java b/application/src/test/java/com/yahoo/application/container/docprocs/MockDocproc.java
index c07655cfe5c..8d2e2fead46 100644
--- a/application/src/test/java/com/yahoo/application/container/docprocs/MockDocproc.java
+++ b/application/src/test/java/com/yahoo/application/container/docprocs/MockDocproc.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.application.container.docprocs;
 
 import com.google.inject.Inject;
diff --git a/application/src/test/java/com/yahoo/application/container/docprocs/Rot13DocumentProcessor.java b/application/src/test/java/com/yahoo/application/container/docprocs/Rot13DocumentProcessor.java
index ec23b3671b9..57e69e4d1b4 100644
--- a/application/src/test/java/com/yahoo/application/container/docprocs/Rot13DocumentProcessor.java
+++ b/application/src/test/java/com/yahoo/application/container/docprocs/Rot13DocumentProcessor.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.application.container.docprocs;
 
 import com.yahoo.docproc.DocumentProcessor;
diff --git a/application/src/test/java/com/yahoo/application/container/handler/HeadersTestCase.java b/application/src/test/java/com/yahoo/application/container/handler/HeadersTestCase.java
index 629513689cd..31e265adfae 100644
--- a/application/src/test/java/com/yahoo/application/container/handler/HeadersTestCase.java
+++ b/application/src/test/java/com/yahoo/application/container/handler/HeadersTestCase.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.application.container.handler;
 
 import org.junit.Test;
diff --git a/application/src/test/java/com/yahoo/application/container/handler/ResponseTestCase.java b/application/src/test/java/com/yahoo/application/container/handler/ResponseTestCase.java
index 0e27f68ef13..ccae305c6d3 100644
--- a/application/src/test/java/com/yahoo/application/container/handler/ResponseTestCase.java
+++ b/application/src/test/java/com/yahoo/application/container/handler/ResponseTestCase.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.application.container.handler;
 
 import org.junit.Test;
diff --git a/application/src/test/java/com/yahoo/application/container/handlers/DelayedThrowingInWriteRequestHandler.java b/application/src/test/java/com/yahoo/application/container/handlers/DelayedThrowingInWriteRequestHandler.java
index 54c850efd37..2638bcfdfef 100644
--- a/application/src/test/java/com/yahoo/application/container/handlers/DelayedThrowingInWriteRequestHandler.java
+++ b/application/src/test/java/com/yahoo/application/container/handlers/DelayedThrowingInWriteRequestHandler.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.application.container.handlers;
 
 import com.yahoo.jdisc.handler.AbstractRequestHandler;
diff --git a/application/src/test/java/com/yahoo/application/container/handlers/DelayedWriteException.java b/application/src/test/java/com/yahoo/application/container/handlers/DelayedWriteException.java
index e856ac310cb..01cebc3a3e9 100644
--- a/application/src/test/java/com/yahoo/application/container/handlers/DelayedWriteException.java
+++ b/application/src/test/java/com/yahoo/application/container/handlers/DelayedWriteException.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.application.container.handlers;
 
 /**
diff --git a/application/src/test/java/com/yahoo/application/container/handlers/EchoRequestHandler.java b/application/src/test/java/com/yahoo/application/container/handlers/EchoRequestHandler.java
index 1763c87e8ca..25d5921b299 100644
--- a/application/src/test/java/com/yahoo/application/container/handlers/EchoRequestHandler.java
+++ b/application/src/test/java/com/yahoo/application/container/handlers/EchoRequestHandler.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.application.container.handlers;
 
 import com.yahoo.jdisc.Response;
diff --git a/application/src/test/java/com/yahoo/application/container/handlers/HeaderEchoRequestHandler.java b/application/src/test/java/com/yahoo/application/container/handlers/HeaderEchoRequestHandler.java
index 4eea69ea162..7749902f25a 100644
--- a/application/src/test/java/com/yahoo/application/container/handlers/HeaderEchoRequestHandler.java
+++ b/application/src/test/java/com/yahoo/application/container/handlers/HeaderEchoRequestHandler.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.application.container.handlers;
 
 import com.yahoo.jdisc.Request;
diff --git a/application/src/test/java/com/yahoo/application/container/handlers/MockHttpHandler.java b/application/src/test/java/com/yahoo/application/container/handlers/MockHttpHandler.java
index b3287015b28..3e2d5eab559 100644
--- a/application/src/test/java/com/yahoo/application/container/handlers/MockHttpHandler.java
+++ b/application/src/test/java/com/yahoo/application/container/handlers/MockHttpHandler.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.application.container.handlers;
 
 import com.yahoo.container.jdisc.HttpRequest;
diff --git a/application/src/test/java/com/yahoo/application/container/handlers/ThrowingInWriteRequestHandler.java b/application/src/test/java/com/yahoo/application/container/handlers/ThrowingInWriteRequestHandler.java
index 9cde4eaf9f8..535dcca16dc 100644
--- a/application/src/test/java/com/yahoo/application/container/handlers/ThrowingInWriteRequestHandler.java
+++ b/application/src/test/java/com/yahoo/application/container/handlers/ThrowingInWriteRequestHandler.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.application.container.handlers;
 
 import com.yahoo.jdisc.handler.AbstractRequestHandler;
diff --git a/application/src/test/java/com/yahoo/application/container/handlers/WriteException.java b/application/src/test/java/com/yahoo/application/container/handlers/WriteException.java
index 63a62340efe..3ec0eb63a48 100644
--- a/application/src/test/java/com/yahoo/application/container/handlers/WriteException.java
+++ b/application/src/test/java/com/yahoo/application/container/handlers/WriteException.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.application.container.handlers;
 
 /**
diff --git a/application/src/test/java/com/yahoo/application/container/processors/Rot13Processor.java b/application/src/test/java/com/yahoo/application/container/processors/Rot13Processor.java
index 3cd1de85475..6560017d554 100644
--- a/application/src/test/java/com/yahoo/application/container/processors/Rot13Processor.java
+++ b/application/src/test/java/com/yahoo/application/container/processors/Rot13Processor.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.application.container.processors;
 
 import com.yahoo.processing.Processor;
diff --git a/application/src/test/java/com/yahoo/application/container/renderers/MockRenderer.java b/application/src/test/java/com/yahoo/application/container/renderers/MockRenderer.java
index 6e9899c7b9f..8191fe4a2ee 100644
--- a/application/src/test/java/com/yahoo/application/container/renderers/MockRenderer.java
+++ b/application/src/test/java/com/yahoo/application/container/renderers/MockRenderer.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.application.container.renderers;
 
 import com.yahoo.search.Result;
diff --git a/application/src/test/java/com/yahoo/application/container/searchers/MockSearcher.java b/application/src/test/java/com/yahoo/application/container/searchers/MockSearcher.java
index 106d68f6644..867f3e52015 100644
--- a/application/src/test/java/com/yahoo/application/container/searchers/MockSearcher.java
+++ b/application/src/test/java/com/yahoo/application/container/searchers/MockSearcher.java
@@ -1,24 +1,24 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.

-package com.yahoo.application.container.searchers;

-

-import com.yahoo.search.Query;

-import com.yahoo.search.Result;

-import com.yahoo.search.Searcher;

-import com.yahoo.search.result.Hit;

-import com.yahoo.search.result.HitGroup;

-import com.yahoo.search.searchchain.Execution;

-

-/**

- *

- * @author Christian Andersen

- */

-public class MockSearcher extends Searcher {

-

-    @Override

-    public Result search(Query query, Execution execution) {

-        HitGroup hits = new HitGroup();

-        hits.add(new Hit("foo", query));

-        return new Result(query, hits);

-    }

-

-}

+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.application.container.searchers;
+
+import com.yahoo.search.Query;
+import com.yahoo.search.Result;
+import com.yahoo.search.Searcher;
+import com.yahoo.search.result.Hit;
+import com.yahoo.search.result.HitGroup;
+import com.yahoo.search.searchchain.Execution;
+
+/**
+ *
+ * @author Christian Andersen
+ */
+public class MockSearcher extends Searcher {
+
+    @Override
+    public Result search(Query query, Execution execution) {
+        HitGroup hits = new HitGroup();
+        hits.add(new Hit("foo", query));
+        return new Result(query, hits);
+    }
+
+}
diff --git a/application/src/test/resources/configdefinitions/mock-application.def b/application/src/test/resources/configdefinitions/mock-application.def
index bc61f976c15..41b50df1125 100644
--- a/application/src/test/resources/configdefinitions/mock-application.def
+++ b/application/src/test/resources/configdefinitions/mock-application.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.
 version=1
 namespace=application
 
diff --git a/application/src/test/resources/test.sd b/application/src/test/resources/test.sd
index ff196e6b189..85600ef9546 100644
--- a/application/src/test/resources/test.sd
+++ b/application/src/test/resources/test.sd
@@ -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.
 search test {
 
   document test {
diff --git a/application/src/test/scala/com/yahoo/application/ApplicationBuilderTest.scala b/application/src/test/scala/com/yahoo/application/ApplicationBuilderTest.scala
index b73f20fc640..8d6ad443286 100644
--- a/application/src/test/scala/com/yahoo/application/ApplicationBuilderTest.scala
+++ b/application/src/test/scala/com/yahoo/application/ApplicationBuilderTest.scala
@@ -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.application
 
 import container.JDiscTest._
diff --git a/application/src/test/scala/com/yahoo/application/container/JDiscContainerSearchTest.scala b/application/src/test/scala/com/yahoo/application/container/JDiscContainerSearchTest.scala
index 03b7cc566fe..9d7e8ea26ab 100644
--- a/application/src/test/scala/com/yahoo/application/container/JDiscContainerSearchTest.scala
+++ b/application/src/test/scala/com/yahoo/application/container/JDiscContainerSearchTest.scala
@@ -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.application.container
 
 import org.junit.Test
diff --git a/application/src/test/scala/com/yahoo/application/container/JDiscTest.scala b/application/src/test/scala/com/yahoo/application/container/JDiscTest.scala
index aef1d540ee3..c84e8a17a0d 100644
--- a/application/src/test/scala/com/yahoo/application/container/JDiscTest.scala
+++ b/application/src/test/scala/com/yahoo/application/container/JDiscTest.scala
@@ -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.application.container
 
 import com.yahoo.container.Container
diff --git a/application/src/test/scala/com/yahoo/application/container/handlers/TestHandler.scala b/application/src/test/scala/com/yahoo/application/container/handlers/TestHandler.scala
index acc1c74abfe..067ba3f31f1 100644
--- a/application/src/test/scala/com/yahoo/application/container/handlers/TestHandler.scala
+++ b/application/src/test/scala/com/yahoo/application/container/handlers/TestHandler.scala
@@ -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.application.container.handlers
 
 import com.yahoo.jdisc.handler.{ResponseDispatch, ResponseHandler, AbstractRequestHandler}
diff --git a/application/src/test/scala/com/yahoo/application/container/jersey/JerseyTest.scala b/application/src/test/scala/com/yahoo/application/container/jersey/JerseyTest.scala
index de1ce3fcd27..5801197602b 100644
--- a/application/src/test/scala/com/yahoo/application/container/jersey/JerseyTest.scala
+++ b/application/src/test/scala/com/yahoo/application/container/jersey/JerseyTest.scala
@@ -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.application.container.jersey
 
 import java.nio.file.{Path, Files, Paths}
diff --git a/application/src/test/scala/com/yahoo/application/container/jersey/resources/TestResource.scala b/application/src/test/scala/com/yahoo/application/container/jersey/resources/TestResource.scala
index a0c769721ab..5dc16102d8e 100644
--- a/application/src/test/scala/com/yahoo/application/container/jersey/resources/TestResource.scala
+++ b/application/src/test/scala/com/yahoo/application/container/jersey/resources/TestResource.scala
@@ -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.application.container.jersey.resources
 
 import javax.ws.rs.Path
diff --git a/application/src/test/scala/com/yahoo/application/container/jersey/resources/nestedpackage1/NestedTestResource1.scala b/application/src/test/scala/com/yahoo/application/container/jersey/resources/nestedpackage1/NestedTestResource1.scala
index e6b0bb2de8e..c50d7cd6f57 100644
--- a/application/src/test/scala/com/yahoo/application/container/jersey/resources/nestedpackage1/NestedTestResource1.scala
+++ b/application/src/test/scala/com/yahoo/application/container/jersey/resources/nestedpackage1/NestedTestResource1.scala
@@ -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.application.container.jersey.resources.nestedpackage1
 
 import javax.ws.rs.Path
diff --git a/application/src/test/scala/com/yahoo/application/container/jersey/resources/nestedpackage2/NestedTestResource2.scala b/application/src/test/scala/com/yahoo/application/container/jersey/resources/nestedpackage2/NestedTestResource2.scala
index 7d4e715910d..50f0054b6ec 100644
--- a/application/src/test/scala/com/yahoo/application/container/jersey/resources/nestedpackage2/NestedTestResource2.scala
+++ b/application/src/test/scala/com/yahoo/application/container/jersey/resources/nestedpackage2/NestedTestResource2.scala
@@ -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.application.container.jersey.resources.nestedpackage2
 
 import javax.ws.rs.Path
diff --git a/application/src/test/scala/com/yahoo/application/container/searchers/AddHitSearcher.scala b/application/src/test/scala/com/yahoo/application/container/searchers/AddHitSearcher.scala
index a7427414315..e3a6cd031bc 100644
--- a/application/src/test/scala/com/yahoo/application/container/searchers/AddHitSearcher.scala
+++ b/application/src/test/scala/com/yahoo/application/container/searchers/AddHitSearcher.scala
@@ -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.application.container.searchers
 
 import com.yahoo.search.{Searcher, Result, Query}