summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2017-10-27 12:40:27 +0200
committerGitHub <noreply@github.com>2017-10-27 12:40:27 +0200
commit23db8ec8a0c161414ec87604e3cbe8ca1a0c607e (patch)
treed7484ccd385943b621430fd243c506064ad3b920
parent114757a3dea6bec9521a7aad8d9495c5f3381b9b (diff)
parent4cbb86ca755f56defd3768571087bfdd73e0193c (diff)
Merge pull request #3918 from vespa-engine/bratseth/add-copyright-headers
Add copyright header
-rw-r--r--CONTRIBUTING.md1
-rw-r--r--README-cmake.md1
-rw-r--r--README.md1
-rw-r--r--TODO.md1
-rw-r--r--athenz-identity-provider-service/pom.xml1
-rw-r--r--bundle-plugin-test/README.md1
-rw-r--r--bundle-plugin/README.md1
-rw-r--r--component/README.md1
-rw-r--r--config-class-plugin/README.md1
-rw-r--r--config-lib/README.md1
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/application/api/TimeWindow.java1
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java1
-rw-r--r--config-model-api/src/test/java/com/yahoo/config/application/api/TimeWindowTest.java1
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedMacroNames.java1
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorter.java1
-rw-r--r--config-model/src/test/cfg/application/invalid_parallel_deployment_xml/deployment.xml1
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedMacroNamesTestCase.java1
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorterTest.java1
-rw-r--r--config-model/src/test/schema-test-files/validation-overrides.xml1
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java1
-rw-r--r--config/README.md1
-rw-r--r--config_test/README.md1
-rw-r--r--configdefinitions/src/vespa/logforwarder.def1
-rw-r--r--configgen/src/main/java/com/yahoo/config/codegen/ConfiggenUtil.java1
-rw-r--r--configutil/README.md1
-rw-r--r--container-accesslogging/README.md1
-rw-r--r--container-core/README.md1
-rw-r--r--container-core/src/main/resources/configdefinitions/identity.def1
-rw-r--r--container-dependencies-enforcer/README.md1
-rw-r--r--container-dev-builder/README.md1
-rw-r--r--container-dev/README.md1
-rw-r--r--container-di/README.md1
-rw-r--r--container-disc/README.md1
-rw-r--r--container-jersey2/README.md1
-rw-r--r--container-search-and-docproc/README.md1
-rw-r--r--container-test-jars/README.md1
-rw-r--r--container-test/README.md3
-rw-r--r--container/README.md1
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeList.java3
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentMetrics.java1
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java1
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java1
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializer.java1
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/UpgraderResponse.java1
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/ClusterUtilizationTest.java3
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainerTest.java3
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.java3
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java1
-rw-r--r--dist/README.md1
-rw-r--r--docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.java3
-rw-r--r--docker/README.md1
-rw-r--r--jaxrs_client_utils/README.md1
-rw-r--r--jdisc_core/README.md1
-rw-r--r--jdisc_core_test/README.md1
-rw-r--r--jdisc_http_service/README.md1
-rw-r--r--jdisc_messagebus_service/README.md1
-rw-r--r--node-admin/README.md3
-rw-r--r--node-maintainer/README.md1
-rw-r--r--node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/TODO.md3
-rw-r--r--node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/README.md3
-rw-r--r--node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/README.md1
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/README.md3
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizerTest.java1
-rw-r--r--orchestrator-restapi/README.md1
-rw-r--r--orchestrator/README.md3
-rw-r--r--predicate-search-core/README.md1
-rw-r--r--predicate-search/README.md1
-rw-r--r--protocols/README.md1
-rw-r--r--provided-dependencies/README.md1
-rw-r--r--serviceview/README.md1
-rw-r--r--socket_test/README.md1
-rw-r--r--vagrant/README.md1
-rw-r--r--vespa-application-maven-plugin/README.md3
-rw-r--r--vespabase/conf/default-env.txt.in1
-rw-r--r--vespaclient-java/README.md1
-rw-r--r--vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLock.java1
-rw-r--r--vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLocking.java1
-rw-r--r--vespajlib/src/main/java/com/yahoo/concurrent/classlock/LockInterruptException.java1
-rw-r--r--vespajlib/src/main/java/com/yahoo/lang/SettableOptional.java1
-rw-r--r--vespajlib/src/main/java/com/yahoo/text/Text.java1
80 files changed, 92 insertions, 12 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f09a13ff8bf..83fb1480e71 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Contributing to Vespa
Contributions to [Vespa](http://github.com/vespa-engine/vespa)
and the [Vespa documentation](http://github.com/vespa-engine/documentation)
diff --git a/README-cmake.md b/README-cmake.md
index 192e63a77b5..3b569482535 100644
--- a/README-cmake.md
+++ b/README-cmake.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
CMake Guide
===========
diff --git a/README.md b/README.md
index 51ecc5fb02e..37ceb44ccfd 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Vespa
Vespa is an engine for low-latency computation over large data sets.
It stores and indexes your data such that queries, selection and processing over the
diff --git a/TODO.md b/TODO.md
index f06251f7ebd..d5f8c0e66cc 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# List of possible future enhancements and features
This lists some possible improvements to Vespa which have been considered or requested, can be developed relatively independently of other work and are not yet under development.
diff --git a/athenz-identity-provider-service/pom.xml b/athenz-identity-provider-service/pom.xml
index 3d117ce25cb..bb82e40f827 100644
--- a/athenz-identity-provider-service/pom.xml
+++ b/athenz-identity-provider-service/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
diff --git a/bundle-plugin-test/README.md b/bundle-plugin-test/README.md
index 23f9655b978..241db9bfea3 100644
--- a/bundle-plugin-test/README.md
+++ b/bundle-plugin-test/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Bundle plugin test
Integration tests for the JDisc bundle plugin.
diff --git a/bundle-plugin/README.md b/bundle-plugin/README.md
index 057fd29ada7..64a8038b9fc 100644
--- a/bundle-plugin/README.md
+++ b/bundle-plugin/README.md
@@ -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 bundle plugin
Maven plugin for building OSGi bundles for JDisc.
diff --git a/component/README.md b/component/README.md
index 202b2233c13..4ee204e384d 100644
--- a/component/README.md
+++ b/component/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Component library
Library for components with lifecycle and versioning.
diff --git a/config-class-plugin/README.md b/config-class-plugin/README.md
index 5fa87da63e1..ff8ed191137 100644
--- a/config-class-plugin/README.md
+++ b/config-class-plugin/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
Vespa Config Generation
=======================
diff --git a/config-lib/README.md b/config-lib/README.md
index bfc2a4c4596..8c95ee50c4d 100644
--- a/config-lib/README.md
+++ b/config-lib/README.md
@@ -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 for generated config classes
Base library for generated cloud config classes.
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/TimeWindow.java b/config-model-api/src/main/java/com/yahoo/config/application/api/TimeWindow.java
index 40b5a5370e7..2c3fbf2f604 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/TimeWindow.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/TimeWindow.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.config.application.api;
import java.time.DateTimeException;
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java
index 624b4c1581b..5599b257b16 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.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.config.application.api.xml;
import com.yahoo.config.application.api.DeploymentSpec;
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/TimeWindowTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/TimeWindowTest.java
index 86ce0466213..83aa0d9c5f6 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/TimeWindowTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/TimeWindowTest.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.config.application.api;
import org.junit.Test;
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedMacroNames.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedMacroNames.java
index c2c5ca66eba..f7036c2d7bd 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedMacroNames.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedMacroNames.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.searchdefinition.processing;
import com.google.common.collect.ImmutableSet;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorter.java b/config-model/src/main/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorter.java
index 2f749a28f2d..19cd0223660 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorter.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorter.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.vespa.model.content;
import com.yahoo.documentmodel.NewDocumentType;
diff --git a/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/deployment.xml b/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/deployment.xml
index 0d3b74b8119..2f6e9b7a1a6 100644
--- a/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/deployment.xml
+++ b/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/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/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedMacroNamesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedMacroNamesTestCase.java
index a4b4b03718d..6f13ca76fc2 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedMacroNamesTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedMacroNamesTestCase.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.searchdefinition.processing;
import com.yahoo.config.application.api.DeployLogger;
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorterTest.java
index ddac6562612..09e3473ecb0 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/TopologicalDocumentTypeSorterTest.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.vespa.model.content;
import com.yahoo.documentmodel.NewDocumentType;
diff --git a/config-model/src/test/schema-test-files/validation-overrides.xml b/config-model/src/test/schema-test-files/validation-overrides.xml
index 3b8b4f290be..4e55fdc870b 100644
--- a/config-model/src/test/schema-test-files/validation-overrides.xml
+++ b/config-model/src/test/schema-test-files/validation-overrides.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. -->
<validation-overrides>
<allow until="2017-01-01" comment="Some change">field-type-change</allow>
<allow until="2017-02-01">cluster-size-reduction</allow>
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java
index dbb1b55aeb9..8444f2e10fc 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.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.config.provision;
import com.yahoo.slime.ArrayTraverser;
diff --git a/config/README.md b/config/README.md
index ab155c0258b..93d9bb36050 100644
--- a/config/README.md
+++ b/config/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Config library in C++ and java
Library for config subscription and config protocol.
diff --git a/config_test/README.md b/config_test/README.md
index 3450ef3414a..66ebbc8ba83 100644
--- a/config_test/README.md
+++ b/config_test/README.md
@@ -1,2 +1,3 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Test using cloud config without Vespa
diff --git a/configdefinitions/src/vespa/logforwarder.def b/configdefinitions/src/vespa/logforwarder.def
index 0c311524fef..7a924616aaa 100644
--- a/configdefinitions/src/vespa/logforwarder.def
+++ b/configdefinitions/src/vespa/logforwarder.def
@@ -1,3 +1,4 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
namespace=cloud.config
# only splunk type config for now
diff --git a/configgen/src/main/java/com/yahoo/config/codegen/ConfiggenUtil.java b/configgen/src/main/java/com/yahoo/config/codegen/ConfiggenUtil.java
index a7a3eb718a3..299a5540098 100644
--- a/configgen/src/main/java/com/yahoo/config/codegen/ConfiggenUtil.java
+++ b/configgen/src/main/java/com/yahoo/config/codegen/ConfiggenUtil.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.config.codegen;
import java.util.Arrays;
diff --git a/configutil/README.md b/configutil/README.md
index 43494629903..a14d54d5612 100644
--- a/configutil/README.md
+++ b/configutil/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Utilities for verifying and inspecting config
vespa-config-status and vespa-model-inspect
diff --git a/container-accesslogging/README.md b/container-accesslogging/README.md
index e8a7dd27d32..1d5b7d140e9 100644
--- a/container-accesslogging/README.md
+++ b/container-accesslogging/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Access logging for JDisc
Contains various access log implementations for JDisc.
diff --git a/container-core/README.md b/container-core/README.md
index 7e304587ca3..84f7943e2fa 100644
--- a/container-core/README.md
+++ b/container-core/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Container core
This module contains various core classes for JDisc container.
diff --git a/container-core/src/main/resources/configdefinitions/identity.def b/container-core/src/main/resources/configdefinitions/identity.def
index 5a40822074e..4200f2285f5 100644
--- a/container-core/src/main/resources/configdefinitions/identity.def
+++ b/container-core/src/main/resources/configdefinitions/identity.def
@@ -1,3 +1,4 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
namespace=container.core.identity
domain string
diff --git a/container-dependencies-enforcer/README.md b/container-dependencies-enforcer/README.md
index 7a14cea809c..b0c341c3d0d 100644
--- a/container-dependencies-enforcer/README.md
+++ b/container-dependencies-enforcer/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Dependencies enforcer for 3rd party container projects.
Enforces that only whitelisted dependencies are visible in
diff --git a/container-dev-builder/README.md b/container-dev-builder/README.md
index 13c77dc808c..3218833930a 100644
--- a/container-dev-builder/README.md
+++ b/container-dev-builder/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# container-dev-builder
TODO
diff --git a/container-dev/README.md b/container-dev/README.md
index 597d52f3113..8c7fbc2c83c 100644
--- a/container-dev/README.md
+++ b/container-dev/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Container development maven dependency
Maven dependency for internal Vespa modules that should be built as JDisc bundles.
diff --git a/container-di/README.md b/container-di/README.md
index e261c2bcfe5..0eeb9d7280f 100644
--- a/container-di/README.md
+++ b/container-di/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Container DI
JDisc's dependency injection framework.
diff --git a/container-disc/README.md b/container-disc/README.md
index 54f575ff353..30a919a0fb7 100644
--- a/container-disc/README.md
+++ b/container-disc/README.md
@@ -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 container internal integration
JDisc container integration layer with jdisc_core.
diff --git a/container-jersey2/README.md b/container-jersey2/README.md
index f3fb2fdb468..43f83ddccbe 100644
--- a/container-jersey2/README.md
+++ b/container-jersey2/README.md
@@ -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 Jersey integration
The integration layer between JDisc and Jersey2.
diff --git a/container-search-and-docproc/README.md b/container-search-and-docproc/README.md
index fff041175bb..afbbbb1a923 100644
--- a/container-search-and-docproc/README.md
+++ b/container-search-and-docproc/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Container search and docproc bundle
Pacakges the search and document processing modules for JDisc
diff --git a/container-test-jars/README.md b/container-test-jars/README.md
index e38f7951b8e..f4f4481efc1 100644
--- a/container-test-jars/README.md
+++ b/container-test-jars/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Container test bundles
Used by the 'application' module.
diff --git a/container-test/README.md b/container-test/README.md
index 147618f9851..d2b74b38194 100644
--- a/container-test/README.md
+++ b/container-test/README.md
@@ -1,6 +1,7 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Container-test
Convenience dependency for users developing OSGi bundles for JDisc.
Add this maven artifact as a **test** scope dependency in your pom.xml,
and it will transitively pull in all dependencies needed to unit test
-JDisc components with the `application` test tool. \ No newline at end of file
+JDisc components with the `application` test tool.
diff --git a/container/README.md b/container/README.md
index 05eb34531f5..49647f8c80f 100644
--- a/container/README.md
+++ b/container/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Container
Convenience dependency for users developing OSGi bundles for JDisc.
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeList.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeList.java
index 755bec2fcec..0169bfec5fe 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeList.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeList.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.vespa.hosted.controller.api.integration.configserver;// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -33,4 +34,4 @@ public class NodeList {
public String clusterId;
}
}
-} \ No newline at end of file
+}
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentMetrics.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentMetrics.java
index 2cfbeaddb42..504e2285a34 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentMetrics.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentMetrics.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.vespa.hosted.controller.application;// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
/**
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java
index 2ccfcb9e460..f9a3ba0e8d3 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.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.vespa.hosted.controller.deployment;
import com.yahoo.config.application.api.DeploymentSpec;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java
index ce06be665c6..8c28ec63517 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.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.vespa.hosted.controller.maintenance;// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
import com.yahoo.vespa.curator.Lock;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializer.java
index e0bc592c82c..81c3bb963db 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializer.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.vespa.hosted.controller.persistence;
import com.yahoo.component.Version;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/UpgraderResponse.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/UpgraderResponse.java
index 3444f710d4c..0e6e0030ecf 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/UpgraderResponse.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/UpgraderResponse.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.vespa.hosted.controller.restapi.controller;
import com.yahoo.container.jdisc.HttpResponse;
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/ClusterUtilizationTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/ClusterUtilizationTest.java
index ca67e605682..c58a5f5c21a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/ClusterUtilizationTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/ClusterUtilizationTest.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.vespa.hosted.controller.application;
import org.junit.Assert;
@@ -26,4 +27,4 @@ public class ClusterUtilizationTest {
Assert.assertEquals(0.3, resources.getMaxUtilization(), delta);
}
-} \ No newline at end of file
+}
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainerTest.java
index da97c1122c3..66be2d09797 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ClusterUtilizationMaintainerTest.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.vespa.hosted.controller.maintenance;
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
@@ -35,4 +36,4 @@ public class ClusterUtilizationMaintainerTest {
Assert.assertEquals(0.5554, deployment.clusterUtils().get(ClusterSpec.Id.from("default")).getCpu(), Double.MIN_VALUE);
}
-} \ No newline at end of file
+}
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.java
index cb503fc1fb7..d3907e27456 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.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.vespa.hosted.controller.maintenance;
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
@@ -38,4 +39,4 @@ public class DeploymentMetricsMaintainerTest {
Assert.assertEquals(5, deployment.metrics().writeLatencyMillis(), Double.MIN_VALUE);
}
-} \ No newline at end of file
+}
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java
index feaf1289853..f5f43265cb8 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.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.vespa.hosted.controller.persistence;
import com.yahoo.component.Version;
diff --git a/dist/README.md b/dist/README.md
index 4185537954d..1db8f39c1a9 100644
--- a/dist/README.md
+++ b/dist/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Building Vespa RPM
diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.java
index 1bc73d981c3..aa455cfc0f2 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.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.vespa.hosted.dockerapi;
@@ -26,4 +27,4 @@ public class CreateContainerCommandImplTest {
assertEquals(expectedMac, generatedMac);
});
}
-} \ No newline at end of file
+}
diff --git a/docker/README.md b/docker/README.md
index f6e0cf4d788..cd073413ea7 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Building and running Vespa on Docker (OS X and Linux)
diff --git a/jaxrs_client_utils/README.md b/jaxrs_client_utils/README.md
index 7a184e07ddf..f0d584c4e2d 100644
--- a/jaxrs_client_utils/README.md
+++ b/jaxrs_client_utils/README.md
@@ -1,2 +1,3 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Utilities for client-side JAX-RS
Code to make it simpler to connect to JAX-RS services (aka REST APIs).
diff --git a/jdisc_core/README.md b/jdisc_core/README.md
index 4a1561d6ce7..581647bf5ad 100644
--- a/jdisc_core/README.md
+++ b/jdisc_core/README.md
@@ -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 core
The most basic part of JDisc.
diff --git a/jdisc_core_test/README.md b/jdisc_core_test/README.md
index 8e5022648e4..0a07e06f38c 100644
--- a/jdisc_core_test/README.md
+++ b/jdisc_core_test/README.md
@@ -1 +1,2 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Tests for jdisc core
diff --git a/jdisc_http_service/README.md b/jdisc_http_service/README.md
index 8bf2354823e..bb7882b9a2a 100644
--- a/jdisc_http_service/README.md
+++ b/jdisc_http_service/README.md
@@ -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 HTTP Service
This package provides a ClientProvider and a ServerProvider implementation using HTTP on JDisc. Built on Jetty.
diff --git a/jdisc_messagebus_service/README.md b/jdisc_messagebus_service/README.md
index 19fb93ed3f3..cecb21de952 100644
--- a/jdisc_messagebus_service/README.md
+++ b/jdisc_messagebus_service/README.md
@@ -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 messagebus service
Messagebus protocol implementation for JDisc.
diff --git a/node-admin/README.md b/node-admin/README.md
index a2f0ba2c4ec..4ef9a67e1b5 100644
--- a/node-admin/README.md
+++ b/node-admin/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Node Admin
-Manages docker containers that run different applications on a host. \ No newline at end of file
+Manages docker containers that run different applications on a host.
diff --git a/node-maintainer/README.md b/node-maintainer/README.md
index 4a32f207fdf..33df558effb 100644
--- a/node-maintainer/README.md
+++ b/node-maintainer/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Node Admin Maintenance
Executes maintenance jobs, such as deleting old logs, processing and reporting coredumps, on behalf of node-admin.
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/TODO.md b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/TODO.md
index 846c52ff645..e7869adb66a 100644
--- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/TODO.md
+++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/TODO.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
#TODO
Here we have listed things we did not have time to do during the summer, but that we think can be implemented later.
@@ -27,4 +28,4 @@ Here it is room for improvements and some possible solutions are:
with errors in HardwareDivergence.
- In addition to uploading the report to node repo, have actions based on what kind of errors and what kind of state
the node has.
- - Automatically create Jira tickets when something is reported wrong on a node. \ No newline at end of file
+ - Automatically create Jira tickets when something is reported wrong on a node.
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/README.md b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/README.md
index ff580db7f73..defa24bfcab 100644
--- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/README.md
+++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Hardware Verification
Verification of behaviour and performance of hardware. Benchmarks cpu frequency, disk write speed and memory write/read speed.
A report is sent to the node repository if any of the results are below an accepted threshold.
@@ -10,4 +11,4 @@ the BenchmarkResultInspector, which creates a BenchmarkReport containing the val
ReportSender is then called such that
the old HardwareDivergence report is retrieved from node repo and updated with the new results. ReportSender prints the new HardwareReport such that it
-can be updated in node repo by chef or other. \ No newline at end of file
+can be updated in node repo by chef or other.
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/README.md b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/README.md
index 26856e078eb..d7129553416 100644
--- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/README.md
+++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Spec Verification
Verifies that the spec information in node repo coincides with what found on the node and reports back to node repo.
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/README.md b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/README.md
index 6065847dfa2..bbb2ec7080b 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/README.md
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/README.md
@@ -1,5 +1,6 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
The test resources are used by both NoadAdmin and NodeRepository
tests to verify APIs. So when modifying this test data
remember to check tests for both NodeAdmin and NodeRepository.
-TODO: Get rid of this package. Move to Tester objects in the test dir of each of those modules. \ No newline at end of file
+TODO: Get rid of this package. Move to Tester objects in the test dir of each of those modules.
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizerTest.java
index 04c0af5d98a..47ead201509 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizerTest.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.vespa.hosted.provision.provisioning;// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
import com.yahoo.component.Version;
diff --git a/orchestrator-restapi/README.md b/orchestrator-restapi/README.md
index 367a4cfbdf3..5cd998249a4 100644
--- a/orchestrator-restapi/README.md
+++ b/orchestrator-restapi/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# REST API definitions for Orchestrator.
Having the API definitions in a separate module makes it easier
diff --git a/orchestrator/README.md b/orchestrator/README.md
index 455bd265fcc..de2995cb143 100644
--- a/orchestrator/README.md
+++ b/orchestrator/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Orchestrator, a.k.a. Maestro
A service to facilitate safe and staggered restart and upgrades of services in a Vespa instance.
It uses consolidated information from Slobrok and the application model to decide if a hosts
@@ -7,4 +8,4 @@ should be allowed to stop its services.
* Constraint on requests on start-up.
* Constraint on requests after permitting host to go down (it should last at least as long as Slobrok heartbeat cycle).
* Implement caching of host-down decisions.
-* Instance resource, exposing the orchestrators current knowledge \ No newline at end of file
+* Instance resource, exposing the orchestrators current knowledge
diff --git a/predicate-search-core/README.md b/predicate-search-core/README.md
index 2e4abe35c7e..8241f342076 100644
--- a/predicate-search-core/README.md
+++ b/predicate-search-core/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# API classes for boolean/predicate search
* Contains Java code for parsing and representing boolean predicates.
diff --git a/predicate-search/README.md b/predicate-search/README.md
index 2e21b01b406..bd0863ce9a1 100644
--- a/predicate-search/README.md
+++ b/predicate-search/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Predicate search library
Java library for indexing predicates and querying them using boolean constraints.
diff --git a/protocols/README.md b/protocols/README.md
index b379195578c..c24eacba704 100644
--- a/protocols/README.md
+++ b/protocols/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Cross-module protocol definitions
This module can be used as a place to put cross-module definitions of APIs
diff --git a/provided-dependencies/README.md b/provided-dependencies/README.md
index bd510f266ff..672a49e67bb 100644
--- a/provided-dependencies/README.md
+++ b/provided-dependencies/README.md
@@ -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 provided dependencies
Dependencies that are installed in JDisc and should not be included in artifacts with dependencies.
diff --git a/serviceview/README.md b/serviceview/README.md
index 44a9216f87a..c413b4c555f 100644
--- a/serviceview/README.md
+++ b/serviceview/README.md
@@ -1 +1,2 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# REST API for getting a view of services and hosts for an application
diff --git a/socket_test/README.md b/socket_test/README.md
index e832fa3ab10..1bd05494d5c 100644
--- a/socket_test/README.md
+++ b/socket_test/README.md
@@ -1 +1,2 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# ToDo
diff --git a/vagrant/README.md b/vagrant/README.md
index 1f1f0eee7d2..bf25047f452 100644
--- a/vagrant/README.md
+++ b/vagrant/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Create C++ dev environment on CentOS using VirtualBox and Vagrant
diff --git a/vespa-application-maven-plugin/README.md b/vespa-application-maven-plugin/README.md
index e9687ef46ce..8207d47f739 100644
--- a/vespa-application-maven-plugin/README.md
+++ b/vespa-application-maven-plugin/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Vespa application plugin
-Maven Plugin for assembling a vespa application package. \ No newline at end of file
+Maven Plugin for assembling a vespa application package.
diff --git a/vespabase/conf/default-env.txt.in b/vespabase/conf/default-env.txt.in
index 4855ac9f571..5b144e4c301 100644
--- a/vespabase/conf/default-env.txt.in
+++ b/vespabase/conf/default-env.txt.in
@@ -1,2 +1,3 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
fallback VESPA_HOME @CMAKE_INSTALL_PREFIX@
override VESPA_USER vespa
diff --git a/vespaclient-java/README.md b/vespaclient-java/README.md
index ea6df725d00..400180af333 100644
--- a/vespaclient-java/README.md
+++ b/vespaclient-java/README.md
@@ -1,3 +1,4 @@
+<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
# Vespa Java command line utilities
This package provides several command line utilities written Java.
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLock.java b/vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLock.java
index b0d26bfeb1c..c4dbcebf9cb 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLock.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLock.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.concurrent.classlock;
/**
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLocking.java b/vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLocking.java
index 5330e869396..c9712d5db54 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLocking.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/classlock/ClassLocking.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.concurrent.classlock;
import java.util.HashMap;
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/classlock/LockInterruptException.java b/vespajlib/src/main/java/com/yahoo/concurrent/classlock/LockInterruptException.java
index b2ae4166564..b7ee10e201b 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/classlock/LockInterruptException.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/classlock/LockInterruptException.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.concurrent.classlock;
/**
diff --git a/vespajlib/src/main/java/com/yahoo/lang/SettableOptional.java b/vespajlib/src/main/java/com/yahoo/lang/SettableOptional.java
index 00ff06b8f01..db5dd76c124 100644
--- a/vespajlib/src/main/java/com/yahoo/lang/SettableOptional.java
+++ b/vespajlib/src/main/java/com/yahoo/lang/SettableOptional.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.lang;
import java.util.NoSuchElementException;
diff --git a/vespajlib/src/main/java/com/yahoo/text/Text.java b/vespajlib/src/main/java/com/yahoo/text/Text.java
index 684cdbbcb3e..0bdc2fb63bc 100644
--- a/vespajlib/src/main/java/com/yahoo/text/Text.java
+++ b/vespajlib/src/main/java/com/yahoo/text/Text.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.text;
import java.util.OptionalInt;