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 a759f438..3ef9ce40 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -19,7 +19,6 @@ jobs: # Prevent use of implicit GitHub Actions read-only token GITHUB_TOKEN. We don't deploy on # the tag MAJOR.MINOR.PATCH event, but we still need to deploy the maven-release-plugin master commit. token: ${{ secrets.GH_TOKEN }} - fetch-depth: 1 # only need the HEAD commit as license check isn't run - name: Setup java uses: actions/setup-java@v4 with: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c5567683..76e2fe4c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -22,7 +22,6 @@ jobs: # Prevent use of implicit GitHub Actions read-only token GITHUB_TOKEN. # We push Javadocs to the gh-pages branch on commit. token: ${{ secrets.GH_TOKEN }} - fetch-depth: 0 # allow build-bin/idl_to_gh_pages to get the full history - name: Setup java uses: actions/setup-java@v4 with: diff --git a/.github/workflows/docker_push.yml b/.github/workflows/docker_push.yml index 14dd23c9..227082a8 100644 --- a/.github/workflows/docker_push.yml +++ b/.github/workflows/docker_push.yml @@ -15,8 +15,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 f34aa28d..7414bd43 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,8 +22,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: @@ -52,8 +50,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/aws-junit/src/main/java/zipkin2/junit/aws/AmazonSQSExtension.java b/aws-junit/src/main/java/zipkin2/junit/aws/AmazonSQSExtension.java index d7dc6767..83bec779 100644 --- a/aws-junit/src/main/java/zipkin2/junit/aws/AmazonSQSExtension.java +++ b/aws-junit/src/main/java/zipkin2/junit/aws/AmazonSQSExtension.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.junit.aws; diff --git a/brave/instrumentation-aws-java-sdk-core/pom.xml b/brave/instrumentation-aws-java-sdk-core/pom.xml index 1e8e4efa..84ca7500 100644 --- a/brave/instrumentation-aws-java-sdk-core/pom.xml +++ b/brave/instrumentation-aws-java-sdk-core/pom.xml @@ -1,17 +1,8 @@ diff --git a/brave/instrumentation-aws-java-sdk-core/src/main/java/brave/instrumentation/aws/AwsClientTracing.java b/brave/instrumentation-aws-java-sdk-core/src/main/java/brave/instrumentation/aws/AwsClientTracing.java index 02aa6f71..31f92449 100644 --- a/brave/instrumentation-aws-java-sdk-core/src/main/java/brave/instrumentation/aws/AwsClientTracing.java +++ b/brave/instrumentation-aws-java-sdk-core/src/main/java/brave/instrumentation/aws/AwsClientTracing.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.instrumentation.aws; diff --git a/brave/instrumentation-aws-java-sdk-core/src/main/java/brave/instrumentation/aws/TracingRequestHandler.java b/brave/instrumentation-aws-java-sdk-core/src/main/java/brave/instrumentation/aws/TracingRequestHandler.java index cfd3fcc2..8553c9bc 100644 --- a/brave/instrumentation-aws-java-sdk-core/src/main/java/brave/instrumentation/aws/TracingRequestHandler.java +++ b/brave/instrumentation-aws-java-sdk-core/src/main/java/brave/instrumentation/aws/TracingRequestHandler.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.instrumentation.aws; diff --git a/brave/instrumentation-aws-java-sdk-core/src/test/java/brave/instrumentation/aws/AwsClientTracingTest.java b/brave/instrumentation-aws-java-sdk-core/src/test/java/brave/instrumentation/aws/AwsClientTracingTest.java index 0f2a39a1..8043bcba 100644 --- a/brave/instrumentation-aws-java-sdk-core/src/test/java/brave/instrumentation/aws/AwsClientTracingTest.java +++ b/brave/instrumentation-aws-java-sdk-core/src/test/java/brave/instrumentation/aws/AwsClientTracingTest.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.instrumentation.aws; diff --git a/brave/instrumentation-aws-java-sdk-core/src/test/java/brave/instrumentation/aws/ITTracingRequestHandler.java b/brave/instrumentation-aws-java-sdk-core/src/test/java/brave/instrumentation/aws/ITTracingRequestHandler.java index 0bd32f2e..5b1fcbb4 100644 --- a/brave/instrumentation-aws-java-sdk-core/src/test/java/brave/instrumentation/aws/ITTracingRequestHandler.java +++ b/brave/instrumentation-aws-java-sdk-core/src/test/java/brave/instrumentation/aws/ITTracingRequestHandler.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.instrumentation.aws; diff --git a/brave/instrumentation-aws-java-sdk-core/src/test/java/brave/instrumentation/aws/TracingRequestHandlerTest.java b/brave/instrumentation-aws-java-sdk-core/src/test/java/brave/instrumentation/aws/TracingRequestHandlerTest.java index ba9b7756..94e0cad0 100644 --- a/brave/instrumentation-aws-java-sdk-core/src/test/java/brave/instrumentation/aws/TracingRequestHandlerTest.java +++ b/brave/instrumentation-aws-java-sdk-core/src/test/java/brave/instrumentation/aws/TracingRequestHandlerTest.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.instrumentation.aws; diff --git a/brave/instrumentation-aws-java-sdk-sqs/pom.xml b/brave/instrumentation-aws-java-sdk-sqs/pom.xml index eb2f5ac1..51034812 100644 --- a/brave/instrumentation-aws-java-sdk-sqs/pom.xml +++ b/brave/instrumentation-aws-java-sdk-sqs/pom.xml @@ -1,17 +1,8 @@ diff --git a/brave/instrumentation-aws-java-sdk-sqs/src/main/java/brave/instrumentation/aws/sqs/SendMessageTracingRequestHandler.java b/brave/instrumentation-aws-java-sdk-sqs/src/main/java/brave/instrumentation/aws/sqs/SendMessageTracingRequestHandler.java index a1bdef3b..3e6a68c6 100644 --- a/brave/instrumentation-aws-java-sdk-sqs/src/main/java/brave/instrumentation/aws/sqs/SendMessageTracingRequestHandler.java +++ b/brave/instrumentation-aws-java-sdk-sqs/src/main/java/brave/instrumentation/aws/sqs/SendMessageTracingRequestHandler.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.instrumentation.aws.sqs; diff --git a/brave/instrumentation-aws-java-sdk-sqs/src/main/java/brave/instrumentation/aws/sqs/SqsMessageTracing.java b/brave/instrumentation-aws-java-sdk-sqs/src/main/java/brave/instrumentation/aws/sqs/SqsMessageTracing.java index 06cc3201..8bad4ee3 100644 --- a/brave/instrumentation-aws-java-sdk-sqs/src/main/java/brave/instrumentation/aws/sqs/SqsMessageTracing.java +++ b/brave/instrumentation-aws-java-sdk-sqs/src/main/java/brave/instrumentation/aws/sqs/SqsMessageTracing.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.instrumentation.aws.sqs; diff --git a/brave/instrumentation-aws-java-sdk-sqs/src/test/java/brave/instrumentation/aws/sqs/SendMessageTracingRequestHandlerTest.java b/brave/instrumentation-aws-java-sdk-sqs/src/test/java/brave/instrumentation/aws/sqs/SendMessageTracingRequestHandlerTest.java index b7aa3a11..7d2587c2 100644 --- a/brave/instrumentation-aws-java-sdk-sqs/src/test/java/brave/instrumentation/aws/sqs/SendMessageTracingRequestHandlerTest.java +++ b/brave/instrumentation-aws-java-sdk-sqs/src/test/java/brave/instrumentation/aws/sqs/SendMessageTracingRequestHandlerTest.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.instrumentation.aws.sqs; diff --git a/brave/instrumentation-aws-java-sdk-v2-core/pom.xml b/brave/instrumentation-aws-java-sdk-v2-core/pom.xml index 60dff2f9..c0307b05 100644 --- a/brave/instrumentation-aws-java-sdk-v2-core/pom.xml +++ b/brave/instrumentation-aws-java-sdk-v2-core/pom.xml @@ -1,17 +1,8 @@ diff --git a/brave/instrumentation-aws-java-sdk-v2-core/src/main/java/brave/instrumentation/awsv2/AwsSdkTracing.java b/brave/instrumentation-aws-java-sdk-v2-core/src/main/java/brave/instrumentation/awsv2/AwsSdkTracing.java index bcd2e677..ab37bec1 100644 --- a/brave/instrumentation-aws-java-sdk-v2-core/src/main/java/brave/instrumentation/awsv2/AwsSdkTracing.java +++ b/brave/instrumentation-aws-java-sdk-v2-core/src/main/java/brave/instrumentation/awsv2/AwsSdkTracing.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.instrumentation.awsv2; diff --git a/brave/instrumentation-aws-java-sdk-v2-core/src/main/java/brave/instrumentation/awsv2/TracingExecutionInterceptor.java b/brave/instrumentation-aws-java-sdk-v2-core/src/main/java/brave/instrumentation/awsv2/TracingExecutionInterceptor.java index 95e74a86..ff0ca088 100644 --- a/brave/instrumentation-aws-java-sdk-v2-core/src/main/java/brave/instrumentation/awsv2/TracingExecutionInterceptor.java +++ b/brave/instrumentation-aws-java-sdk-v2-core/src/main/java/brave/instrumentation/awsv2/TracingExecutionInterceptor.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.instrumentation.awsv2; diff --git a/brave/instrumentation-aws-java-sdk-v2-core/src/test/java/brave/instrumentation/awsv2/ITTracingExecutionInterceptor.java b/brave/instrumentation-aws-java-sdk-v2-core/src/test/java/brave/instrumentation/awsv2/ITTracingExecutionInterceptor.java index d0e71617..98c32645 100644 --- a/brave/instrumentation-aws-java-sdk-v2-core/src/test/java/brave/instrumentation/awsv2/ITTracingExecutionInterceptor.java +++ b/brave/instrumentation-aws-java-sdk-v2-core/src/test/java/brave/instrumentation/awsv2/ITTracingExecutionInterceptor.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.instrumentation.awsv2; diff --git a/brave/propagation-aws/pom.xml b/brave/propagation-aws/pom.xml index 31f476a2..90055098 100644 --- a/brave/propagation-aws/pom.xml +++ b/brave/propagation-aws/pom.xml @@ -1,17 +1,8 @@ diff --git a/brave/propagation-aws/src/main/java/brave/propagation/aws/AWSExtractor.java b/brave/propagation-aws/src/main/java/brave/propagation/aws/AWSExtractor.java index d2f60539..dd7da8a9 100644 --- a/brave/propagation-aws/src/main/java/brave/propagation/aws/AWSExtractor.java +++ b/brave/propagation-aws/src/main/java/brave/propagation/aws/AWSExtractor.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.aws; diff --git a/brave/propagation-aws/src/main/java/brave/propagation/aws/AWSInjector.java b/brave/propagation-aws/src/main/java/brave/propagation/aws/AWSInjector.java index d09a621c..3a587fa5 100644 --- a/brave/propagation-aws/src/main/java/brave/propagation/aws/AWSInjector.java +++ b/brave/propagation-aws/src/main/java/brave/propagation/aws/AWSInjector.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.aws; diff --git a/brave/propagation-aws/src/main/java/brave/propagation/aws/AWSPropagation.java b/brave/propagation-aws/src/main/java/brave/propagation/aws/AWSPropagation.java index a397e32d..6aa19275 100644 --- a/brave/propagation-aws/src/main/java/brave/propagation/aws/AWSPropagation.java +++ b/brave/propagation-aws/src/main/java/brave/propagation/aws/AWSPropagation.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.aws; diff --git a/brave/propagation-aws/src/main/java/brave/propagation/aws/HexCodec.java b/brave/propagation-aws/src/main/java/brave/propagation/aws/HexCodec.java index 33067ac8..4484e6e2 100644 --- a/brave/propagation-aws/src/main/java/brave/propagation/aws/HexCodec.java +++ b/brave/propagation-aws/src/main/java/brave/propagation/aws/HexCodec.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.aws; diff --git a/brave/propagation-aws/src/test/java/brave/propagation/aws/AWSInjectorTest.java b/brave/propagation-aws/src/test/java/brave/propagation/aws/AWSInjectorTest.java index 00a1865a..c10f251e 100644 --- a/brave/propagation-aws/src/test/java/brave/propagation/aws/AWSInjectorTest.java +++ b/brave/propagation-aws/src/test/java/brave/propagation/aws/AWSInjectorTest.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.aws; diff --git a/brave/propagation-aws/src/test/java/brave/propagation/aws/AWSPropagationTest.java b/brave/propagation-aws/src/test/java/brave/propagation/aws/AWSPropagationTest.java index 4567457e..099f7394 100644 --- a/brave/propagation-aws/src/test/java/brave/propagation/aws/AWSPropagationTest.java +++ b/brave/propagation-aws/src/test/java/brave/propagation/aws/AWSPropagationTest.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.aws; diff --git a/build-bin/README.md b/build-bin/README.md index 7485af31..62d5bcae 100755 --- a/build-bin/README.md +++ b/build-bin/README.md @@ -72,8 +72,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 @@ -114,8 +112,6 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v4 - with: - fetch-depth: 1 # only needed to get the sha label - name: Configure Deploy run: build-bin/configure_deploy env: diff --git a/build-bin/docker/configure_docker b/build-bin/docker/configure_docker index ebf7fd92..476ca70f 100755 --- a/build-bin/docker/configure_docker +++ b/build-bin/docker/configure_docker @@ -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 # # 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 fd459a47..c08d5cd0 100755 --- a/build-bin/docker/configure_docker_push +++ b/build-bin/docker/configure_docker_push @@ -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 # # 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 04c9cb58..70e091af 100755 --- a/build-bin/docker/docker_arch +++ b/build-bin/docker/docker_arch @@ -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 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 83a3ce99..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-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 # # 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 3dde15e9..cf7363f3 100755 --- a/build-bin/docker/docker_build +++ b/build-bin/docker/docker_build @@ -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 # set -ue diff --git a/build-bin/docker/docker_push b/build-bin/docker/docker_push index 7c38d8b9..6aaa3742 100755 --- a/build-bin/docker/docker_push +++ b/build-bin/docker/docker_push @@ -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 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 33b7943d..fad9da0d 100755 --- a/build-bin/docker/docker_test_image +++ b/build-bin/docker/docker_test_image @@ -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 # # Tests a an image by awaiting its HEALTHCHECK. diff --git a/build-bin/git/login_git b/build-bin/git/login_git index f3da0d66..423d7701 100755 --- a/build-bin/git/login_git +++ b/build-bin/git/login_git @@ -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 # set -ue diff --git a/build-bin/git/version_from_trigger_tag b/build-bin/git/version_from_trigger_tag index 51256916..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-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 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 39cb0b5b..b7568026 100755 --- a/build-bin/gpg/configure_gpg +++ b/build-bin/gpg/configure_gpg @@ -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 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 c68194c3..5d1631f4 100755 --- a/build-bin/maven/maven_build +++ b/build-bin/maven/maven_build @@ -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 # set -ue diff --git a/build-bin/maven/maven_build_or_unjar b/build-bin/maven/maven_build_or_unjar index 69067a49..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-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 # set -ue diff --git a/build-bin/maven/maven_deploy b/build-bin/maven/maven_deploy index f40343ef..c90d2fca 100755 --- a/build-bin/maven/maven_deploy +++ b/build-bin/maven/maven_deploy @@ -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 # set -ue diff --git a/build-bin/maven/maven_go_offline b/build-bin/maven/maven_go_offline index b4b403f5..1ce82586 100755 --- a/build-bin/maven/maven_go_offline +++ b/build-bin/maven/maven_go_offline @@ -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 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 3ebbccd6..901f6ac1 100755 --- a/build-bin/maven/maven_opts +++ b/build-bin/maven/maven_opts @@ -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 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 a138c083..df4cdf6a 100755 --- a/build-bin/maven/maven_release +++ b/build-bin/maven/maven_release @@ -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 # set -ue diff --git a/build-bin/maven/maven_unjar b/build-bin/maven/maven_unjar index 97894db8..624742ce 100755 --- a/build-bin/maven/maven_unjar +++ b/build-bin/maven/maven_unjar @@ -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 script gets one jar from Maven, most typically an exec or module jar, extracting its contents diff --git a/collector/kinesis/pom.xml b/collector/kinesis/pom.xml index 70c7f10f..9fc5e474 100644 --- a/collector/kinesis/pom.xml +++ b/collector/kinesis/pom.xml @@ -1,17 +1,8 @@ diff --git a/collector/kinesis/src/main/java/zipkin2/collector/kinesis/KinesisCollector.java b/collector/kinesis/src/main/java/zipkin2/collector/kinesis/KinesisCollector.java index 24a9a54e..ea5e5dec 100644 --- a/collector/kinesis/src/main/java/zipkin2/collector/kinesis/KinesisCollector.java +++ b/collector/kinesis/src/main/java/zipkin2/collector/kinesis/KinesisCollector.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.collector.kinesis; diff --git a/collector/kinesis/src/main/java/zipkin2/collector/kinesis/KinesisSpanProcessor.java b/collector/kinesis/src/main/java/zipkin2/collector/kinesis/KinesisSpanProcessor.java index 891b7c91..f341a00c 100644 --- a/collector/kinesis/src/main/java/zipkin2/collector/kinesis/KinesisSpanProcessor.java +++ b/collector/kinesis/src/main/java/zipkin2/collector/kinesis/KinesisSpanProcessor.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.collector.kinesis; diff --git a/collector/kinesis/src/test/java/zipkin2/collector/kinesis/KinesisSpanProcessorTest.java b/collector/kinesis/src/test/java/zipkin2/collector/kinesis/KinesisSpanProcessorTest.java index b73cdaf7..32548207 100644 --- a/collector/kinesis/src/test/java/zipkin2/collector/kinesis/KinesisSpanProcessorTest.java +++ b/collector/kinesis/src/test/java/zipkin2/collector/kinesis/KinesisSpanProcessorTest.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.collector.kinesis; diff --git a/collector/sqs/pom.xml b/collector/sqs/pom.xml index 4195b97b..23cc8cda 100644 --- a/collector/sqs/pom.xml +++ b/collector/sqs/pom.xml @@ -1,17 +1,8 @@ diff --git a/collector/sqs/src/main/java/zipkin2/collector/sqs/SQSCollector.java b/collector/sqs/src/main/java/zipkin2/collector/sqs/SQSCollector.java index ee2c4832..88de5e36 100644 --- a/collector/sqs/src/main/java/zipkin2/collector/sqs/SQSCollector.java +++ b/collector/sqs/src/main/java/zipkin2/collector/sqs/SQSCollector.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.collector.sqs; diff --git a/collector/sqs/src/main/java/zipkin2/collector/sqs/SQSSpanProcessor.java b/collector/sqs/src/main/java/zipkin2/collector/sqs/SQSSpanProcessor.java index ea975e39..5ce07aa7 100644 --- a/collector/sqs/src/main/java/zipkin2/collector/sqs/SQSSpanProcessor.java +++ b/collector/sqs/src/main/java/zipkin2/collector/sqs/SQSSpanProcessor.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.collector.sqs; diff --git a/collector/sqs/src/test/java/zipkin2/collector/sqs/ITSQSCollector.java b/collector/sqs/src/test/java/zipkin2/collector/sqs/ITSQSCollector.java index 35eaedf7..d2d69f82 100644 --- a/collector/sqs/src/test/java/zipkin2/collector/sqs/ITSQSCollector.java +++ b/collector/sqs/src/test/java/zipkin2/collector/sqs/ITSQSCollector.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.collector.sqs; diff --git a/docker/Dockerfile b/docker/Dockerfile index 33698fe6..5d63d12a 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/module/pom.xml b/module/pom.xml index d8cbbf72..492feb04 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -1,17 +1,8 @@ diff --git a/module/src/main/java/zipkin/module/aws/elasticsearch/AWSCredentials.java b/module/src/main/java/zipkin/module/aws/elasticsearch/AWSCredentials.java index 9bdb95f0..74a405ec 100644 --- a/module/src/main/java/zipkin/module/aws/elasticsearch/AWSCredentials.java +++ b/module/src/main/java/zipkin/module/aws/elasticsearch/AWSCredentials.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 zipkin.module.aws.elasticsearch; diff --git a/module/src/main/java/zipkin/module/aws/elasticsearch/AWSSignatureVersion4.java b/module/src/main/java/zipkin/module/aws/elasticsearch/AWSSignatureVersion4.java index d54a1eaa..2f2ff725 100644 --- a/module/src/main/java/zipkin/module/aws/elasticsearch/AWSSignatureVersion4.java +++ b/module/src/main/java/zipkin/module/aws/elasticsearch/AWSSignatureVersion4.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.aws.elasticsearch; diff --git a/module/src/main/java/zipkin/module/aws/elasticsearch/ElasticsearchDomainEndpoint.java b/module/src/main/java/zipkin/module/aws/elasticsearch/ElasticsearchDomainEndpoint.java index 05a32dbe..306791a0 100644 --- a/module/src/main/java/zipkin/module/aws/elasticsearch/ElasticsearchDomainEndpoint.java +++ b/module/src/main/java/zipkin/module/aws/elasticsearch/ElasticsearchDomainEndpoint.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 zipkin.module.aws.elasticsearch; diff --git a/module/src/main/java/zipkin/module/aws/elasticsearch/ZipkinElasticsearchAwsStorageModule.java b/module/src/main/java/zipkin/module/aws/elasticsearch/ZipkinElasticsearchAwsStorageModule.java index c390e4e7..e092415e 100644 --- a/module/src/main/java/zipkin/module/aws/elasticsearch/ZipkinElasticsearchAwsStorageModule.java +++ b/module/src/main/java/zipkin/module/aws/elasticsearch/ZipkinElasticsearchAwsStorageModule.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.aws.elasticsearch; diff --git a/module/src/main/java/zipkin/module/aws/elasticsearch/ZipkinElasticsearchAwsStorageProperties.java b/module/src/main/java/zipkin/module/aws/elasticsearch/ZipkinElasticsearchAwsStorageProperties.java index ca3197a0..a16d7944 100644 --- a/module/src/main/java/zipkin/module/aws/elasticsearch/ZipkinElasticsearchAwsStorageProperties.java +++ b/module/src/main/java/zipkin/module/aws/elasticsearch/ZipkinElasticsearchAwsStorageProperties.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 zipkin.module.aws.elasticsearch; diff --git a/module/src/main/java/zipkin/module/aws/kinesis/ZipkinKinesisCollectorModule.java b/module/src/main/java/zipkin/module/aws/kinesis/ZipkinKinesisCollectorModule.java index 4d6b6a17..9ddf2acb 100644 --- a/module/src/main/java/zipkin/module/aws/kinesis/ZipkinKinesisCollectorModule.java +++ b/module/src/main/java/zipkin/module/aws/kinesis/ZipkinKinesisCollectorModule.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 zipkin.module.aws.kinesis; diff --git a/module/src/main/java/zipkin/module/aws/kinesis/ZipkinKinesisCollectorProperties.java b/module/src/main/java/zipkin/module/aws/kinesis/ZipkinKinesisCollectorProperties.java index ba90f7c5..be36dab6 100644 --- a/module/src/main/java/zipkin/module/aws/kinesis/ZipkinKinesisCollectorProperties.java +++ b/module/src/main/java/zipkin/module/aws/kinesis/ZipkinKinesisCollectorProperties.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 zipkin.module.aws.kinesis; diff --git a/module/src/main/java/zipkin/module/aws/kinesis/ZipkinKinesisCredentialsConfiguration.java b/module/src/main/java/zipkin/module/aws/kinesis/ZipkinKinesisCredentialsConfiguration.java index 7b2a895b..1db4f2ca 100644 --- a/module/src/main/java/zipkin/module/aws/kinesis/ZipkinKinesisCredentialsConfiguration.java +++ b/module/src/main/java/zipkin/module/aws/kinesis/ZipkinKinesisCredentialsConfiguration.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.aws.kinesis; diff --git a/module/src/main/java/zipkin/module/aws/sqs/ZipkinSQSCollectorModule.java b/module/src/main/java/zipkin/module/aws/sqs/ZipkinSQSCollectorModule.java index 59884947..91af483b 100644 --- a/module/src/main/java/zipkin/module/aws/sqs/ZipkinSQSCollectorModule.java +++ b/module/src/main/java/zipkin/module/aws/sqs/ZipkinSQSCollectorModule.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 zipkin.module.aws.sqs; diff --git a/module/src/main/java/zipkin/module/aws/sqs/ZipkinSQSCollectorProperties.java b/module/src/main/java/zipkin/module/aws/sqs/ZipkinSQSCollectorProperties.java index d47f8554..e67b59fe 100644 --- a/module/src/main/java/zipkin/module/aws/sqs/ZipkinSQSCollectorProperties.java +++ b/module/src/main/java/zipkin/module/aws/sqs/ZipkinSQSCollectorProperties.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 zipkin.module.aws.sqs; diff --git a/module/src/main/java/zipkin/module/aws/sqs/ZipkinSQSCredentialsConfiguration.java b/module/src/main/java/zipkin/module/aws/sqs/ZipkinSQSCredentialsConfiguration.java index 7f39895a..5c396a15 100644 --- a/module/src/main/java/zipkin/module/aws/sqs/ZipkinSQSCredentialsConfiguration.java +++ b/module/src/main/java/zipkin/module/aws/sqs/ZipkinSQSCredentialsConfiguration.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.aws.sqs; diff --git a/module/src/main/java/zipkin/module/aws/xray/ZipkinXRayStorageModule.java b/module/src/main/java/zipkin/module/aws/xray/ZipkinXRayStorageModule.java index 669c1c9e..3331a11f 100644 --- a/module/src/main/java/zipkin/module/aws/xray/ZipkinXRayStorageModule.java +++ b/module/src/main/java/zipkin/module/aws/xray/ZipkinXRayStorageModule.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 zipkin.module.aws.xray; diff --git a/module/src/main/java/zipkin/module/aws/xray/ZipkinXRayStorageProperties.java b/module/src/main/java/zipkin/module/aws/xray/ZipkinXRayStorageProperties.java index f547e27b..9e852c3b 100644 --- a/module/src/main/java/zipkin/module/aws/xray/ZipkinXRayStorageProperties.java +++ b/module/src/main/java/zipkin/module/aws/xray/ZipkinXRayStorageProperties.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 zipkin.module.aws.xray; diff --git a/module/src/test/java/zipkin/module/aws/elasticsearch/AWSSignatureVersion4Test.java b/module/src/test/java/zipkin/module/aws/elasticsearch/AWSSignatureVersion4Test.java index 5bc183c4..6723960d 100644 --- a/module/src/test/java/zipkin/module/aws/elasticsearch/AWSSignatureVersion4Test.java +++ b/module/src/test/java/zipkin/module/aws/elasticsearch/AWSSignatureVersion4Test.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.aws.elasticsearch; diff --git a/module/src/test/java/zipkin/module/aws/elasticsearch/ElasticsearchDomainEndpointTest.java b/module/src/test/java/zipkin/module/aws/elasticsearch/ElasticsearchDomainEndpointTest.java index e6836f28..337677b5 100644 --- a/module/src/test/java/zipkin/module/aws/elasticsearch/ElasticsearchDomainEndpointTest.java +++ b/module/src/test/java/zipkin/module/aws/elasticsearch/ElasticsearchDomainEndpointTest.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.aws.elasticsearch; diff --git a/module/src/test/java/zipkin/module/aws/elasticsearch/ZipkinElasticsearchAwsStorageModuleTest.java b/module/src/test/java/zipkin/module/aws/elasticsearch/ZipkinElasticsearchAwsStorageModuleTest.java index 0a8ded43..21632f5d 100644 --- a/module/src/test/java/zipkin/module/aws/elasticsearch/ZipkinElasticsearchAwsStorageModuleTest.java +++ b/module/src/test/java/zipkin/module/aws/elasticsearch/ZipkinElasticsearchAwsStorageModuleTest.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.aws.elasticsearch; diff --git a/module/src/test/java/zipkin/module/aws/kinesis/ZipkinKinesisCollectorModuleTest.java b/module/src/test/java/zipkin/module/aws/kinesis/ZipkinKinesisCollectorModuleTest.java index f21b15ac..f7f70c00 100644 --- a/module/src/test/java/zipkin/module/aws/kinesis/ZipkinKinesisCollectorModuleTest.java +++ b/module/src/test/java/zipkin/module/aws/kinesis/ZipkinKinesisCollectorModuleTest.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.aws.kinesis; diff --git a/module/src/test/java/zipkin/module/aws/sqs/ZipkinSQSCollectorModuleTest.java b/module/src/test/java/zipkin/module/aws/sqs/ZipkinSQSCollectorModuleTest.java index f7a36882..809f7a09 100644 --- a/module/src/test/java/zipkin/module/aws/sqs/ZipkinSQSCollectorModuleTest.java +++ b/module/src/test/java/zipkin/module/aws/sqs/ZipkinSQSCollectorModuleTest.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.aws.sqs; diff --git a/module/src/test/java/zipkin/module/aws/xray/ZipkinXRayStorageModuleTest.java b/module/src/test/java/zipkin/module/aws/xray/ZipkinXRayStorageModuleTest.java index d53c587f..981d6102 100644 --- a/module/src/test/java/zipkin/module/aws/xray/ZipkinXRayStorageModuleTest.java +++ b/module/src/test/java/zipkin/module/aws/xray/ZipkinXRayStorageModuleTest.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.aws.xray; diff --git a/pom.xml b/pom.xml index 0da606f4..6e8e44f0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,17 +1,8 @@ diff --git a/reporter/reporter-xray-udp/pom.xml b/reporter/reporter-xray-udp/pom.xml index 71db6aad..d2f07b66 100644 --- a/reporter/reporter-xray-udp/pom.xml +++ b/reporter/reporter-xray-udp/pom.xml @@ -1,17 +1,8 @@ diff --git a/reporter/reporter-xray-udp/src/main/java/zipkin2/reporter/xray_udp/XRayUDPReporter.java b/reporter/reporter-xray-udp/src/main/java/zipkin2/reporter/xray_udp/XRayUDPReporter.java index 51c1cd93..f042e83c 100644 --- a/reporter/reporter-xray-udp/src/main/java/zipkin2/reporter/xray_udp/XRayUDPReporter.java +++ b/reporter/reporter-xray-udp/src/main/java/zipkin2/reporter/xray_udp/XRayUDPReporter.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.xray_udp; diff --git a/reporter/reporter-xray-udp/src/test/java/zipkin2/reporter/xray_udp/XRayUDPReporterTest.java b/reporter/reporter-xray-udp/src/test/java/zipkin2/reporter/xray_udp/XRayUDPReporterTest.java index d603c6dd..6b84abd1 100644 --- a/reporter/reporter-xray-udp/src/test/java/zipkin2/reporter/xray_udp/XRayUDPReporterTest.java +++ b/reporter/reporter-xray-udp/src/test/java/zipkin2/reporter/xray_udp/XRayUDPReporterTest.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.xray_udp; diff --git a/reporter/reporter-xray-udp/src/test/java/zipkin2/storage/xray_udp/InternalStorageAccess.java b/reporter/reporter-xray-udp/src/test/java/zipkin2/storage/xray_udp/InternalStorageAccess.java index 12dbce58..d5232772 100644 --- a/reporter/reporter-xray-udp/src/test/java/zipkin2/storage/xray_udp/InternalStorageAccess.java +++ b/reporter/reporter-xray-udp/src/test/java/zipkin2/storage/xray_udp/InternalStorageAccess.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.xray_udp; diff --git a/reporter/sender-awssdk-sqs/pom.xml b/reporter/sender-awssdk-sqs/pom.xml index 4b79d8cc..91b00cd2 100644 --- a/reporter/sender-awssdk-sqs/pom.xml +++ b/reporter/sender-awssdk-sqs/pom.xml @@ -1,17 +1,8 @@ diff --git a/reporter/sender-awssdk-sqs/src/main/java/zipkin2/reporter/awssdk/sqs/AbstractSender.java b/reporter/sender-awssdk-sqs/src/main/java/zipkin2/reporter/awssdk/sqs/AbstractSender.java index 3979de1a..fb9529f5 100644 --- a/reporter/sender-awssdk-sqs/src/main/java/zipkin2/reporter/awssdk/sqs/AbstractSender.java +++ b/reporter/sender-awssdk-sqs/src/main/java/zipkin2/reporter/awssdk/sqs/AbstractSender.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.awssdk.sqs; diff --git a/reporter/sender-awssdk-sqs/src/main/java/zipkin2/reporter/awssdk/sqs/SQSAsyncSender.java b/reporter/sender-awssdk-sqs/src/main/java/zipkin2/reporter/awssdk/sqs/SQSAsyncSender.java index adb2bc45..7bd9d4b6 100644 --- a/reporter/sender-awssdk-sqs/src/main/java/zipkin2/reporter/awssdk/sqs/SQSAsyncSender.java +++ b/reporter/sender-awssdk-sqs/src/main/java/zipkin2/reporter/awssdk/sqs/SQSAsyncSender.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.awssdk.sqs; diff --git a/reporter/sender-awssdk-sqs/src/main/java/zipkin2/reporter/awssdk/sqs/SQSSender.java b/reporter/sender-awssdk-sqs/src/main/java/zipkin2/reporter/awssdk/sqs/SQSSender.java index 212e0a6f..e2739d1e 100644 --- a/reporter/sender-awssdk-sqs/src/main/java/zipkin2/reporter/awssdk/sqs/SQSSender.java +++ b/reporter/sender-awssdk-sqs/src/main/java/zipkin2/reporter/awssdk/sqs/SQSSender.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.awssdk.sqs; diff --git a/reporter/sender-awssdk-sqs/src/test/java/zipkin2/reporter/awssdk/sqs/SQSAsyncSenderTest.java b/reporter/sender-awssdk-sqs/src/test/java/zipkin2/reporter/awssdk/sqs/SQSAsyncSenderTest.java index bc293364..a019dec1 100644 --- a/reporter/sender-awssdk-sqs/src/test/java/zipkin2/reporter/awssdk/sqs/SQSAsyncSenderTest.java +++ b/reporter/sender-awssdk-sqs/src/test/java/zipkin2/reporter/awssdk/sqs/SQSAsyncSenderTest.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.awssdk.sqs; diff --git a/reporter/sender-awssdk-sqs/src/test/java/zipkin2/reporter/awssdk/sqs/SQSSenderTest.java b/reporter/sender-awssdk-sqs/src/test/java/zipkin2/reporter/awssdk/sqs/SQSSenderTest.java index 3c32754d..16c9df8d 100644 --- a/reporter/sender-awssdk-sqs/src/test/java/zipkin2/reporter/awssdk/sqs/SQSSenderTest.java +++ b/reporter/sender-awssdk-sqs/src/test/java/zipkin2/reporter/awssdk/sqs/SQSSenderTest.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.awssdk.sqs; diff --git a/reporter/sender-kinesis/pom.xml b/reporter/sender-kinesis/pom.xml index 07a83984..5621f095 100644 --- a/reporter/sender-kinesis/pom.xml +++ b/reporter/sender-kinesis/pom.xml @@ -1,17 +1,8 @@ diff --git a/reporter/sender-kinesis/src/main/java/zipkin2/reporter/kinesis/KinesisSender.java b/reporter/sender-kinesis/src/main/java/zipkin2/reporter/kinesis/KinesisSender.java index 5328a751..129b169f 100644 --- a/reporter/sender-kinesis/src/main/java/zipkin2/reporter/kinesis/KinesisSender.java +++ b/reporter/sender-kinesis/src/main/java/zipkin2/reporter/kinesis/KinesisSender.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.kinesis; diff --git a/reporter/sender-kinesis/src/test/java/zipkin2/reporter/kinesis/KinesisSenderTest.java b/reporter/sender-kinesis/src/test/java/zipkin2/reporter/kinesis/KinesisSenderTest.java index c0970b00..39ee804b 100644 --- a/reporter/sender-kinesis/src/test/java/zipkin2/reporter/kinesis/KinesisSenderTest.java +++ b/reporter/sender-kinesis/src/test/java/zipkin2/reporter/kinesis/KinesisSenderTest.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.kinesis; diff --git a/reporter/sender-sqs/pom.xml b/reporter/sender-sqs/pom.xml index 12ed784a..eca28b41 100644 --- a/reporter/sender-sqs/pom.xml +++ b/reporter/sender-sqs/pom.xml @@ -1,17 +1,8 @@ diff --git a/reporter/sender-sqs/src/main/java/zipkin2/reporter/sqs/SQSSender.java b/reporter/sender-sqs/src/main/java/zipkin2/reporter/sqs/SQSSender.java index 450619a1..0105d3d5 100644 --- a/reporter/sender-sqs/src/main/java/zipkin2/reporter/sqs/SQSSender.java +++ b/reporter/sender-sqs/src/main/java/zipkin2/reporter/sqs/SQSSender.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.sqs; diff --git a/reporter/sender-sqs/src/test/java/zipkin2/reporter/sqs/SQSSenderTest.java b/reporter/sender-sqs/src/test/java/zipkin2/reporter/sqs/SQSSenderTest.java index b4bf7963..a05718d1 100644 --- a/reporter/sender-sqs/src/test/java/zipkin2/reporter/sqs/SQSSenderTest.java +++ b/reporter/sender-sqs/src/test/java/zipkin2/reporter/sqs/SQSSenderTest.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.sqs; 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/xray-udp/pom.xml b/storage/xray-udp/pom.xml index f408431c..adaefeea 100644 --- a/storage/xray-udp/pom.xml +++ b/storage/xray-udp/pom.xml @@ -1,17 +1,8 @@ diff --git a/storage/xray-udp/src/main/java/zipkin2/storage/xray_udp/UDPMessageEncoder.java b/storage/xray-udp/src/main/java/zipkin2/storage/xray_udp/UDPMessageEncoder.java index b8358a7d..2fc82a46 100644 --- a/storage/xray-udp/src/main/java/zipkin2/storage/xray_udp/UDPMessageEncoder.java +++ b/storage/xray-udp/src/main/java/zipkin2/storage/xray_udp/UDPMessageEncoder.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.xray_udp; diff --git a/storage/xray-udp/src/main/java/zipkin2/storage/xray_udp/XRayUDPStorage.java b/storage/xray-udp/src/main/java/zipkin2/storage/xray_udp/XRayUDPStorage.java index f2b14007..524fec03 100644 --- a/storage/xray-udp/src/main/java/zipkin2/storage/xray_udp/XRayUDPStorage.java +++ b/storage/xray-udp/src/main/java/zipkin2/storage/xray_udp/XRayUDPStorage.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.xray_udp; diff --git a/storage/xray-udp/src/test/java/zipkin2/storage/xray_udp/UDPMessageEncoderTest.java b/storage/xray-udp/src/test/java/zipkin2/storage/xray_udp/UDPMessageEncoderTest.java index 4c31a8b5..8bcf7941 100644 --- a/storage/xray-udp/src/test/java/zipkin2/storage/xray_udp/UDPMessageEncoderTest.java +++ b/storage/xray-udp/src/test/java/zipkin2/storage/xray_udp/UDPMessageEncoderTest.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.xray_udp; diff --git a/storage/xray-udp/src/test/java/zipkin2/storage/xray_udp/XRayUDPStorageTest.java b/storage/xray-udp/src/test/java/zipkin2/storage/xray_udp/XRayUDPStorageTest.java index 039dc73f..577ba54d 100644 --- a/storage/xray-udp/src/test/java/zipkin2/storage/xray_udp/XRayUDPStorageTest.java +++ b/storage/xray-udp/src/test/java/zipkin2/storage/xray_udp/XRayUDPStorageTest.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.xray_udp;