From 3ba88cae3a42b8a8dc651efa7d0cd76f36a8c92a Mon Sep 17 00:00:00 2001 From: Jon Bodner Date: Thu, 30 Apr 2026 10:37:33 -0400 Subject: [PATCH 1/2] update copyright year. fix Makefile to only exclude YAML files in conformance and bzlmod directories --- BUILD.bazel | 2 +- LICENSE | 2 +- MODULE.bazel | 2 +- MODULE.bazel.tmpl | 2 +- Makefile | 8 ++++---- REPO.bazel | 2 +- bazel/BUILD.bazel | 2 +- bazel/deps.bzl | 2 +- bazel/json.bzl | 2 +- buf/BUILD.bazel | 2 +- buf/validate/BUILD.bazel | 2 +- buf/validate/conformance/BUILD.bazel | 2 +- buf/validate/conformance/runner.cc | 2 +- buf/validate/conformance/runner.h | 2 +- buf/validate/conformance/runner_main.cc | 2 +- buf/validate/conformance/runner_test.cc | 2 +- buf/validate/internal/BUILD.bazel | 2 +- buf/validate/internal/cel_rules.h | 2 +- buf/validate/internal/cel_validation_rules.cc | 2 +- buf/validate/internal/cel_validation_rules.h | 2 +- buf/validate/internal/extra_func.cc | 2 +- buf/validate/internal/extra_func.h | 2 +- buf/validate/internal/extra_func_test.cc | 2 +- buf/validate/internal/field_rules.cc | 2 +- buf/validate/internal/field_rules.h | 2 +- buf/validate/internal/lib/BUILD.bazel | 2 +- buf/validate/internal/lib/ipv4.cc | 2 +- buf/validate/internal/lib/ipv4.h | 2 +- buf/validate/internal/lib/ipv4_test.cc | 2 +- buf/validate/internal/lib/ipv6.cc | 2 +- buf/validate/internal/lib/ipv6.h | 2 +- buf/validate/internal/lib/ipv6_test.cc | 2 +- buf/validate/internal/lib/parser_common.h | 2 +- buf/validate/internal/lib/uri.cc | 2 +- buf/validate/internal/lib/uri.h | 2 +- buf/validate/internal/lib/uri_test.cc | 2 +- buf/validate/internal/message_factory.cc | 2 +- buf/validate/internal/message_factory.h | 2 +- buf/validate/internal/message_rules.cc | 2 +- buf/validate/internal/message_rules.h | 2 +- buf/validate/internal/proto_field.h | 2 +- buf/validate/internal/rules.cc | 2 +- buf/validate/internal/rules.h | 2 +- buf/validate/internal/rules_test.cc | 2 +- buf/validate/internal/validation_rules.h | 2 +- buf/validate/validator.cc | 2 +- buf/validate/validator.h | 2 +- buf/validate/validator_test.cc | 2 +- cmake/example/example.proto | 2 +- cmake/example/main.cc | 2 +- deps/BUILD.bazel | 2 +- e2e/bzlmod/BUILD.bazel | 2 +- e2e/bzlmod/MODULE.bazel | 2 +- e2e/bzlmod/example.proto | 2 +- e2e/bzlmod/main.cc | 2 +- 55 files changed, 58 insertions(+), 58 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 1c23345..2c33a80 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,4 +1,4 @@ -# Copyright 2023-2025 Buf Technologies, Inc. +# Copyright 2023-2026 Buf Technologies, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/LICENSE b/LICENSE index 3e1d480..347d9fc 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2023-2025 Buf Technologies, Inc. + Copyright 2023-2026 Buf Technologies, Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/MODULE.bazel b/MODULE.bazel index c877473..333039c 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,4 +1,4 @@ -# Copyright 2023-2025 Buf Technologies, Inc. +# Copyright 2023-2026 Buf Technologies, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/MODULE.bazel.tmpl b/MODULE.bazel.tmpl index 59ed86c..8d8b0ec 100644 --- a/MODULE.bazel.tmpl +++ b/MODULE.bazel.tmpl @@ -1,4 +1,4 @@ -# Copyright 2023-2025 Buf Technologies, Inc. +# Copyright 2023-2026 Buf Technologies, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/Makefile b/Makefile index 9dfd4df..4bbce4e 100644 --- a/Makefile +++ b/Makefile @@ -7,9 +7,9 @@ MAKEFLAGS += --warn-undefined-variables MAKEFLAGS += --no-builtin-rules MAKEFLAGS += --no-print-directory BIN := .tmp/bin -COPYRIGHT_YEARS := 2023-2025 -LICENSE_IGNORE := -e internal/testdata/ -e .github/ -e .bcr/ -e buf/validate/conformance -e e2e/bzlmod -LICENSE_HEADER_VERSION := 04ed9c9179fc71d0dab7bf2919fcdc7b0bd9fe60 +COPYRIGHT_YEARS := 2023-2026 +LICENSE_IGNORE := -e internal/testdata/ -e .github/ -e .bcr/ -e buf/validate/conformance/*.yaml -e e2e/bzlmod/*.yaml +LICENSE_HEADER_VERSION := 1.69.0 PROTOVALIDATE_VERSION ?= v$(shell <./deps/shared_deps.json jq -j .protovalidate.meta.version) # Set to use a different compiler. For example, `GO=go1.18rc1 make test`. @@ -83,6 +83,6 @@ $(BIN)/buf: $(BIN) Makefile $(BIN)/license-header: $(BIN) Makefile GOBIN=$(abspath $(@D)) $(GO) install \ - github.com/bufbuild/buf/private/pkg/licenseheader/cmd/license-header@$(LICENSE_HEADER_VERSION) + github.com/bufbuild/buf/private/pkg/licenseheader/cmd/license-header@v$(LICENSE_HEADER_VERSION) $(BIN)/protovalidate-conformance: $(BIN) Makefile diff --git a/REPO.bazel b/REPO.bazel index 843a403..fbe8726 100644 --- a/REPO.bazel +++ b/REPO.bazel @@ -1,4 +1,4 @@ -# Copyright 2023-2025 Buf Technologies, Inc. +# Copyright 2023-2026 Buf Technologies, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/bazel/BUILD.bazel b/bazel/BUILD.bazel index d7ded61..40a4bf1 100644 --- a/bazel/BUILD.bazel +++ b/bazel/BUILD.bazel @@ -1,4 +1,4 @@ -# Copyright 2023-2025 Buf Technologies, Inc. +# Copyright 2023-2026 Buf Technologies, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/bazel/deps.bzl b/bazel/deps.bzl index d6c38df..5254287 100644 --- a/bazel/deps.bzl +++ b/bazel/deps.bzl @@ -1,4 +1,4 @@ -# Copyright 2023-2025 Buf Technologies, Inc. +# Copyright 2023-2026 Buf Technologies, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/bazel/json.bzl b/bazel/json.bzl index e79263b..16438ab 100644 --- a/bazel/json.bzl +++ b/bazel/json.bzl @@ -1,4 +1,4 @@ -# Copyright 2023-2025 Buf Technologies, Inc. +# Copyright 2023-2026 Buf Technologies, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/buf/BUILD.bazel b/buf/BUILD.bazel index 1c23345..2c33a80 100644 --- a/buf/BUILD.bazel +++ b/buf/BUILD.bazel @@ -1,4 +1,4 @@ -# Copyright 2023-2025 Buf Technologies, Inc. +# Copyright 2023-2026 Buf Technologies, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/buf/validate/BUILD.bazel b/buf/validate/BUILD.bazel index 704c65d..63fb1ec 100644 --- a/buf/validate/BUILD.bazel +++ b/buf/validate/BUILD.bazel @@ -1,4 +1,4 @@ -# Copyright 2023-2025 Buf Technologies, Inc. +# Copyright 2023-2026 Buf Technologies, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/buf/validate/conformance/BUILD.bazel b/buf/validate/conformance/BUILD.bazel index cdd9639..2c84cd2 100644 --- a/buf/validate/conformance/BUILD.bazel +++ b/buf/validate/conformance/BUILD.bazel @@ -1,4 +1,4 @@ -# Copyright 2023-2025 Buf Technologies, Inc. +# Copyright 2023-2026 Buf Technologies, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/buf/validate/conformance/runner.cc b/buf/validate/conformance/runner.cc index c2a0aa7..fd6e244 100644 --- a/buf/validate/conformance/runner.cc +++ b/buf/validate/conformance/runner.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/conformance/runner.h b/buf/validate/conformance/runner.h index 8408778..2bfc285 100644 --- a/buf/validate/conformance/runner.h +++ b/buf/validate/conformance/runner.h @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/conformance/runner_main.cc b/buf/validate/conformance/runner_main.cc index 3bf70aa..75aa2ca 100644 --- a/buf/validate/conformance/runner_main.cc +++ b/buf/validate/conformance/runner_main.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/conformance/runner_test.cc b/buf/validate/conformance/runner_test.cc index ee61f1a..6ec2ff5 100644 --- a/buf/validate/conformance/runner_test.cc +++ b/buf/validate/conformance/runner_test.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/BUILD.bazel b/buf/validate/internal/BUILD.bazel index 9319878..118e1c5 100644 --- a/buf/validate/internal/BUILD.bazel +++ b/buf/validate/internal/BUILD.bazel @@ -1,4 +1,4 @@ -# Copyright 2023-2025 Buf Technologies, Inc. +# Copyright 2023-2026 Buf Technologies, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/cel_rules.h b/buf/validate/internal/cel_rules.h index e206185..ef288ac 100644 --- a/buf/validate/internal/cel_rules.h +++ b/buf/validate/internal/cel_rules.h @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/cel_validation_rules.cc b/buf/validate/internal/cel_validation_rules.cc index 7924572..5bfb282 100644 --- a/buf/validate/internal/cel_validation_rules.cc +++ b/buf/validate/internal/cel_validation_rules.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/cel_validation_rules.h b/buf/validate/internal/cel_validation_rules.h index be9cf96..2e568f7 100644 --- a/buf/validate/internal/cel_validation_rules.h +++ b/buf/validate/internal/cel_validation_rules.h @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/extra_func.cc b/buf/validate/internal/extra_func.cc index c8048e9..46fc6fc 100644 --- a/buf/validate/internal/extra_func.cc +++ b/buf/validate/internal/extra_func.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/extra_func.h b/buf/validate/internal/extra_func.h index e8f67ca..7b20871 100644 --- a/buf/validate/internal/extra_func.h +++ b/buf/validate/internal/extra_func.h @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/extra_func_test.cc b/buf/validate/internal/extra_func_test.cc index 7927a16..310e330 100644 --- a/buf/validate/internal/extra_func_test.cc +++ b/buf/validate/internal/extra_func_test.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/field_rules.cc b/buf/validate/internal/field_rules.cc index 7007728..32b43cd 100644 --- a/buf/validate/internal/field_rules.cc +++ b/buf/validate/internal/field_rules.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/field_rules.h b/buf/validate/internal/field_rules.h index 4c729de..0dfc5a4 100644 --- a/buf/validate/internal/field_rules.h +++ b/buf/validate/internal/field_rules.h @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/lib/BUILD.bazel b/buf/validate/internal/lib/BUILD.bazel index a19951c..21d324f 100644 --- a/buf/validate/internal/lib/BUILD.bazel +++ b/buf/validate/internal/lib/BUILD.bazel @@ -1,4 +1,4 @@ -# Copyright 2023-2025 Buf Technologies, Inc. +# Copyright 2023-2026 Buf Technologies, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/lib/ipv4.cc b/buf/validate/internal/lib/ipv4.cc index a332d17..c7b7f21 100644 --- a/buf/validate/internal/lib/ipv4.cc +++ b/buf/validate/internal/lib/ipv4.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/lib/ipv4.h b/buf/validate/internal/lib/ipv4.h index b5556a6..fdcfc1a 100644 --- a/buf/validate/internal/lib/ipv4.h +++ b/buf/validate/internal/lib/ipv4.h @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/lib/ipv4_test.cc b/buf/validate/internal/lib/ipv4_test.cc index aef8095..1db91a5 100644 --- a/buf/validate/internal/lib/ipv4_test.cc +++ b/buf/validate/internal/lib/ipv4_test.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/lib/ipv6.cc b/buf/validate/internal/lib/ipv6.cc index 1c3d074..74f1512 100644 --- a/buf/validate/internal/lib/ipv6.cc +++ b/buf/validate/internal/lib/ipv6.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/lib/ipv6.h b/buf/validate/internal/lib/ipv6.h index ca3cbec..327839a 100644 --- a/buf/validate/internal/lib/ipv6.h +++ b/buf/validate/internal/lib/ipv6.h @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/lib/ipv6_test.cc b/buf/validate/internal/lib/ipv6_test.cc index 48e2a8a..49884a9 100644 --- a/buf/validate/internal/lib/ipv6_test.cc +++ b/buf/validate/internal/lib/ipv6_test.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/lib/parser_common.h b/buf/validate/internal/lib/parser_common.h index 58976e5..d66c3ea 100644 --- a/buf/validate/internal/lib/parser_common.h +++ b/buf/validate/internal/lib/parser_common.h @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/lib/uri.cc b/buf/validate/internal/lib/uri.cc index ddef96e..9f37f25 100644 --- a/buf/validate/internal/lib/uri.cc +++ b/buf/validate/internal/lib/uri.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/lib/uri.h b/buf/validate/internal/lib/uri.h index 0d52e3b..7aaa026 100644 --- a/buf/validate/internal/lib/uri.h +++ b/buf/validate/internal/lib/uri.h @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/lib/uri_test.cc b/buf/validate/internal/lib/uri_test.cc index dc579dc..cf76d5c 100644 --- a/buf/validate/internal/lib/uri_test.cc +++ b/buf/validate/internal/lib/uri_test.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/message_factory.cc b/buf/validate/internal/message_factory.cc index 0d1762b..93c401d 100644 --- a/buf/validate/internal/message_factory.cc +++ b/buf/validate/internal/message_factory.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/message_factory.h b/buf/validate/internal/message_factory.h index 6f39aa6..11f79ee 100644 --- a/buf/validate/internal/message_factory.h +++ b/buf/validate/internal/message_factory.h @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/message_rules.cc b/buf/validate/internal/message_rules.cc index d77663b..92c4781 100644 --- a/buf/validate/internal/message_rules.cc +++ b/buf/validate/internal/message_rules.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/message_rules.h b/buf/validate/internal/message_rules.h index 68d15f6..d82e974 100644 --- a/buf/validate/internal/message_rules.h +++ b/buf/validate/internal/message_rules.h @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/proto_field.h b/buf/validate/internal/proto_field.h index c7ecc81..efa0a49 100644 --- a/buf/validate/internal/proto_field.h +++ b/buf/validate/internal/proto_field.h @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/rules.cc b/buf/validate/internal/rules.cc index 2d55946..793465e 100644 --- a/buf/validate/internal/rules.cc +++ b/buf/validate/internal/rules.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/rules.h b/buf/validate/internal/rules.h index 88b3a8e..12bab22 100644 --- a/buf/validate/internal/rules.h +++ b/buf/validate/internal/rules.h @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/rules_test.cc b/buf/validate/internal/rules_test.cc index ba79d62..980faec 100644 --- a/buf/validate/internal/rules_test.cc +++ b/buf/validate/internal/rules_test.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/internal/validation_rules.h b/buf/validate/internal/validation_rules.h index e6befaf..f3eec60 100644 --- a/buf/validate/internal/validation_rules.h +++ b/buf/validate/internal/validation_rules.h @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/validator.cc b/buf/validate/validator.cc index 9f3418c..1b95638 100644 --- a/buf/validate/validator.cc +++ b/buf/validate/validator.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/validator.h b/buf/validate/validator.h index 8cc3cc0..bd619b5 100644 --- a/buf/validate/validator.h +++ b/buf/validate/validator.h @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/buf/validate/validator_test.cc b/buf/validate/validator_test.cc index 668347d..b21920c 100644 --- a/buf/validate/validator_test.cc +++ b/buf/validate/validator_test.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/cmake/example/example.proto b/cmake/example/example.proto index 93df810..19b352f 100644 --- a/cmake/example/example.proto +++ b/cmake/example/example.proto @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/cmake/example/main.cc b/cmake/example/main.cc index 39cabf0..3c8427b 100644 --- a/cmake/example/main.cc +++ b/cmake/example/main.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/deps/BUILD.bazel b/deps/BUILD.bazel index d7ded61..40a4bf1 100644 --- a/deps/BUILD.bazel +++ b/deps/BUILD.bazel @@ -1,4 +1,4 @@ -# Copyright 2023-2025 Buf Technologies, Inc. +# Copyright 2023-2026 Buf Technologies, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/e2e/bzlmod/BUILD.bazel b/e2e/bzlmod/BUILD.bazel index cffbb42..ebed18a 100644 --- a/e2e/bzlmod/BUILD.bazel +++ b/e2e/bzlmod/BUILD.bazel @@ -1,4 +1,4 @@ -# Copyright 2023-2025 Buf Technologies, Inc. +# Copyright 2023-2026 Buf Technologies, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/e2e/bzlmod/MODULE.bazel b/e2e/bzlmod/MODULE.bazel index d4fca93..1df7428 100644 --- a/e2e/bzlmod/MODULE.bazel +++ b/e2e/bzlmod/MODULE.bazel @@ -1,4 +1,4 @@ -# Copyright 2023-2025 Buf Technologies, Inc. +# Copyright 2023-2026 Buf Technologies, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/e2e/bzlmod/example.proto b/e2e/bzlmod/example.proto index 3a73cf1..5d6c46b 100644 --- a/e2e/bzlmod/example.proto +++ b/e2e/bzlmod/example.proto @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/e2e/bzlmod/main.cc b/e2e/bzlmod/main.cc index 03202f3..5ae781d 100644 --- a/e2e/bzlmod/main.cc +++ b/e2e/bzlmod/main.cc @@ -1,4 +1,4 @@ -// Copyright 2023-2025 Buf Technologies, Inc. +// Copyright 2023-2026 Buf Technologies, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. From 61e6409e833acfb1d4ab8d99b94f9e4a9f2ccbfa Mon Sep 17 00:00:00 2001 From: Jon Bodner Date: Thu, 30 Apr 2026 11:43:00 -0400 Subject: [PATCH 2/2] simplify the license-header target. rename LICENSE_HEADER_VERSION to BUF_VERSION and use it for both buf and license_header --- Makefile | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 4bbce4e..9303e3c 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ MAKEFLAGS += --no-print-directory BIN := .tmp/bin COPYRIGHT_YEARS := 2023-2026 LICENSE_IGNORE := -e internal/testdata/ -e .github/ -e .bcr/ -e buf/validate/conformance/*.yaml -e e2e/bzlmod/*.yaml -LICENSE_HEADER_VERSION := 1.69.0 +BUF_VERSION := 1.69.0 PROTOVALIDATE_VERSION ?= v$(shell <./deps/shared_deps.json jq -j .protovalidate.meta.version) # Set to use a different compiler. For example, `GO=go1.18rc1 make test`. @@ -57,19 +57,11 @@ generate-bzlmod: ## Generate MODULE.bazel file from template .PHONY: generate-license generate-license: $(BIN)/license-header ## Generate license headers for files - @# We want to operate on a list of modified and new files, excluding - @# deleted and ignored files. git-ls-files can't do this alone. comm -23 takes - @# two files and prints the union, dropping lines common to both (-3) and - @# those only in the second file (-2). We make one git-ls-files call for - @# the modified, cached, and new (--others) files, and a second for the - @# deleted files. - comm -23 \ - <(git ls-files --cached --modified --others --no-empty-directory --exclude-standard | sort -u | grep -v $(LICENSE_IGNORE) ) \ - <(git ls-files --deleted | sort -u) | \ - xargs $(BIN)/license-header \ - --license-type apache \ - --copyright-holder "Buf Technologies, Inc." \ - --year-range "$(COPYRIGHT_YEARS)" + $(BIN)/license-header \ + --license-type apache \ + --copyright-holder "Buf Technologies, Inc." \ + --year-range "$(COPYRIGHT_YEARS)" \ + $(LICENSE_IGNORE) .PHONY: checkgenerate checkgenerate: generate @@ -79,10 +71,10 @@ $(BIN): @mkdir -p $(BIN) $(BIN)/buf: $(BIN) Makefile - GOBIN=$(abspath $(@D)) $(GO) install github.com/bufbuild/buf/cmd/buf@latest + GOBIN=$(abspath $(@D)) $(GO) install github.com/bufbuild/buf/cmd/buf@v$(BUF_VERSION) $(BIN)/license-header: $(BIN) Makefile GOBIN=$(abspath $(@D)) $(GO) install \ - github.com/bufbuild/buf/private/pkg/licenseheader/cmd/license-header@v$(LICENSE_HEADER_VERSION) + github.com/bufbuild/buf/private/pkg/licenseheader/cmd/license-header@v$(BUF_VERSION) $(BIN)/protovalidate-conformance: $(BIN) Makefile