From 0c55dc92a3bf889c67fac1ca855e6e33e1994904 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 9 Oct 2023 09:44:29 +0200 Subject: Update copyright --- defaults/src/vespa/config.h.in | 1 + 1 file changed, 1 insertion(+) (limited to 'defaults/src/vespa/config.h.in') diff --git a/defaults/src/vespa/config.h.in b/defaults/src/vespa/config.h.in index 40a4d6ce96f..cf1316431c7 100644 --- a/defaults/src/vespa/config.h.in +++ b/defaults/src/vespa/config.h.in @@ -1,3 +1,4 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -- cgit v1.2.3 From 3424380e68539de60ccf383ef2020c815a1e7f73 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 9 Oct 2023 12:10:01 +0200 Subject: Correct copyright headers --- Gemfile | 2 +- NOTICES | 2 +- airlift-zstd/CMakeLists.txt | 2 +- airlift-zstd/README.md | 2 +- airlift-zstd/pom.xml | 2 +- bootstrap.sh | 2 +- client/go/internal/build/build.go | 2 +- .../META-INF/services/ai.vespa.hosted.cd.TestRuntime | 2 +- .../src/test/derived/matchsettings_map_after/test.sd | 3 --- .../src/test/derived/matchsettings_map_def/test.sd | 3 --- .../test/derived/matchsettings_map_in_struct/test.sd | 3 --- .../src/test/derived/matchsettings_map_wfs/test.sd | 3 --- .../src/test/derived/matchsettings_map_wss/test.sd | 3 --- .../src/test/java/com/yahoo/schema/StructTestCase.java | 2 -- .../validation/AccessControlFilterValidatorTest.java | 2 +- .../validation/UriBindingsValidatorTest.java | 2 +- .../vespa/model/container/search/test/pages/pages.cfg | 10 +++++----- .../src/test/resources/configdefinitions/bootstrap.def | 2 +- .../application/ActiveTokenFingerprintsClientTest.java | 2 +- .../DefaultClusterReindexingStatusClientTest.java | 2 +- .../rpc/security/MultiTenantRpcAuthorizerTest.java | 2 +- container-core/src/main/sh/find-pid | 2 +- container-core/src/main/sh/vespa-jvm-dumper | 2 +- .../test/java/com/yahoo/restapi/RestApiImplTest.java | 2 +- .../test/vespa-configdef/config.test.bootstrap1.def | 2 +- .../test/vespa-configdef/config.test.bootstrap2.def | 2 +- .../com/yahoo/container/jdisc/ClusterInfoProvider.java | 2 -- .../hosted/controller/tenant/ArchiveAccessTest.java | 2 +- .../controller/persistence/TenantSerializerTest.java | 2 +- defaults/src/vespa/config.h.in | 4 +--- integration/intellij/build.gradle.kts | 2 +- integration/intellij/settings.gradle | 2 +- .../main/bnf/ai/vespa/intellij/schema/parser/sd.bnf | 2 +- .../main/jflex/ai/vespa/intellij/schema/lexer/sd.flex | 2 +- .../rankprofilemodularity/test/outside_schema1.profile | 2 +- .../rankprofilemodularity/test/outside_schema2.profile | 2 +- jrt/tests/com/yahoo/jrt/SimpleRequestAccessFilter.java | 2 +- logserver/src/protobuf/log_protocol.proto | 2 +- maven-plugins/allowed-maven-dependencies.txt | 2 +- messagebus/src/vespa/messagebus/create-class-cpp.sh | 2 +- messagebus/src/vespa/messagebus/create-class-h.sh | 2 +- messagebus/src/vespa/messagebus/create-interface.sh | 2 +- .../src/vespa/messagebus/testlib/create-class-cpp.sh | 2 +- .../src/vespa/messagebus/testlib/create-class-h.sh | 2 +- .../src/vespa/messagebus/testlib/create-interface.sh | 2 +- .../java/ai/vespa/metrics/RoutingLayerMetrics.java | 3 +-- .../ai/vespa/metrics/docs/MetricDocumentation.java | 2 +- .../ai/vespa/metrics/docs/MetricSetDocumentation.java | 2 +- .../java/ai/vespa/metrics/docs/UnitDocumentation.java | 2 +- screwdriver.yaml | 2 +- searchcore/src/vespa/searchcore/proton/create-base.sh | 2 +- .../searchcore/proton/matching/rangequerylocator.cpp | 1 - .../searchcore/proton/matching/rangequerylocator.h | 1 - .../vespa/searchcore/proton/server/bootstrapconfig.cpp | 2 +- .../vespa/searchcore/proton/server/bootstrapconfig.h | 2 +- .../proton/server/bootstrapconfigmanager.cpp | 2 +- .../searchcore/proton/server/bootstrapconfigmanager.h | 2 +- .../rankingexpression/evaluation/MapTypeContext.java | 2 +- searchlib/src/protobuf/search_protocol.proto | 2 +- .../src/vespa/searchlib/engine/create-class-cpp.sh | 2 +- searchlib/src/vespa/searchlib/engine/create-class-h.sh | 2 +- .../src/vespa/searchlib/engine/create-interface.sh | 2 +- .../src/vespa/searchlib/features/create-class-cpp.sh | 2 +- .../src/vespa/searchlib/features/create-class-h.sh | 2 +- searchlib/src/vespa/searchlib/fef/create-class-cpp.sh | 2 +- searchlib/src/vespa/searchlib/fef/create-class-h.sh | 2 +- .../src/vespa/searchlib/fef/create-fef-includes.sh | 2 +- searchlib/src/vespa/searchlib/fef/create-interface.sh | 2 +- .../src/vespa/searchlib/queryeval/create-class-cpp.sh | 2 +- .../src/vespa/searchlib/queryeval/create-class-h.sh | 2 +- .../src/vespa/searchlib/queryeval/create-interface.sh | 2 +- searchsummary/src/tests/juniper/suite.h | 2 +- .../vespa/service/monitor/ServiceStatusProvider.java | 2 +- .../storageserver/rpc/protobuf/rpc_envelope.proto | 2 +- .../vespa/storageapi/mbusprot/protobuf/common.proto | 2 +- .../src/vespa/storageapi/mbusprot/protobuf/feed.proto | 2 +- .../vespa/storageapi/mbusprot/protobuf/inspect.proto | 2 +- .../storageapi/mbusprot/protobuf/maintenance.proto | 2 +- .../vespa/storageapi/mbusprot/protobuf/visiting.proto | 2 +- .../ai.vespa.feed.client.FeedClientBuilder | 2 +- vbench/src/vbench/test/create-all-h.sh | 2 +- .../allowed-maven-dependencies.txt | 2 +- .../maven/plugin/enforcer/AllowedDependencies.java | 2 +- .../ai.vespa.feed.client.FeedClientBuilder | 2 +- .../resources/effective-services/test_us-east-1.xml | 2 +- .../apps/make_fixture_macros/make_fixture_macros.cpp | 2 +- vespalib/src/tests/tutorial/tutorial.html | 18 +++++++++--------- zookeeper-command-line-client/src/main/sh/vespa-zkflw | 2 +- 88 files changed, 91 insertions(+), 115 deletions(-) (limited to 'defaults/src/vespa/config.h.in') diff --git a/Gemfile b/Gemfile index 9b2f8ec8580..80024c251ab 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. ruby '>=3.1' source "https://rubygems.org" diff --git a/NOTICES b/NOTICES index 6c06d265627..b5531696edc 100644 --- a/NOTICES +++ b/NOTICES @@ -1,5 +1,5 @@ Vespa, the open big data serving engine -Copyright Yahoo. Code licensed under the Apache 2.0 license. +Copyright Vespa.ai. Code licensed under the Apache 2.0 license. Open-Source Vespa uses several third-party Open-Source libraries with permissive licenses. These are included here. diff --git a/airlift-zstd/CMakeLists.txt b/airlift-zstd/CMakeLists.txt index c9be5ff262a..4beeaad743c 100644 --- a/airlift-zstd/CMakeLists.txt +++ b/airlift-zstd/CMakeLists.txt @@ -1,2 +1,2 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. install_jar(airlift-zstd.jar) diff --git a/airlift-zstd/README.md b/airlift-zstd/README.md index 6f3a9b0027c..312545106a3 100644 --- a/airlift-zstd/README.md +++ b/airlift-zstd/README.md @@ -1,4 +1,4 @@ - + # airlift-zstd Fork of https://github.com/airlift/aircompressor (zstd only). diff --git a/airlift-zstd/pom.xml b/airlift-zstd/pom.xml index 6de23df5496..ac68c28531e 100644 --- a/airlift-zstd/pom.xml +++ b/airlift-zstd/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 diff --git a/bootstrap.sh b/bootstrap.sh index d6a34fdb834..9c30c4fd764 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,5 +1,5 @@ #!/bin/bash -e -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. usage() { echo "Usage: $0 [full | java | default]" >&2 diff --git a/client/go/internal/build/build.go b/client/go/internal/build/build.go index a8342a9fb1e..a1f18f816ba 100644 --- a/client/go/internal/build/build.go +++ b/client/go/internal/build/build.go @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package build var Version string = "0.0.0-devel" // Overriden by linker flag as part of build diff --git a/cloud-tenant-cd/src/main/resources/META-INF/services/ai.vespa.hosted.cd.TestRuntime b/cloud-tenant-cd/src/main/resources/META-INF/services/ai.vespa.hosted.cd.TestRuntime index 3d325930c04..6e55fe638b3 100644 --- a/cloud-tenant-cd/src/main/resources/META-INF/services/ai.vespa.hosted.cd.TestRuntime +++ b/cloud-tenant-cd/src/main/resources/META-INF/services/ai.vespa.hosted.cd.TestRuntime @@ -1,2 +1,2 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. ai.vespa.hosted.cd.cloud.impl.VespaTestRuntime diff --git a/config-model/src/test/derived/matchsettings_map_after/test.sd b/config-model/src/test/derived/matchsettings_map_after/test.sd index f60d5f00aab..21def1290ba 100644 --- a/config-model/src/test/derived/matchsettings_map_after/test.sd +++ b/config-model/src/test/derived/matchsettings_map_after/test.sd @@ -1,7 +1,4 @@ # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - schema test { document test { diff --git a/config-model/src/test/derived/matchsettings_map_def/test.sd b/config-model/src/test/derived/matchsettings_map_def/test.sd index 1edeef235ca..55b507dd6e8 100644 --- a/config-model/src/test/derived/matchsettings_map_def/test.sd +++ b/config-model/src/test/derived/matchsettings_map_def/test.sd @@ -1,7 +1,4 @@ # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - schema test { document test { diff --git a/config-model/src/test/derived/matchsettings_map_in_struct/test.sd b/config-model/src/test/derived/matchsettings_map_in_struct/test.sd index f92a5d46bd5..a9087f32f0e 100644 --- a/config-model/src/test/derived/matchsettings_map_in_struct/test.sd +++ b/config-model/src/test/derived/matchsettings_map_in_struct/test.sd @@ -1,7 +1,4 @@ # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - schema test { document test { diff --git a/config-model/src/test/derived/matchsettings_map_wfs/test.sd b/config-model/src/test/derived/matchsettings_map_wfs/test.sd index 7742e7204b9..eaab4ff4151 100644 --- a/config-model/src/test/derived/matchsettings_map_wfs/test.sd +++ b/config-model/src/test/derived/matchsettings_map_wfs/test.sd @@ -1,7 +1,4 @@ # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - schema test { document test { diff --git a/config-model/src/test/derived/matchsettings_map_wss/test.sd b/config-model/src/test/derived/matchsettings_map_wss/test.sd index bf9ffa05eb1..65fa2e2559c 100644 --- a/config-model/src/test/derived/matchsettings_map_wss/test.sd +++ b/config-model/src/test/derived/matchsettings_map_wss/test.sd @@ -1,7 +1,4 @@ # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - schema test { document test { diff --git a/config-model/src/test/java/com/yahoo/schema/StructTestCase.java b/config-model/src/test/java/com/yahoo/schema/StructTestCase.java index d2746e97de1..c1088332726 100755 --- a/config-model/src/test/java/com/yahoo/schema/StructTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/StructTestCase.java @@ -1,6 +1,4 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.schema; import com.yahoo.document.config.DocumenttypesConfig; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/AccessControlFilterValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/AccessControlFilterValidatorTest.java index 7a5c799b73d..aa42fbbf827 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/AccessControlFilterValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/AccessControlFilterValidatorTest.java @@ -1,5 +1,5 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.model.application.validation;// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.model.application.validation; import com.yahoo.config.model.MapConfigModelRegistry; import com.yahoo.config.model.NullConfigModelRegistry; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/UriBindingsValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/UriBindingsValidatorTest.java index c91f9b19363..53f01cd6356 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/UriBindingsValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/UriBindingsValidatorTest.java @@ -1,5 +1,5 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.model.application.validation;// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.model.application.validation; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/pages/pages.cfg b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/pages/pages.cfg index a1faf9cfd42..160533cd8dc 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/pages/pages.cfg +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/pages/pages.cfg @@ -1,5 +1,5 @@ -page[0] "\n\n
\n
\n\n" -page[1] "\n\n
\n
\n
\n \n \n \n \n
\n
\n
\n
\n
\n
\n
\n\n" -page[2] "\n\n
\n
\n\n" -page[3] "\n\n \n
\n
\n
\n \n \n
\n \n \n \n \n \n \n \n \n \n 5\n #ff00ff\n \n \n \n origin=twitter\n \n \n \n \n \n \n \n
\n
\n \n
\n \n
\n
\n
\n
\n \n
\n
\n \n\n" -page[4] "\n\n
\n
\n
\n
\n\n" \ No newline at end of file +page[0] "\n\n
\n
\n\n" +page[1] "\n\n
\n
\n
\n \n \n \n \n
\n
\n
\n
\n
\n
\n
\n\n" +page[2] "\n\n
\n
\n\n" +page[3] "\n\n \n
\n
\n
\n \n \n
\n \n \n \n \n \n \n \n \n \n 5\n #ff00ff\n \n \n \n origin=twitter\n \n \n \n \n \n \n \n
\n
\n \n
\n \n
\n
\n
\n
\n \n
\n
\n \n\n" +page[4] "\n\n
\n
\n
\n
\n\n" \ No newline at end of file diff --git a/config/src/test/resources/configdefinitions/bootstrap.def b/config/src/test/resources/configdefinitions/bootstrap.def index f6e5da51cf2..d5ee7201a89 100644 --- a/config/src/test/resources/configdefinitions/bootstrap.def +++ b/config/src/test/resources/configdefinitions/bootstrap.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=config component[].name string diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ActiveTokenFingerprintsClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ActiveTokenFingerprintsClientTest.java index 84d50367809..d85c7bde64d 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ActiveTokenFingerprintsClientTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ActiveTokenFingerprintsClientTest.java @@ -1,5 +1,5 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.config.server.application;// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.config.server.application; import com.github.tomakehurst.wiremock.junit.WireMockRule; import com.yahoo.config.ConfigInstance.Builder; diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClientTest.java index 3e6dcf17a26..14f6a6c467c 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClientTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClientTest.java @@ -1,5 +1,5 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.config.server.application;// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.config.server.application; import com.github.tomakehurst.wiremock.junit.WireMockRule; import com.yahoo.config.model.api.HostInfo; diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizerTest.java index 8654872e172..b921b3c585d 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizerTest.java @@ -1,5 +1,5 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.config.server.rpc.security;// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.config.server.rpc.security; import com.yahoo.cloud.config.LbServicesConfig; import com.yahoo.cloud.config.SentinelConfig; diff --git a/container-core/src/main/sh/find-pid b/container-core/src/main/sh/find-pid index 74eade28d00..74c9f05e4c6 100755 --- a/container-core/src/main/sh/find-pid +++ b/container-core/src/main/sh/find-pid @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # BEGIN environment bootstrap section # Do not edit between here and END as this section should stay identical in all scripts diff --git a/container-core/src/main/sh/vespa-jvm-dumper b/container-core/src/main/sh/vespa-jvm-dumper index 20ba1d59f53..9b4e450611d 100755 --- a/container-core/src/main/sh/vespa-jvm-dumper +++ b/container-core/src/main/sh/vespa-jvm-dumper @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # BEGIN environment bootstrap section # Do not edit between here and END as this section should stay identical in all scripts diff --git a/container-core/src/test/java/com/yahoo/restapi/RestApiImplTest.java b/container-core/src/test/java/com/yahoo/restapi/RestApiImplTest.java index 80a39ab605c..bf0ccb95887 100644 --- a/container-core/src/test/java/com/yahoo/restapi/RestApiImplTest.java +++ b/container-core/src/test/java/com/yahoo/restapi/RestApiImplTest.java @@ -1,5 +1,5 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.restapi;// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.restapi; import com.fasterxml.jackson.annotation.JsonProperty; import com.yahoo.container.jdisc.AclMapping; diff --git a/container-core/src/test/vespa-configdef/config.test.bootstrap1.def b/container-core/src/test/vespa-configdef/config.test.bootstrap1.def index 9b0876ff413..c3b6b1ee805 100644 --- a/container-core/src/test/vespa-configdef/config.test.bootstrap1.def +++ b/container-core/src/test/vespa-configdef/config.test.bootstrap1.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=config.test dummy string default="" diff --git a/container-core/src/test/vespa-configdef/config.test.bootstrap2.def b/container-core/src/test/vespa-configdef/config.test.bootstrap2.def index e4519b00307..1a836be01b9 100644 --- a/container-core/src/test/vespa-configdef/config.test.bootstrap2.def +++ b/container-core/src/test/vespa-configdef/config.test.bootstrap2.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=config.test dummy string default="" diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ClusterInfoProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ClusterInfoProvider.java index 269d37a9973..ad50841c9b0 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/ClusterInfoProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ClusterInfoProvider.java @@ -1,6 +1,4 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.jdisc; import ai.vespa.cloud.Cluster; diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/tenant/ArchiveAccessTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/tenant/ArchiveAccessTest.java index 2a13a13b2ca..bcff84884a4 100644 --- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/tenant/ArchiveAccessTest.java +++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/tenant/ArchiveAccessTest.java @@ -1,5 +1,5 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.tenant;// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.hosted.controller.tenant; import com.yahoo.text.Text; import org.junit.jupiter.api.Test; diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java index cb5b3dcadd7..8f114a7255c 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java @@ -1,5 +1,5 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.controller.persistence;// Copyright Yahoo. 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.google.common.collect.ImmutableBiMap; import com.yahoo.component.Version; diff --git a/defaults/src/vespa/config.h.in b/defaults/src/vespa/config.h.in index cf1316431c7..c6d568d1908 100644 --- a/defaults/src/vespa/config.h.in +++ b/defaults/src/vespa/config.h.in @@ -1,6 +1,4 @@ -# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once /* diff --git a/integration/intellij/build.gradle.kts b/integration/intellij/build.gradle.kts index 9f2dedfd439..0fd879d18d4 100644 --- a/integration/intellij/build.gradle.kts +++ b/integration/intellij/build.gradle.kts @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. import org.jetbrains.grammarkit.tasks.GenerateLexerTask import org.jetbrains.grammarkit.tasks.GenerateParserTask diff --git a/integration/intellij/settings.gradle b/integration/intellij/settings.gradle index 94afd49df08..1590c425a3c 100644 --- a/integration/intellij/settings.gradle +++ b/integration/intellij/settings.gradle @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // This sets the name of the generated zip file uploadable to Intellij Marketplace // (But not the actual *name* of the plugin, which is the name in plugin.xml) diff --git a/integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf b/integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf index 2e2df7ef410..618aa6851bc 100644 --- a/integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf +++ b/integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. /** * Vespa schema file grammar. * NOTE: This grammar does not enforce zero-or-one occurrences of elements (treats it like zero-to-many) diff --git a/integration/intellij/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex b/integration/intellij/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex index 071033509d9..47050479633 100644 --- a/integration/intellij/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex +++ b/integration/intellij/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.intellij.schema.lexer; import com.intellij.lexer.FlexLexer; diff --git a/integration/intellij/src/test/applications/rankprofilemodularity/test/outside_schema1.profile b/integration/intellij/src/test/applications/rankprofilemodularity/test/outside_schema1.profile index 2e5f56fd18b..9d12e9059a5 100644 --- a/integration/intellij/src/test/applications/rankprofilemodularity/test/outside_schema1.profile +++ b/integration/intellij/src/test/applications/rankprofilemodularity/test/outside_schema1.profile @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. rank-profile outside_schema1 inherits in_schema1 { function fo1() { diff --git a/integration/intellij/src/test/applications/rankprofilemodularity/test/outside_schema2.profile b/integration/intellij/src/test/applications/rankprofilemodularity/test/outside_schema2.profile index 7dd41859d03..9747816240d 100644 --- a/integration/intellij/src/test/applications/rankprofilemodularity/test/outside_schema2.profile +++ b/integration/intellij/src/test/applications/rankprofilemodularity/test/outside_schema2.profile @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. rank-profile outside_schema2 { function fo2() { diff --git a/jrt/tests/com/yahoo/jrt/SimpleRequestAccessFilter.java b/jrt/tests/com/yahoo/jrt/SimpleRequestAccessFilter.java index 590397916b9..81ef519de5a 100644 --- a/jrt/tests/com/yahoo/jrt/SimpleRequestAccessFilter.java +++ b/jrt/tests/com/yahoo/jrt/SimpleRequestAccessFilter.java @@ -1,5 +1,5 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.jrt;// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.jrt; /** * @author bjorncs diff --git a/logserver/src/protobuf/log_protocol.proto b/logserver/src/protobuf/log_protocol.proto index 2518d186539..22b25ba9beb 100644 --- a/logserver/src/protobuf/log_protocol.proto +++ b/logserver/src/protobuf/log_protocol.proto @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. syntax = "proto3"; diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt index 3ad61c7bc0e..3972ddcd085 100644 --- a/maven-plugins/allowed-maven-dependencies.txt +++ b/maven-plugins/allowed-maven-dependencies.txt @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. aopalliance:aopalliance:${aopalliance.vespa.version} com.fasterxml.jackson.core:jackson-annotations:${jackson2.vespa.version} diff --git a/messagebus/src/vespa/messagebus/create-class-cpp.sh b/messagebus/src/vespa/messagebus/create-class-cpp.sh index 3bba602a6ba..e1e779c2747 100755 --- a/messagebus/src/vespa/messagebus/create-class-cpp.sh +++ b/messagebus/src/vespa/messagebus/create-class-cpp.sh @@ -6,7 +6,7 @@ guard=`echo $class | tr 'a-z' 'A-Z'` name=`echo $class | tr 'A-Z' 'a-z'` cat < diff --git a/searchcore/src/vespa/searchcore/proton/matching/rangequerylocator.h b/searchcore/src/vespa/searchcore/proton/matching/rangequerylocator.h index 13efaf4aa83..e0a8a3c0976 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/rangequerylocator.h +++ b/searchcore/src/vespa/searchcore/proton/matching/rangequerylocator.h @@ -1,5 +1,4 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.cpp b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.cpp index fb533547d00..f028c6346fd 100644 --- a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.cpp @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "bootstrapconfig.h" #include diff --git a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.h b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.h index 583009fcf04..477e4324112 100644 --- a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.h +++ b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.h @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp index 390d7eb018e..24b9b716c68 100644 --- a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "bootstrapconfigmanager.h" #include "bootstrapconfig.h" diff --git a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.h b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.h index 88f4484116d..f67c2645266 100644 --- a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.h +++ b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.h @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/MapTypeContext.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/MapTypeContext.java index 7631c48650a..6c980181b47 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/MapTypeContext.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/MapTypeContext.java @@ -1,5 +1,5 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.searchlib.rankingexpression.evaluation;// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.searchlib.rankingexpression.evaluation; import com.yahoo.searchlib.rankingexpression.Reference; import com.yahoo.tensor.TensorType; diff --git a/searchlib/src/protobuf/search_protocol.proto b/searchlib/src/protobuf/search_protocol.proto index 916788796b8..09088757531 100644 --- a/searchlib/src/protobuf/search_protocol.proto +++ b/searchlib/src/protobuf/search_protocol.proto @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. syntax = "proto3"; diff --git a/searchlib/src/vespa/searchlib/engine/create-class-cpp.sh b/searchlib/src/vespa/searchlib/engine/create-class-cpp.sh index 030a5eb8eb6..30467f5a3a1 100755 --- a/searchlib/src/vespa/searchlib/engine/create-class-cpp.sh +++ b/searchlib/src/vespa/searchlib/engine/create-class-cpp.sh @@ -6,7 +6,7 @@ guard=`echo $class | tr 'a-z' 'A-Z'` name=`echo $class | tr 'A-Z' 'a-z'` cat < $out year=$(date +%Y) cat < content.add(r.asString())); resolved.unmatchedDeps().forEach(d -> content.add(d.asString(guessVersion ? project.getProperties() : null))); try (var out = Files.newBufferedWriter(specFile)) { - out.write("# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.\n\n"); + out.write("# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.\n\n"); for (var line : content) { out.write(line); out.write('\n'); } diff --git a/vespa-feed-client/src/main/resources/META-INF.services/ai.vespa.feed.client.FeedClientBuilder b/vespa-feed-client/src/main/resources/META-INF.services/ai.vespa.feed.client.FeedClientBuilder index b6e28b1806c..da90850e558 100644 --- a/vespa-feed-client/src/main/resources/META-INF.services/ai.vespa.feed.client.FeedClientBuilder +++ b/vespa-feed-client/src/main/resources/META-INF.services/ai.vespa.feed.client.FeedClientBuilder @@ -1,2 +1,2 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. ai.vespa.feed.client.impl.FeedClientBuilderImpl \ No newline at end of file diff --git a/vespa-maven-plugin/src/test/resources/effective-services/test_us-east-1.xml b/vespa-maven-plugin/src/test/resources/effective-services/test_us-east-1.xml index 479d4a7166a..9880c470436 100644 --- a/vespa-maven-plugin/src/test/resources/effective-services/test_us-east-1.xml +++ b/vespa-maven-plugin/src/test/resources/effective-services/test_us-east-1.xml @@ -1,4 +1,4 @@ - + diff --git a/vespalib/src/apps/make_fixture_macros/make_fixture_macros.cpp b/vespalib/src/apps/make_fixture_macros/make_fixture_macros.cpp index cc468c374ab..af3f39557e5 100644 --- a/vespalib/src/apps/make_fixture_macros/make_fixture_macros.cpp +++ b/vespalib/src/apps/make_fixture_macros/make_fixture_macros.cpp @@ -145,7 +145,7 @@ int main(int argc, char **argv) { return 1; } int n = std::max(3, atoi(argv[1])); - fprintf(stdout, "// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.\n"); + fprintf(stdout, "// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.\n"); fprintf(stdout, "// macros for up to %d test fixtures, generated by " "vespalib/testkit/make_fixture_macros\n\n", n); for (int i = 0; i <= n; ++i) { diff --git a/vespalib/src/tests/tutorial/tutorial.html b/vespalib/src/tests/tutorial/tutorial.html index 32910d3b0b3..b40f02ca81d 100644 --- a/vespalib/src/tests/tutorial/tutorial.html +++ b/vespalib/src/tests/tutorial/tutorial.html @@ -4,7 +4,7 @@ Vespa Test Framework Tutorial -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.