diff options
| author | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
|---|---|---|
| committer | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
| commit | 567be9a1f6353cec41c23bfd1fcd46b4b2a4d2d7 (patch) | |
| tree | 4664a743e166a5e11aee7b9acd70ad8ee2617612 /annotations/src/main/java/com/yahoo | |
| parent | e9058b555d4dfea2f6c872d9a677e8678b569569 (diff) | |
| parent | bce3b8e926bf9da880172acbe1ba4b12d5e026d6 (diff) | |
Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller
Diffstat (limited to 'annotations/src/main/java/com/yahoo')
8 files changed, 9 insertions, 9 deletions
diff --git a/annotations/src/main/java/com/yahoo/api/annotations/Beta.java b/annotations/src/main/java/com/yahoo/api/annotations/Beta.java index 4d15bb377d3..d162ee11e8c 100644 --- a/annotations/src/main/java/com/yahoo/api/annotations/Beta.java +++ b/annotations/src/main/java/com/yahoo/api/annotations/Beta.java @@ -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 com.yahoo.api.annotations; import java.lang.annotation.ElementType; diff --git a/annotations/src/main/java/com/yahoo/api/annotations/PublicApi.java b/annotations/src/main/java/com/yahoo/api/annotations/PublicApi.java index 8ae6f856501..5c65a4436fb 100644 --- a/annotations/src/main/java/com/yahoo/api/annotations/PublicApi.java +++ b/annotations/src/main/java/com/yahoo/api/annotations/PublicApi.java @@ -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 com.yahoo.api.annotations; import java.lang.annotation.Documented; diff --git a/annotations/src/main/java/com/yahoo/api/annotations/package-info.java b/annotations/src/main/java/com/yahoo/api/annotations/package-info.java index 2d94bca17af..991ff278042 100644 --- a/annotations/src/main/java/com/yahoo/api/annotations/package-info.java +++ b/annotations/src/main/java/com/yahoo/api/annotations/package-info.java @@ -1,3 +1,3 @@ -// 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. @PublicApi package com.yahoo.api.annotations; diff --git a/annotations/src/main/java/com/yahoo/component/annotation/Inject.java b/annotations/src/main/java/com/yahoo/component/annotation/Inject.java index dd11635ba3f..3696b160b7f 100644 --- a/annotations/src/main/java/com/yahoo/component/annotation/Inject.java +++ b/annotations/src/main/java/com/yahoo/component/annotation/Inject.java @@ -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 com.yahoo.component.annotation; import java.lang.annotation.Documented; diff --git a/annotations/src/main/java/com/yahoo/component/annotation/package-info.java b/annotations/src/main/java/com/yahoo/component/annotation/package-info.java index 6ad7e9e2642..b57dc9280c4 100644 --- a/annotations/src/main/java/com/yahoo/component/annotation/package-info.java +++ b/annotations/src/main/java/com/yahoo/component/annotation/package-info.java @@ -1,7 +1,7 @@ -// 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. /** * @author bjorncs */ @com.yahoo.api.annotations.PublicApi @com.yahoo.osgi.annotation.ExportPackage -package com.yahoo.component.annotation;
\ No newline at end of file +package com.yahoo.component.annotation; diff --git a/annotations/src/main/java/com/yahoo/osgi/annotation/ExportPackage.java b/annotations/src/main/java/com/yahoo/osgi/annotation/ExportPackage.java index 2f6aa902b42..e3bc8231e9f 100644 --- a/annotations/src/main/java/com/yahoo/osgi/annotation/ExportPackage.java +++ b/annotations/src/main/java/com/yahoo/osgi/annotation/ExportPackage.java @@ -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 com.yahoo.osgi.annotation; import java.lang.annotation.Documented; diff --git a/annotations/src/main/java/com/yahoo/osgi/annotation/Version.java b/annotations/src/main/java/com/yahoo/osgi/annotation/Version.java index 89e2cb51e4d..b1f465f8136 100644 --- a/annotations/src/main/java/com/yahoo/osgi/annotation/Version.java +++ b/annotations/src/main/java/com/yahoo/osgi/annotation/Version.java @@ -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 com.yahoo.osgi.annotation; /** diff --git a/annotations/src/main/java/com/yahoo/osgi/annotation/package-info.java b/annotations/src/main/java/com/yahoo/osgi/annotation/package-info.java index cc2c38b999c..14fe13b1232 100644 --- a/annotations/src/main/java/com/yahoo/osgi/annotation/package-info.java +++ b/annotations/src/main/java/com/yahoo/osgi/annotation/package-info.java @@ -1,3 +1,3 @@ -// 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. @com.yahoo.api.annotations.PublicApi package com.yahoo.osgi.annotation; |