From 61b5f7eda4add2efd1eb7c33d30cadd1eaab5a57 Mon Sep 17 00:00:00 2001 From: Adrian Cole <64215+codefromthecrypt@users.noreply.github.com> Date: Sun, 14 Apr 2024 09:03:58 -1000 Subject: [PATCH] license: removes copyright year and uses SPDX ID (#220) As a small project, we have to conserve resources and not sign up for work that isn't required. I've recently realized many commercial and/or CNCF projects both use SPDX IDs and also don't bother with copyright year. If their legal team is ok with this, surely a volunteer team without access to one, should be, too! Doing so accomplishes the following: * significantly increases readability of files, particularly small ones * removes beginning of year maintenance, which cause a lot of FUD last year. IIRC some deployment failed and hours were spent in spite of docs. * eliminates the need to do a full source check out, just to satisfy the license plugin. This means we can use actions/checkout defaults. Same as https://github.com/openzipkin/zipkin-reporter-java/pull/257 Signed-off-by: Adrian Cole --- .github/CONTRIBUTING.md | 15 +++------------ .github/workflows/create_release.yml | 1 - .github/workflows/deploy.yml | 2 -- .github/workflows/docker_push.yml | 2 -- .github/workflows/test.yml | 2 -- .settings.xml | 13 ++----------- RELEASE.md | 17 ----------------- benchmarks/pom.xml | 13 ++----------- .../stackdriver/TracesParserBenchmarks.java | 13 ++----------- .../brave/StackdriverV2EncoderBenchmarks.java | 13 ++----------- .../zipkin/StackdriverEncoderBenchmarks.java | 13 ++----------- build-bin/README.md | 4 ---- build-bin/docker/configure_docker | 13 ++----------- build-bin/docker/configure_docker_push | 13 ++----------- build-bin/docker/docker_arch | 13 ++----------- build-bin/docker/docker_args | 13 ++----------- build-bin/docker/docker_block_on_health | 13 ++----------- build-bin/docker/docker_build | 13 ++----------- build-bin/docker/docker_push | 13 ++----------- build-bin/docker/docker_test_image | 13 ++----------- build-bin/git/login_git | 13 ++----------- build-bin/git/version_from_trigger_tag | 13 ++----------- build-bin/gpg/configure_gpg | 13 ++----------- build-bin/maven/maven_build | 13 ++----------- build-bin/maven/maven_build_or_unjar | 13 ++----------- build-bin/maven/maven_deploy | 13 ++----------- build-bin/maven/maven_go_offline | 13 ++----------- build-bin/maven/maven_opts | 13 ++----------- build-bin/maven/maven_release | 13 ++----------- build-bin/maven/maven_unjar | 13 ++----------- collector-pubsub/pom.xml | 13 ++----------- .../collector/pubsub/PubSubCollector.java | 13 ++----------- .../zipkin2/collector/pubsub/SpanCallback.java | 13 ++----------- .../collector/pubsub/SpanMessageReceiver.java | 13 ++----------- .../collector/pubsub/SubscriberSettings.java | 13 ++----------- .../collector/pubsub/PubSubCollectorTest.java | 13 ++----------- .../pubsub/QueueBasedSubscriberImpl.java | 13 ++----------- .../pubsub/StreamingPullStreamObserver.java | 13 ++----------- docker/Dockerfile | 13 ++----------- encoder-stackdriver-brave/pom.xml | 13 ++----------- .../stackdriver/brave/AttributesExtractor.java | 13 ++----------- .../stackdriver/brave/SpanTranslator.java | 13 ++----------- .../reporter/stackdriver/brave/SpanUtil.java | 13 ++----------- .../stackdriver/brave/StackdriverV2Encoder.java | 13 ++----------- .../brave/AttributesExtractorTest.java | 13 ++----------- .../stackdriver/brave/SpanTranslatorTest.java | 13 ++----------- .../brave/StackdriverV2EncoderTest.java | 13 ++----------- .../reporter/stackdriver/brave/TestObjects.java | 13 ++----------- encoder-stackdriver-zipkin/pom.xml | 13 ++----------- .../stackdriver/zipkin/StackdriverEncoder.java | 13 ++----------- .../zipkin/StackdriverEncoderTest.java | 13 ++----------- module/pom.xml | 13 ++----------- .../CredentialsDecoratingClient.java | 13 ++----------- .../ZipkinStackdriverStorageModule.java | 13 ++----------- .../ZipkinStackdriverStorageProperties.java | 13 ++----------- .../stackdriver/ITZipkinStackdriverStorage.java | 13 ++----------- .../stackdriver/StackdriverMockServer.java | 13 ++----------- ...ZipkinStackdriverStorageIntegrationTest.java | 13 ++----------- .../ZipkinStackdriverStorageModuleTest.java | 13 ++----------- pom.xml | 13 ++----------- propagation-stackdriver/pom.xml | 13 ++----------- .../StackdriverTracePropagation.java | 13 ++----------- .../XCloudTraceContextExtractor.java | 13 ++----------- .../StackdriverTracePropagationTest.java | 13 ++----------- .../XCloudTraceContextExtractorTest.java | 13 ++----------- sender-pubsub/pom.xml | 13 ++----------- .../zipkin2/reporter/pubsub/PubSubSender.java | 13 ++----------- .../PubSubSenderInitializationException.java | 13 ++----------- .../reporter/pubsub/PubSubSenderTest.java | 13 ++----------- sender-stackdriver/pom.xml | 13 ++----------- .../AwaitableUnaryClientCallListener.java | 13 ++----------- .../reporter/stackdriver/StackdriverSender.java | 13 ++----------- .../AsyncReporterStackdriverSenderTest.java | 13 ++----------- .../stackdriver/ITStackdriverSender.java | 13 ++----------- .../stackdriver/StackdriverSenderTest.java | 13 ++----------- src/etc/header.txt | 13 ++----------- storage-stackdriver/pom.xml | 13 ++----------- .../stackdriver/StackdriverSpanConsumer.java | 13 ++----------- .../storage/stackdriver/StackdriverStorage.java | 13 ++----------- .../StackdriverSpanConsumerTest.java | 13 ++----------- translation-stackdriver/pom.xml | 13 ++----------- .../stackdriver/AttributesExtractor.java | 13 ++----------- .../translation/stackdriver/SpanTranslator.java | 13 ++----------- .../translation/stackdriver/SpanUtil.java | 13 ++----------- .../stackdriver/AttributesExtractorTest.java | 13 ++----------- .../stackdriver/SpanTranslatorTest.java | 13 ++----------- 86 files changed, 161 insertions(+), 909 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index db00d033..e5358424 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -17,17 +17,8 @@ If you are adding a new file it should have a header like below. This can be automatically added by running `./mvnw com.mycila:license-maven-plugin:format`. ``` -/** - * Copyright 2019 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. +/* + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ ``` diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index bd98f762..39878e4e 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -18,7 +18,6 @@ jobs: # Prevent use of implicit GitHub Actions read-only GITHUB_TOKEN # because maven-release-plugin pushes commits to master. token: ${{ secrets.GH_TOKEN }} - fetch-depth: 1 # license check is skipped, so we don't need history - name: Setup java uses: actions/setup-java@v4 with: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 64b39594..ed6b77bd 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,8 +23,6 @@ jobs: # Prevent use of implicit GitHub Actions read-only GITHUB_TOKEN # because javadoc_to_gh_pages pushes commits to the gh-pages branch. token: ${{ secrets.GH_TOKEN }} - # allow build-bin/javadoc_to_gh_pages to get the full history - fetch-depth: 0 - name: Setup java uses: actions/setup-java@v4 with: diff --git a/.github/workflows/docker_push.yml b/.github/workflows/docker_push.yml index c4c1c288..09439391 100644 --- a/.github/workflows/docker_push.yml +++ b/.github/workflows/docker_push.yml @@ -14,8 +14,6 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v4 - with: - fetch-depth: 1 # only needed to get the sha label # Don't attempt to cache Docker. Sensitive information can be stolen # via forks, and login session ends up in ~/.docker. This is ok because # we publish DOCKER_PARENT_IMAGE to ghcr.io, hence local to the runner. diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3bdf1433..b5155a5e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,8 +35,6 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v4 - with: - fetch-depth: 0 # full git history for license check - name: Setup java uses: actions/setup-java@v4 with: diff --git a/.settings.xml b/.settings.xml index 93f3548c..ab04d7f5 100644 --- a/.settings.xml +++ b/.settings.xml @@ -1,17 +1,8 @@ diff --git a/benchmarks/src/main/java/zipkin2/reporter/stackdriver/TracesParserBenchmarks.java b/benchmarks/src/main/java/zipkin2/reporter/stackdriver/TracesParserBenchmarks.java index bde92d5f..0ed6e36c 100644 --- a/benchmarks/src/main/java/zipkin2/reporter/stackdriver/TracesParserBenchmarks.java +++ b/benchmarks/src/main/java/zipkin2/reporter/stackdriver/TracesParserBenchmarks.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.stackdriver; diff --git a/benchmarks/src/main/java/zipkin2/reporter/stackdriver/brave/StackdriverV2EncoderBenchmarks.java b/benchmarks/src/main/java/zipkin2/reporter/stackdriver/brave/StackdriverV2EncoderBenchmarks.java index b3e3139d..9bd7d1ce 100644 --- a/benchmarks/src/main/java/zipkin2/reporter/stackdriver/brave/StackdriverV2EncoderBenchmarks.java +++ b/benchmarks/src/main/java/zipkin2/reporter/stackdriver/brave/StackdriverV2EncoderBenchmarks.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.stackdriver.brave; diff --git a/benchmarks/src/main/java/zipkin2/reporter/stackdriver/zipkin/StackdriverEncoderBenchmarks.java b/benchmarks/src/main/java/zipkin2/reporter/stackdriver/zipkin/StackdriverEncoderBenchmarks.java index c2896278..bab90251 100644 --- a/benchmarks/src/main/java/zipkin2/reporter/stackdriver/zipkin/StackdriverEncoderBenchmarks.java +++ b/benchmarks/src/main/java/zipkin2/reporter/stackdriver/zipkin/StackdriverEncoderBenchmarks.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.stackdriver.zipkin; diff --git a/build-bin/README.md b/build-bin/README.md index bb991313..e074e297 100755 --- a/build-bin/README.md +++ b/build-bin/README.md @@ -139,8 +139,6 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v4 - with: - fetch-depth: 0 # full git history for license check - name: Test run: | build-bin/configure_test @@ -186,8 +184,6 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v4 - with: - fetch-depth: 1 # only needed to get the sha label - name: Deploy env: GH_USER: ${{ secrets.GH_USER }} diff --git a/build-bin/docker/configure_docker b/build-bin/docker/configure_docker index d355d8f9..476ca70f 100755 --- a/build-bin/docker/configure_docker +++ b/build-bin/docker/configure_docker @@ -1,16 +1,7 @@ #!/bin/sh # -# Copyright 2016-2023 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # # Defends against build outages caused by Docker Hub (docker.io) pull rate limits. diff --git a/build-bin/docker/configure_docker_push b/build-bin/docker/configure_docker_push index 0a9451f5..c08d5cd0 100755 --- a/build-bin/docker/configure_docker_push +++ b/build-bin/docker/configure_docker_push @@ -1,16 +1,7 @@ #!/bin/sh # -# Copyright 2016-2023 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # # Ensures Docker is logged in and it can build multi-architecture. diff --git a/build-bin/docker/docker_arch b/build-bin/docker/docker_arch index b00f84c0..70e091af 100755 --- a/build-bin/docker/docker_arch +++ b/build-bin/docker/docker_arch @@ -1,16 +1,7 @@ #!/bin/sh # -# Copyright 2016-2023 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # # This script gets a normalized name for the architecture as used in Docker. This will be a subset diff --git a/build-bin/docker/docker_args b/build-bin/docker/docker_args index 4d83bb14..e61f0dcb 100755 --- a/build-bin/docker/docker_args +++ b/build-bin/docker/docker_args @@ -1,16 +1,7 @@ #!/bin/sh # -# Copyright 2016-2024 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # # This builds common docker arguments used by docker_build and docker_push. diff --git a/build-bin/docker/docker_block_on_health b/build-bin/docker/docker_block_on_health index c7b135f2..c2a3b9fa 100755 --- a/build-bin/docker/docker_block_on_health +++ b/build-bin/docker/docker_block_on_health @@ -1,16 +1,7 @@ #!/bin/sh # -# Copyright 2016-2023 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # # Blocks until a named docker container with a valid HEALTHCHECK instruction is healthy or not: diff --git a/build-bin/docker/docker_build b/build-bin/docker/docker_build index d7a33157..cf7363f3 100755 --- a/build-bin/docker/docker_build +++ b/build-bin/docker/docker_build @@ -1,16 +1,7 @@ #!/bin/sh # -# Copyright 2016-2023 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # set -ue diff --git a/build-bin/docker/docker_push b/build-bin/docker/docker_push index a3c4b77a..6aaa3742 100755 --- a/build-bin/docker/docker_push +++ b/build-bin/docker/docker_push @@ -1,16 +1,7 @@ #!/bin/sh # -# Copyright 2016-2023 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # # This script pushes images to GitHub Container Registry (ghcr.io). diff --git a/build-bin/docker/docker_test_image b/build-bin/docker/docker_test_image index 0378ab95..fad9da0d 100755 --- a/build-bin/docker/docker_test_image +++ b/build-bin/docker/docker_test_image @@ -1,16 +1,7 @@ #!/bin/sh # -# Copyright 2016-2023 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # # Tests a an image by awaiting its HEALTHCHECK. diff --git a/build-bin/git/login_git b/build-bin/git/login_git index 4ca78506..423d7701 100755 --- a/build-bin/git/login_git +++ b/build-bin/git/login_git @@ -1,16 +1,7 @@ #!/bin/sh # -# Copyright 2016-2023 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # set -ue diff --git a/build-bin/git/version_from_trigger_tag b/build-bin/git/version_from_trigger_tag index a6875f0d..61338762 100755 --- a/build-bin/git/version_from_trigger_tag +++ b/build-bin/git/version_from_trigger_tag @@ -1,16 +1,7 @@ #!/bin/sh # -# Copyright 2016-2023 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # # This script echos a `MAJOR.MINOR.PATCH` version tag based on.. diff --git a/build-bin/gpg/configure_gpg b/build-bin/gpg/configure_gpg index 8049504d..b7568026 100755 --- a/build-bin/gpg/configure_gpg +++ b/build-bin/gpg/configure_gpg @@ -1,16 +1,7 @@ #!/bin/sh # -# Copyright 2016-2023 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # # This script prepares GPG, needed to sign jars for Sonatype deployment during `maven_deploy` diff --git a/build-bin/maven/maven_build b/build-bin/maven/maven_build index 5c65c6fe..5d1631f4 100755 --- a/build-bin/maven/maven_build +++ b/build-bin/maven/maven_build @@ -1,16 +1,7 @@ #!/bin/sh # -# Copyright 2016-2023 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # set -ue diff --git a/build-bin/maven/maven_build_or_unjar b/build-bin/maven/maven_build_or_unjar index eeadf5d7..8c4920d2 100755 --- a/build-bin/maven/maven_build_or_unjar +++ b/build-bin/maven/maven_build_or_unjar @@ -1,16 +1,7 @@ #!/bin/sh # -# Copyright 2016-2023 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # set -ue diff --git a/build-bin/maven/maven_deploy b/build-bin/maven/maven_deploy index 12f73244..c90d2fca 100755 --- a/build-bin/maven/maven_deploy +++ b/build-bin/maven/maven_deploy @@ -1,16 +1,7 @@ #!/bin/sh # -# Copyright 2016-2023 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # set -ue diff --git a/build-bin/maven/maven_go_offline b/build-bin/maven/maven_go_offline index 57c86cd0..1ce82586 100755 --- a/build-bin/maven/maven_go_offline +++ b/build-bin/maven/maven_go_offline @@ -1,16 +1,7 @@ #!/bin/sh # -# Copyright 2016-2023 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # # This is a go-offline that properly works with multi-module builds diff --git a/build-bin/maven/maven_opts b/build-bin/maven/maven_opts index 2ba40b3b..901f6ac1 100755 --- a/build-bin/maven/maven_opts +++ b/build-bin/maven/maven_opts @@ -1,16 +1,7 @@ #!/bin/sh # -# Copyright 2016-2023 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # # This script checks each variable value, so it isn't important to fail on unbound (set -u) diff --git a/build-bin/maven/maven_release b/build-bin/maven/maven_release index d4122b68..df4cdf6a 100755 --- a/build-bin/maven/maven_release +++ b/build-bin/maven/maven_release @@ -1,16 +1,7 @@ #!/bin/sh # -# Copyright 2016-2023 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # set -ue diff --git a/build-bin/maven/maven_unjar b/build-bin/maven/maven_unjar index 2e94113b..624742ce 100755 --- a/build-bin/maven/maven_unjar +++ b/build-bin/maven/maven_unjar @@ -1,16 +1,7 @@ #!/bin/sh # -# Copyright 2016-2023 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # # This script gets one jar from Maven, most typically an exec or module jar, extracting its contents diff --git a/collector-pubsub/pom.xml b/collector-pubsub/pom.xml index 1584b636..b875ce4b 100644 --- a/collector-pubsub/pom.xml +++ b/collector-pubsub/pom.xml @@ -1,17 +1,8 @@ diff --git a/collector-pubsub/src/main/java/zipkin2/collector/pubsub/PubSubCollector.java b/collector-pubsub/src/main/java/zipkin2/collector/pubsub/PubSubCollector.java index 3db4f7a6..18eea5fa 100644 --- a/collector-pubsub/src/main/java/zipkin2/collector/pubsub/PubSubCollector.java +++ b/collector-pubsub/src/main/java/zipkin2/collector/pubsub/PubSubCollector.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.collector.pubsub; diff --git a/collector-pubsub/src/main/java/zipkin2/collector/pubsub/SpanCallback.java b/collector-pubsub/src/main/java/zipkin2/collector/pubsub/SpanCallback.java index b8bd85cd..3bf5d5e6 100644 --- a/collector-pubsub/src/main/java/zipkin2/collector/pubsub/SpanCallback.java +++ b/collector-pubsub/src/main/java/zipkin2/collector/pubsub/SpanCallback.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.collector.pubsub; diff --git a/collector-pubsub/src/main/java/zipkin2/collector/pubsub/SpanMessageReceiver.java b/collector-pubsub/src/main/java/zipkin2/collector/pubsub/SpanMessageReceiver.java index 232fc2cb..99eeee7c 100644 --- a/collector-pubsub/src/main/java/zipkin2/collector/pubsub/SpanMessageReceiver.java +++ b/collector-pubsub/src/main/java/zipkin2/collector/pubsub/SpanMessageReceiver.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.collector.pubsub; diff --git a/collector-pubsub/src/main/java/zipkin2/collector/pubsub/SubscriberSettings.java b/collector-pubsub/src/main/java/zipkin2/collector/pubsub/SubscriberSettings.java index 28eebc38..a4969992 100644 --- a/collector-pubsub/src/main/java/zipkin2/collector/pubsub/SubscriberSettings.java +++ b/collector-pubsub/src/main/java/zipkin2/collector/pubsub/SubscriberSettings.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.collector.pubsub; diff --git a/collector-pubsub/src/test/java/zipkin2/collector/pubsub/PubSubCollectorTest.java b/collector-pubsub/src/test/java/zipkin2/collector/pubsub/PubSubCollectorTest.java index a927448e..c03fa1c3 100644 --- a/collector-pubsub/src/test/java/zipkin2/collector/pubsub/PubSubCollectorTest.java +++ b/collector-pubsub/src/test/java/zipkin2/collector/pubsub/PubSubCollectorTest.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.collector.pubsub; diff --git a/collector-pubsub/src/test/java/zipkin2/collector/pubsub/QueueBasedSubscriberImpl.java b/collector-pubsub/src/test/java/zipkin2/collector/pubsub/QueueBasedSubscriberImpl.java index 1cdf2be6..432ba150 100644 --- a/collector-pubsub/src/test/java/zipkin2/collector/pubsub/QueueBasedSubscriberImpl.java +++ b/collector-pubsub/src/test/java/zipkin2/collector/pubsub/QueueBasedSubscriberImpl.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.collector.pubsub; diff --git a/collector-pubsub/src/test/java/zipkin2/collector/pubsub/StreamingPullStreamObserver.java b/collector-pubsub/src/test/java/zipkin2/collector/pubsub/StreamingPullStreamObserver.java index 411681af..6708a97e 100644 --- a/collector-pubsub/src/test/java/zipkin2/collector/pubsub/StreamingPullStreamObserver.java +++ b/collector-pubsub/src/test/java/zipkin2/collector/pubsub/StreamingPullStreamObserver.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.collector.pubsub; diff --git a/docker/Dockerfile b/docker/Dockerfile index 24f8ee63..86034705 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,15 +1,6 @@ # -# Copyright 2016-2024 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # # zipkin version should match zipkin.version in /pom.xml diff --git a/encoder-stackdriver-brave/pom.xml b/encoder-stackdriver-brave/pom.xml index b1b28b63..ba661db2 100644 --- a/encoder-stackdriver-brave/pom.xml +++ b/encoder-stackdriver-brave/pom.xml @@ -1,17 +1,8 @@ diff --git a/encoder-stackdriver-brave/src/main/java/zipkin2/reporter/stackdriver/brave/AttributesExtractor.java b/encoder-stackdriver-brave/src/main/java/zipkin2/reporter/stackdriver/brave/AttributesExtractor.java index ce595ccd..5b494778 100644 --- a/encoder-stackdriver-brave/src/main/java/zipkin2/reporter/stackdriver/brave/AttributesExtractor.java +++ b/encoder-stackdriver-brave/src/main/java/zipkin2/reporter/stackdriver/brave/AttributesExtractor.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.stackdriver.brave; diff --git a/encoder-stackdriver-brave/src/main/java/zipkin2/reporter/stackdriver/brave/SpanTranslator.java b/encoder-stackdriver-brave/src/main/java/zipkin2/reporter/stackdriver/brave/SpanTranslator.java index 27e61806..50b64889 100644 --- a/encoder-stackdriver-brave/src/main/java/zipkin2/reporter/stackdriver/brave/SpanTranslator.java +++ b/encoder-stackdriver-brave/src/main/java/zipkin2/reporter/stackdriver/brave/SpanTranslator.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.stackdriver.brave; diff --git a/encoder-stackdriver-brave/src/main/java/zipkin2/reporter/stackdriver/brave/SpanUtil.java b/encoder-stackdriver-brave/src/main/java/zipkin2/reporter/stackdriver/brave/SpanUtil.java index c228cd45..715b7ef5 100644 --- a/encoder-stackdriver-brave/src/main/java/zipkin2/reporter/stackdriver/brave/SpanUtil.java +++ b/encoder-stackdriver-brave/src/main/java/zipkin2/reporter/stackdriver/brave/SpanUtil.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.stackdriver.brave; diff --git a/encoder-stackdriver-brave/src/main/java/zipkin2/reporter/stackdriver/brave/StackdriverV2Encoder.java b/encoder-stackdriver-brave/src/main/java/zipkin2/reporter/stackdriver/brave/StackdriverV2Encoder.java index f55ac591..218f487c 100644 --- a/encoder-stackdriver-brave/src/main/java/zipkin2/reporter/stackdriver/brave/StackdriverV2Encoder.java +++ b/encoder-stackdriver-brave/src/main/java/zipkin2/reporter/stackdriver/brave/StackdriverV2Encoder.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.stackdriver.brave; diff --git a/encoder-stackdriver-brave/src/test/java/zipkin2/reporter/stackdriver/brave/AttributesExtractorTest.java b/encoder-stackdriver-brave/src/test/java/zipkin2/reporter/stackdriver/brave/AttributesExtractorTest.java index 23ff8fd7..e1b403ed 100644 --- a/encoder-stackdriver-brave/src/test/java/zipkin2/reporter/stackdriver/brave/AttributesExtractorTest.java +++ b/encoder-stackdriver-brave/src/test/java/zipkin2/reporter/stackdriver/brave/AttributesExtractorTest.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.stackdriver.brave; diff --git a/encoder-stackdriver-brave/src/test/java/zipkin2/reporter/stackdriver/brave/SpanTranslatorTest.java b/encoder-stackdriver-brave/src/test/java/zipkin2/reporter/stackdriver/brave/SpanTranslatorTest.java index 66662b0b..9904ec5b 100644 --- a/encoder-stackdriver-brave/src/test/java/zipkin2/reporter/stackdriver/brave/SpanTranslatorTest.java +++ b/encoder-stackdriver-brave/src/test/java/zipkin2/reporter/stackdriver/brave/SpanTranslatorTest.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.stackdriver.brave; diff --git a/encoder-stackdriver-brave/src/test/java/zipkin2/reporter/stackdriver/brave/StackdriverV2EncoderTest.java b/encoder-stackdriver-brave/src/test/java/zipkin2/reporter/stackdriver/brave/StackdriverV2EncoderTest.java index 70c26aa7..0720c29e 100644 --- a/encoder-stackdriver-brave/src/test/java/zipkin2/reporter/stackdriver/brave/StackdriverV2EncoderTest.java +++ b/encoder-stackdriver-brave/src/test/java/zipkin2/reporter/stackdriver/brave/StackdriverV2EncoderTest.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.stackdriver.brave; diff --git a/encoder-stackdriver-brave/src/test/java/zipkin2/reporter/stackdriver/brave/TestObjects.java b/encoder-stackdriver-brave/src/test/java/zipkin2/reporter/stackdriver/brave/TestObjects.java index 6102d7ff..87d8fdae 100644 --- a/encoder-stackdriver-brave/src/test/java/zipkin2/reporter/stackdriver/brave/TestObjects.java +++ b/encoder-stackdriver-brave/src/test/java/zipkin2/reporter/stackdriver/brave/TestObjects.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.stackdriver.brave; diff --git a/encoder-stackdriver-zipkin/pom.xml b/encoder-stackdriver-zipkin/pom.xml index 87ebcc5b..5728435d 100644 --- a/encoder-stackdriver-zipkin/pom.xml +++ b/encoder-stackdriver-zipkin/pom.xml @@ -1,17 +1,8 @@ diff --git a/encoder-stackdriver-zipkin/src/main/java/zipkin2/reporter/stackdriver/zipkin/StackdriverEncoder.java b/encoder-stackdriver-zipkin/src/main/java/zipkin2/reporter/stackdriver/zipkin/StackdriverEncoder.java index b873090a..18a62b72 100644 --- a/encoder-stackdriver-zipkin/src/main/java/zipkin2/reporter/stackdriver/zipkin/StackdriverEncoder.java +++ b/encoder-stackdriver-zipkin/src/main/java/zipkin2/reporter/stackdriver/zipkin/StackdriverEncoder.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.stackdriver.zipkin; diff --git a/encoder-stackdriver-zipkin/src/test/java/zipkin2/reporter/stackdriver/zipkin/StackdriverEncoderTest.java b/encoder-stackdriver-zipkin/src/test/java/zipkin2/reporter/stackdriver/zipkin/StackdriverEncoderTest.java index 37e5539c..fef94b1c 100644 --- a/encoder-stackdriver-zipkin/src/test/java/zipkin2/reporter/stackdriver/zipkin/StackdriverEncoderTest.java +++ b/encoder-stackdriver-zipkin/src/test/java/zipkin2/reporter/stackdriver/zipkin/StackdriverEncoderTest.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.stackdriver.zipkin; diff --git a/module/pom.xml b/module/pom.xml index 6f69dbe3..23adf9f9 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -1,17 +1,8 @@ diff --git a/module/src/main/java/zipkin/module/storage/stackdriver/CredentialsDecoratingClient.java b/module/src/main/java/zipkin/module/storage/stackdriver/CredentialsDecoratingClient.java index d9dcd70c..4f506fa2 100644 --- a/module/src/main/java/zipkin/module/storage/stackdriver/CredentialsDecoratingClient.java +++ b/module/src/main/java/zipkin/module/storage/stackdriver/CredentialsDecoratingClient.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin.module.storage.stackdriver; diff --git a/module/src/main/java/zipkin/module/storage/stackdriver/ZipkinStackdriverStorageModule.java b/module/src/main/java/zipkin/module/storage/stackdriver/ZipkinStackdriverStorageModule.java index d0f40ba7..42998552 100644 --- a/module/src/main/java/zipkin/module/storage/stackdriver/ZipkinStackdriverStorageModule.java +++ b/module/src/main/java/zipkin/module/storage/stackdriver/ZipkinStackdriverStorageModule.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin.module.storage.stackdriver; diff --git a/module/src/main/java/zipkin/module/storage/stackdriver/ZipkinStackdriverStorageProperties.java b/module/src/main/java/zipkin/module/storage/stackdriver/ZipkinStackdriverStorageProperties.java index 61964dc3..80966d3b 100644 --- a/module/src/main/java/zipkin/module/storage/stackdriver/ZipkinStackdriverStorageProperties.java +++ b/module/src/main/java/zipkin/module/storage/stackdriver/ZipkinStackdriverStorageProperties.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin.module.storage.stackdriver; diff --git a/module/src/test/java/zipkin2/storage/stackdriver/ITZipkinStackdriverStorage.java b/module/src/test/java/zipkin2/storage/stackdriver/ITZipkinStackdriverStorage.java index 789200e6..b74ee974 100644 --- a/module/src/test/java/zipkin2/storage/stackdriver/ITZipkinStackdriverStorage.java +++ b/module/src/test/java/zipkin2/storage/stackdriver/ITZipkinStackdriverStorage.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.storage.stackdriver; diff --git a/module/src/test/java/zipkin2/storage/stackdriver/StackdriverMockServer.java b/module/src/test/java/zipkin2/storage/stackdriver/StackdriverMockServer.java index 545e3691..42e243e9 100644 --- a/module/src/test/java/zipkin2/storage/stackdriver/StackdriverMockServer.java +++ b/module/src/test/java/zipkin2/storage/stackdriver/StackdriverMockServer.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.storage.stackdriver; diff --git a/module/src/test/java/zipkin2/storage/stackdriver/ZipkinStackdriverStorageIntegrationTest.java b/module/src/test/java/zipkin2/storage/stackdriver/ZipkinStackdriverStorageIntegrationTest.java index 6618ca12..b54bf8fc 100644 --- a/module/src/test/java/zipkin2/storage/stackdriver/ZipkinStackdriverStorageIntegrationTest.java +++ b/module/src/test/java/zipkin2/storage/stackdriver/ZipkinStackdriverStorageIntegrationTest.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.storage.stackdriver; diff --git a/module/src/test/java/zipkin2/storage/stackdriver/ZipkinStackdriverStorageModuleTest.java b/module/src/test/java/zipkin2/storage/stackdriver/ZipkinStackdriverStorageModuleTest.java index 93d27907..afd13a24 100644 --- a/module/src/test/java/zipkin2/storage/stackdriver/ZipkinStackdriverStorageModuleTest.java +++ b/module/src/test/java/zipkin2/storage/stackdriver/ZipkinStackdriverStorageModuleTest.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.storage.stackdriver; diff --git a/pom.xml b/pom.xml index ff4051d1..715445f5 100644 --- a/pom.xml +++ b/pom.xml @@ -1,17 +1,8 @@ diff --git a/propagation-stackdriver/pom.xml b/propagation-stackdriver/pom.xml index e1bad51a..3982b9bc 100644 --- a/propagation-stackdriver/pom.xml +++ b/propagation-stackdriver/pom.xml @@ -1,17 +1,8 @@ diff --git a/propagation-stackdriver/src/main/java/brave/propagation/stackdriver/StackdriverTracePropagation.java b/propagation-stackdriver/src/main/java/brave/propagation/stackdriver/StackdriverTracePropagation.java index 25bf0f34..f3c1cfe6 100644 --- a/propagation-stackdriver/src/main/java/brave/propagation/stackdriver/StackdriverTracePropagation.java +++ b/propagation-stackdriver/src/main/java/brave/propagation/stackdriver/StackdriverTracePropagation.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package brave.propagation.stackdriver; diff --git a/propagation-stackdriver/src/main/java/brave/propagation/stackdriver/XCloudTraceContextExtractor.java b/propagation-stackdriver/src/main/java/brave/propagation/stackdriver/XCloudTraceContextExtractor.java index 23d521ea..3b78053c 100644 --- a/propagation-stackdriver/src/main/java/brave/propagation/stackdriver/XCloudTraceContextExtractor.java +++ b/propagation-stackdriver/src/main/java/brave/propagation/stackdriver/XCloudTraceContextExtractor.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2020 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package brave.propagation.stackdriver; diff --git a/propagation-stackdriver/src/test/java/brave/propagation/stackdriver/StackdriverTracePropagationTest.java b/propagation-stackdriver/src/test/java/brave/propagation/stackdriver/StackdriverTracePropagationTest.java index 15119f91..a9a40ec3 100644 --- a/propagation-stackdriver/src/test/java/brave/propagation/stackdriver/StackdriverTracePropagationTest.java +++ b/propagation-stackdriver/src/test/java/brave/propagation/stackdriver/StackdriverTracePropagationTest.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package brave.propagation.stackdriver; diff --git a/propagation-stackdriver/src/test/java/brave/propagation/stackdriver/XCloudTraceContextExtractorTest.java b/propagation-stackdriver/src/test/java/brave/propagation/stackdriver/XCloudTraceContextExtractorTest.java index 9780d752..20ce1aa3 100644 --- a/propagation-stackdriver/src/test/java/brave/propagation/stackdriver/XCloudTraceContextExtractorTest.java +++ b/propagation-stackdriver/src/test/java/brave/propagation/stackdriver/XCloudTraceContextExtractorTest.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package brave.propagation.stackdriver; diff --git a/sender-pubsub/pom.xml b/sender-pubsub/pom.xml index e0200e5b..61f686db 100644 --- a/sender-pubsub/pom.xml +++ b/sender-pubsub/pom.xml @@ -1,17 +1,8 @@ diff --git a/sender-pubsub/src/main/java/zipkin2/reporter/pubsub/PubSubSender.java b/sender-pubsub/src/main/java/zipkin2/reporter/pubsub/PubSubSender.java index 0a49a4c0..218f46b4 100644 --- a/sender-pubsub/src/main/java/zipkin2/reporter/pubsub/PubSubSender.java +++ b/sender-pubsub/src/main/java/zipkin2/reporter/pubsub/PubSubSender.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.pubsub; diff --git a/sender-pubsub/src/main/java/zipkin2/reporter/pubsub/PubSubSenderInitializationException.java b/sender-pubsub/src/main/java/zipkin2/reporter/pubsub/PubSubSenderInitializationException.java index 78ea9c20..ffd970d3 100644 --- a/sender-pubsub/src/main/java/zipkin2/reporter/pubsub/PubSubSenderInitializationException.java +++ b/sender-pubsub/src/main/java/zipkin2/reporter/pubsub/PubSubSenderInitializationException.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.pubsub; diff --git a/sender-pubsub/src/test/java/zipkin2/reporter/pubsub/PubSubSenderTest.java b/sender-pubsub/src/test/java/zipkin2/reporter/pubsub/PubSubSenderTest.java index d9505ace..00b9e1ac 100644 --- a/sender-pubsub/src/test/java/zipkin2/reporter/pubsub/PubSubSenderTest.java +++ b/sender-pubsub/src/test/java/zipkin2/reporter/pubsub/PubSubSenderTest.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.pubsub; diff --git a/sender-stackdriver/pom.xml b/sender-stackdriver/pom.xml index a9a4fa93..958185d4 100644 --- a/sender-stackdriver/pom.xml +++ b/sender-stackdriver/pom.xml @@ -1,17 +1,8 @@ diff --git a/sender-stackdriver/src/main/java/zipkin2/reporter/stackdriver/AwaitableUnaryClientCallListener.java b/sender-stackdriver/src/main/java/zipkin2/reporter/stackdriver/AwaitableUnaryClientCallListener.java index 852d66f9..f81f6960 100644 --- a/sender-stackdriver/src/main/java/zipkin2/reporter/stackdriver/AwaitableUnaryClientCallListener.java +++ b/sender-stackdriver/src/main/java/zipkin2/reporter/stackdriver/AwaitableUnaryClientCallListener.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.stackdriver; diff --git a/sender-stackdriver/src/main/java/zipkin2/reporter/stackdriver/StackdriverSender.java b/sender-stackdriver/src/main/java/zipkin2/reporter/stackdriver/StackdriverSender.java index 53fbb0d7..f48387eb 100644 --- a/sender-stackdriver/src/main/java/zipkin2/reporter/stackdriver/StackdriverSender.java +++ b/sender-stackdriver/src/main/java/zipkin2/reporter/stackdriver/StackdriverSender.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.stackdriver; diff --git a/sender-stackdriver/src/test/java/zipkin2/reporter/stackdriver/AsyncReporterStackdriverSenderTest.java b/sender-stackdriver/src/test/java/zipkin2/reporter/stackdriver/AsyncReporterStackdriverSenderTest.java index f3259595..9e307b51 100644 --- a/sender-stackdriver/src/test/java/zipkin2/reporter/stackdriver/AsyncReporterStackdriverSenderTest.java +++ b/sender-stackdriver/src/test/java/zipkin2/reporter/stackdriver/AsyncReporterStackdriverSenderTest.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.stackdriver; diff --git a/sender-stackdriver/src/test/java/zipkin2/reporter/stackdriver/ITStackdriverSender.java b/sender-stackdriver/src/test/java/zipkin2/reporter/stackdriver/ITStackdriverSender.java index e3a87308..ddeb0180 100644 --- a/sender-stackdriver/src/test/java/zipkin2/reporter/stackdriver/ITStackdriverSender.java +++ b/sender-stackdriver/src/test/java/zipkin2/reporter/stackdriver/ITStackdriverSender.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.stackdriver; diff --git a/sender-stackdriver/src/test/java/zipkin2/reporter/stackdriver/StackdriverSenderTest.java b/sender-stackdriver/src/test/java/zipkin2/reporter/stackdriver/StackdriverSenderTest.java index 721d41aa..cc8ef90b 100644 --- a/sender-stackdriver/src/test/java/zipkin2/reporter/stackdriver/StackdriverSenderTest.java +++ b/sender-stackdriver/src/test/java/zipkin2/reporter/stackdriver/StackdriverSenderTest.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.reporter.stackdriver; diff --git a/src/etc/header.txt b/src/etc/header.txt index 6dba3bdf..fe602a38 100644 --- a/src/etc/header.txt +++ b/src/etc/header.txt @@ -1,11 +1,2 @@ -Copyright ${license.git.copyrightYears} The OpenZipkin Authors - -Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -in compliance with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software distributed under the License -is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -or implied. See the License for the specific language governing permissions and limitations under -the License. +Copyright The OpenZipkin Authors +SPDX-License-Identifier: Apache-2.0 diff --git a/storage-stackdriver/pom.xml b/storage-stackdriver/pom.xml index 826278b6..0b5bb41d 100644 --- a/storage-stackdriver/pom.xml +++ b/storage-stackdriver/pom.xml @@ -1,17 +1,8 @@ diff --git a/storage-stackdriver/src/main/java/zipkin2/storage/stackdriver/StackdriverSpanConsumer.java b/storage-stackdriver/src/main/java/zipkin2/storage/stackdriver/StackdriverSpanConsumer.java index ffebb096..af0681c9 100644 --- a/storage-stackdriver/src/main/java/zipkin2/storage/stackdriver/StackdriverSpanConsumer.java +++ b/storage-stackdriver/src/main/java/zipkin2/storage/stackdriver/StackdriverSpanConsumer.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2020 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.storage.stackdriver; diff --git a/storage-stackdriver/src/main/java/zipkin2/storage/stackdriver/StackdriverStorage.java b/storage-stackdriver/src/main/java/zipkin2/storage/stackdriver/StackdriverStorage.java index faf876ff..b9b88fb1 100644 --- a/storage-stackdriver/src/main/java/zipkin2/storage/stackdriver/StackdriverStorage.java +++ b/storage-stackdriver/src/main/java/zipkin2/storage/stackdriver/StackdriverStorage.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2020 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.storage.stackdriver; diff --git a/storage-stackdriver/src/test/java/zipkin2/storage/stackdriver/StackdriverSpanConsumerTest.java b/storage-stackdriver/src/test/java/zipkin2/storage/stackdriver/StackdriverSpanConsumerTest.java index 094dd001..fa6b09c2 100644 --- a/storage-stackdriver/src/test/java/zipkin2/storage/stackdriver/StackdriverSpanConsumerTest.java +++ b/storage-stackdriver/src/test/java/zipkin2/storage/stackdriver/StackdriverSpanConsumerTest.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.storage.stackdriver; diff --git a/translation-stackdriver/pom.xml b/translation-stackdriver/pom.xml index 9156f294..e744024c 100644 --- a/translation-stackdriver/pom.xml +++ b/translation-stackdriver/pom.xml @@ -1,17 +1,8 @@ diff --git a/translation-stackdriver/src/main/java/zipkin2/translation/stackdriver/AttributesExtractor.java b/translation-stackdriver/src/main/java/zipkin2/translation/stackdriver/AttributesExtractor.java index 5edbbd0d..f4c351f4 100644 --- a/translation-stackdriver/src/main/java/zipkin2/translation/stackdriver/AttributesExtractor.java +++ b/translation-stackdriver/src/main/java/zipkin2/translation/stackdriver/AttributesExtractor.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2019 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.translation.stackdriver; diff --git a/translation-stackdriver/src/main/java/zipkin2/translation/stackdriver/SpanTranslator.java b/translation-stackdriver/src/main/java/zipkin2/translation/stackdriver/SpanTranslator.java index 4a6af64e..35a99c13 100644 --- a/translation-stackdriver/src/main/java/zipkin2/translation/stackdriver/SpanTranslator.java +++ b/translation-stackdriver/src/main/java/zipkin2/translation/stackdriver/SpanTranslator.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.translation.stackdriver; diff --git a/translation-stackdriver/src/main/java/zipkin2/translation/stackdriver/SpanUtil.java b/translation-stackdriver/src/main/java/zipkin2/translation/stackdriver/SpanUtil.java index a3d9f73e..c12183da 100644 --- a/translation-stackdriver/src/main/java/zipkin2/translation/stackdriver/SpanUtil.java +++ b/translation-stackdriver/src/main/java/zipkin2/translation/stackdriver/SpanUtil.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.translation.stackdriver; diff --git a/translation-stackdriver/src/test/java/zipkin2/translation/stackdriver/AttributesExtractorTest.java b/translation-stackdriver/src/test/java/zipkin2/translation/stackdriver/AttributesExtractorTest.java index d9d1f015..002cfa12 100644 --- a/translation-stackdriver/src/test/java/zipkin2/translation/stackdriver/AttributesExtractorTest.java +++ b/translation-stackdriver/src/test/java/zipkin2/translation/stackdriver/AttributesExtractorTest.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.translation.stackdriver; diff --git a/translation-stackdriver/src/test/java/zipkin2/translation/stackdriver/SpanTranslatorTest.java b/translation-stackdriver/src/test/java/zipkin2/translation/stackdriver/SpanTranslatorTest.java index a8450252..0ddcc153 100644 --- a/translation-stackdriver/src/test/java/zipkin2/translation/stackdriver/SpanTranslatorTest.java +++ b/translation-stackdriver/src/test/java/zipkin2/translation/stackdriver/SpanTranslatorTest.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2024 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.translation.stackdriver;