From 724b04ac98170a07cdcff09fa599df78086feec9 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sun, 14 Apr 2024 07:25:16 -1000 Subject: [PATCH] license: removes copyright year and uses SPDX ID (#257) As a small project, we have to conserve resources and not sign up for work that isn't required. I've recently realized many commerical and/or CNCF projects both use SPDX IDs and also don't bother with copyright year. If their legal team is ok with this, surely a volunteer team without access to one, should be, too! Doing so accomplishes the following: * significantly increases readability of files, particularly small ones * removes beginning of year maintenance, which cause a lot of FUD last year. IIRC some deployment failed and hours were spent in spite of docs. * eliminates the need to do a full source check out, just to satisfy the license plugin. This means we can use actions/checkout defaults. Same as https://github.com/openzipkin/zipkin-reporter-java/pull/257 Signed-off-by: Adrian Cole --- .editorconfig | 13 ++----------- .github/CONTRIBUTING.md | 15 +++------------ .../{readme_test.yml => test_readme.yml} | 6 +++--- .settings.xml | 13 ++----------- RELEASE.md | 17 ----------------- build-bin/docker/configure_docker | 13 ++----------- build-bin/docker/configure_docker_push | 13 ++----------- build-bin/docker/docker_arch | 13 ++----------- build-bin/docker/docker_args | 13 ++----------- build-bin/docker/docker_build | 13 ++----------- build-bin/docker/docker_push | 13 ++----------- build-bin/git/login_git | 13 ++----------- build-bin/git/version_from_trigger_tag | 13 ++----------- build-bin/gpg/configure_gpg | 13 ++----------- build-bin/maven/maven_build | 13 ++----------- build-bin/maven/maven_build_or_unjar | 13 ++----------- build-bin/maven/maven_deploy | 13 ++----------- build-bin/maven/maven_go_offline | 13 ++----------- build-bin/maven/maven_opts | 13 ++----------- build-bin/maven/maven_release | 13 ++----------- build-bin/maven/maven_unjar | 13 ++----------- cassandra3/pom.xml | 13 ++----------- .../cassandra3/CassandraDependenciesJob.java | 13 ++----------- .../cassandra3/CassandraRowToSpan.java | 13 ++----------- .../CassandraRowsToDependencyLinks.java | 13 ++----------- .../cassandra3/SpansToDependencyLinks.java | 13 ++----------- .../CassandraDependenciesJobTest.java | 13 ++----------- .../storage/cassandra/CassandraContainer.java | 13 ++----------- .../cassandra/ITCassandraDependencies.java | 13 ++----------- .../cassandra/ITCassandraDependenciesHeavy.java | 13 ++----------- docker/Dockerfile | 13 ++----------- docker/bin/start-zipkin-dependencies | 13 ++----------- docker/examples/docker-compose-cassandra3.yml | 13 ++----------- .../examples/docker-compose-elasticsearch.yml | 13 ++----------- docker/examples/docker-compose-mysql.yml | 13 ++----------- docker/examples/docker-compose.yml | 13 ++----------- .../daily/zipkin-dependencies-yesterday | 13 ++----------- .../periodic/hourly/zipkin-dependencies-today | 13 ++----------- elasticsearch/pom.xml | 13 ++----------- .../ElasticsearchDependenciesJob.java | 13 ++----------- .../TraceIdAndJsonToDependencyLinks.java | 13 ++----------- .../elasticsearch/package-info.java | 13 ++----------- .../ElasticsearchDependenciesJobTest.java | 13 ++----------- .../elasticsearch/ElasticsearchContainer.java | 13 ++----------- .../ITElasticsearchDependenciesHeavyV7.java | 13 ++----------- .../ITElasticsearchDependenciesHeavyV8.java | 13 ++----------- .../ITElasticsearchDependenciesV7.java | 13 ++----------- .../ITElasticsearchDependenciesV8.java | 13 ++----------- .../IgnoredDeprecationWarnings.java | 13 ++----------- main/pom.xml | 13 ++----------- .../zipkin2/dependencies/LogInitializer.java | 13 ++----------- .../dependencies/ZipkinDependenciesJob.java | 13 ++----------- .../java/zipkin2/dependencies/package-info.java | 13 ++----------- .../dependencies/ZipkinDependenciesJobTest.java | 13 ++----------- mysql/pom.xml | 13 ++----------- .../mysql/DependencyLinkSpanIterator.java | 13 ++----------- .../mysql/MySQLDependenciesJob.java | 13 ++----------- .../dependencies/mysql/PeekingIterator.java | 13 ++----------- .../mysql/RowsToDependencyLinks.java | 13 ++----------- .../dependencies/mysql/package-info.java | 13 ++----------- .../storage/mysql/v1/ITMySQLDependencies.java | 13 ++----------- .../mysql/v1/ITMySQLDependenciesHeavy.java | 13 ++----------- .../storage/mysql/v1/MySQLContainer.java | 13 ++----------- pom.xml | 13 ++----------- src/etc/header.txt | 13 ++----------- 65 files changed, 130 insertions(+), 714 deletions(-) rename .github/workflows/{readme_test.yml => test_readme.yml} (94%) diff --git a/.editorconfig b/.editorconfig index f316fa5f..2a1fd196 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,15 +1,6 @@ # -# Copyright 2016-2018 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 # root = true 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/readme_test.yml b/.github/workflows/test_readme.yml similarity index 94% rename from .github/workflows/readme_test.yml rename to .github/workflows/test_readme.yml index c01f310f..8fd9a001 100644 --- a/.github/workflows/readme_test.yml +++ b/.github/workflows/test_readme.yml @@ -1,6 +1,6 @@ -# yamllint --format github .github/workflows/readme_test.yml +# yamllint --format github .github/workflows/test_readme.yml --- -name: readme_test +name: test_readme # These test build commands mentioned in various README.md files. # @@ -13,7 +13,7 @@ on: paths-ignore: '**/*.md' jobs: - readme_test: + zipkin-dependencies: runs-on: ubuntu-22.04 # newest available distribution, aka jellyfish steps: - name: Checkout Repository 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/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraDependenciesJob.java b/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraDependenciesJob.java index dc0c43fa..252fcfc2 100644 --- a/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraDependenciesJob.java +++ b/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraDependenciesJob.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.dependencies.cassandra3; diff --git a/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraRowToSpan.java b/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraRowToSpan.java index 459ff36d..c97740af 100644 --- a/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraRowToSpan.java +++ b/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraRowToSpan.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.dependencies.cassandra3; diff --git a/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraRowsToDependencyLinks.java b/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraRowsToDependencyLinks.java index 0955e601..b1a5adee 100644 --- a/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraRowsToDependencyLinks.java +++ b/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/CassandraRowsToDependencyLinks.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.dependencies.cassandra3; diff --git a/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/SpansToDependencyLinks.java b/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/SpansToDependencyLinks.java index a62bf17b..820c7224 100644 --- a/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/SpansToDependencyLinks.java +++ b/cassandra3/src/main/java/zipkin2/dependencies/cassandra3/SpansToDependencyLinks.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.dependencies.cassandra3; diff --git a/cassandra3/src/test/java/zipkin2/dependencies/cassandra3/CassandraDependenciesJobTest.java b/cassandra3/src/test/java/zipkin2/dependencies/cassandra3/CassandraDependenciesJobTest.java index 1a0c0ad4..8f1f1ae1 100644 --- a/cassandra3/src/test/java/zipkin2/dependencies/cassandra3/CassandraDependenciesJobTest.java +++ b/cassandra3/src/test/java/zipkin2/dependencies/cassandra3/CassandraDependenciesJobTest.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.dependencies.cassandra3; diff --git a/cassandra3/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java b/cassandra3/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java index 85808976..26196614 100644 --- a/cassandra3/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java +++ b/cassandra3/src/test/java/zipkin2/storage/cassandra/CassandraContainer.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.cassandra; diff --git a/cassandra3/src/test/java/zipkin2/storage/cassandra/ITCassandraDependencies.java b/cassandra3/src/test/java/zipkin2/storage/cassandra/ITCassandraDependencies.java index 3bbefe37..293d9e03 100644 --- a/cassandra3/src/test/java/zipkin2/storage/cassandra/ITCassandraDependencies.java +++ b/cassandra3/src/test/java/zipkin2/storage/cassandra/ITCassandraDependencies.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.cassandra; diff --git a/cassandra3/src/test/java/zipkin2/storage/cassandra/ITCassandraDependenciesHeavy.java b/cassandra3/src/test/java/zipkin2/storage/cassandra/ITCassandraDependenciesHeavy.java index 9baed59c..e1764d07 100644 --- a/cassandra3/src/test/java/zipkin2/storage/cassandra/ITCassandraDependenciesHeavy.java +++ b/cassandra3/src/test/java/zipkin2/storage/cassandra/ITCassandraDependenciesHeavy.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.cassandra; diff --git a/docker/Dockerfile b/docker/Dockerfile index fa012f9a..544de553 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 # # java_version is used during the installation process to build or download the module jar. diff --git a/docker/bin/start-zipkin-dependencies b/docker/bin/start-zipkin-dependencies index 0c6c185e..93239680 100755 --- a/docker/bin/start-zipkin-dependencies +++ b/docker/bin/start-zipkin-dependencies @@ -1,16 +1,7 @@ #!/bin/sh # -# 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 # # ENTRYPOINT script that runs the dependencies job on-demand, processing today's spans unless CLI diff --git a/docker/examples/docker-compose-cassandra3.yml b/docker/examples/docker-compose-cassandra3.yml index a4625cf6..67ac0a07 100644 --- a/docker/examples/docker-compose-cassandra3.yml +++ b/docker/examples/docker-compose-cassandra3.yml @@ -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 # # This file uses the version 2 docker-compose file format, described here: diff --git a/docker/examples/docker-compose-elasticsearch.yml b/docker/examples/docker-compose-elasticsearch.yml index 33ef3f20..225e9c49 100644 --- a/docker/examples/docker-compose-elasticsearch.yml +++ b/docker/examples/docker-compose-elasticsearch.yml @@ -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 # # This file uses the version 2 docker-compose file format, described here: diff --git a/docker/examples/docker-compose-mysql.yml b/docker/examples/docker-compose-mysql.yml index 073cd122..a03d1060 100644 --- a/docker/examples/docker-compose-mysql.yml +++ b/docker/examples/docker-compose-mysql.yml @@ -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 # # This file uses the version 2 docker-compose file format, described here: diff --git a/docker/examples/docker-compose.yml b/docker/examples/docker-compose.yml index 9b349956..edb91ee4 100644 --- a/docker/examples/docker-compose.yml +++ b/docker/examples/docker-compose.yml @@ -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 # # This file uses the version 2 docker-compose file format, described here: diff --git a/docker/periodic/daily/zipkin-dependencies-yesterday b/docker/periodic/daily/zipkin-dependencies-yesterday index aae4efd8..e58ae62a 100755 --- a/docker/periodic/daily/zipkin-dependencies-yesterday +++ b/docker/periodic/daily/zipkin-dependencies-yesterday @@ -1,16 +1,7 @@ #!/bin/sh # -# Copyright 2016-2023 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # cd /zipkin-dependencies diff --git a/docker/periodic/hourly/zipkin-dependencies-today b/docker/periodic/hourly/zipkin-dependencies-today index ed775202..66a6a1a3 100755 --- a/docker/periodic/hourly/zipkin-dependencies-today +++ b/docker/periodic/hourly/zipkin-dependencies-today @@ -1,16 +1,7 @@ #!/bin/sh # -# Copyright 2016-2023 The OpenZipkin Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. +# Copyright The OpenZipkin Authors +# SPDX-License-Identifier: Apache-2.0 # cd /zipkin-dependencies diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml index 646ffad8..e84c16c1 100644 --- a/elasticsearch/pom.xml +++ b/elasticsearch/pom.xml @@ -1,17 +1,8 @@ diff --git a/elasticsearch/src/main/java/zipkin2/dependencies/elasticsearch/ElasticsearchDependenciesJob.java b/elasticsearch/src/main/java/zipkin2/dependencies/elasticsearch/ElasticsearchDependenciesJob.java index b094b2d0..264617e4 100644 --- a/elasticsearch/src/main/java/zipkin2/dependencies/elasticsearch/ElasticsearchDependenciesJob.java +++ b/elasticsearch/src/main/java/zipkin2/dependencies/elasticsearch/ElasticsearchDependenciesJob.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.dependencies.elasticsearch; diff --git a/elasticsearch/src/main/java/zipkin2/dependencies/elasticsearch/TraceIdAndJsonToDependencyLinks.java b/elasticsearch/src/main/java/zipkin2/dependencies/elasticsearch/TraceIdAndJsonToDependencyLinks.java index 6f4159bc..b8c95ab6 100644 --- a/elasticsearch/src/main/java/zipkin2/dependencies/elasticsearch/TraceIdAndJsonToDependencyLinks.java +++ b/elasticsearch/src/main/java/zipkin2/dependencies/elasticsearch/TraceIdAndJsonToDependencyLinks.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.dependencies.elasticsearch; diff --git a/elasticsearch/src/main/java/zipkin2/dependencies/elasticsearch/package-info.java b/elasticsearch/src/main/java/zipkin2/dependencies/elasticsearch/package-info.java index a81111f4..f79ba211 100644 --- a/elasticsearch/src/main/java/zipkin2/dependencies/elasticsearch/package-info.java +++ b/elasticsearch/src/main/java/zipkin2/dependencies/elasticsearch/package-info.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2019 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ @javax.annotation.ParametersAreNonnullByDefault package zipkin2.dependencies.elasticsearch; diff --git a/elasticsearch/src/test/java/zipkin2/dependencies/elasticsearch/ElasticsearchDependenciesJobTest.java b/elasticsearch/src/test/java/zipkin2/dependencies/elasticsearch/ElasticsearchDependenciesJobTest.java index c87872db..f53abf02 100644 --- a/elasticsearch/src/test/java/zipkin2/dependencies/elasticsearch/ElasticsearchDependenciesJobTest.java +++ b/elasticsearch/src/test/java/zipkin2/dependencies/elasticsearch/ElasticsearchDependenciesJobTest.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.dependencies.elasticsearch; diff --git a/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ElasticsearchContainer.java b/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ElasticsearchContainer.java index dafd6145..e65a3bc0 100644 --- a/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ElasticsearchContainer.java +++ b/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ElasticsearchContainer.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.elasticsearch; diff --git a/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ITElasticsearchDependenciesHeavyV7.java b/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ITElasticsearchDependenciesHeavyV7.java index f01ba8f8..af9cf239 100644 --- a/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ITElasticsearchDependenciesHeavyV7.java +++ b/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ITElasticsearchDependenciesHeavyV7.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.elasticsearch; diff --git a/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ITElasticsearchDependenciesHeavyV8.java b/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ITElasticsearchDependenciesHeavyV8.java index 937d5da7..a96a58be 100644 --- a/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ITElasticsearchDependenciesHeavyV8.java +++ b/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ITElasticsearchDependenciesHeavyV8.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.elasticsearch; diff --git a/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ITElasticsearchDependenciesV7.java b/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ITElasticsearchDependenciesV7.java index f1d8a918..e407546a 100644 --- a/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ITElasticsearchDependenciesV7.java +++ b/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ITElasticsearchDependenciesV7.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.elasticsearch; diff --git a/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ITElasticsearchDependenciesV8.java b/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ITElasticsearchDependenciesV8.java index 073e90f8..c5674845 100644 --- a/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ITElasticsearchDependenciesV8.java +++ b/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/ITElasticsearchDependenciesV8.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.elasticsearch; diff --git a/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/IgnoredDeprecationWarnings.java b/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/IgnoredDeprecationWarnings.java index e373c19b..ea3f632e 100644 --- a/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/IgnoredDeprecationWarnings.java +++ b/elasticsearch/src/test/java/zipkin2/storage/elasticsearch/IgnoredDeprecationWarnings.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.elasticsearch; diff --git a/main/pom.xml b/main/pom.xml index d48d4649..e7f38ee8 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -1,17 +1,8 @@ diff --git a/main/src/main/java/zipkin2/dependencies/LogInitializer.java b/main/src/main/java/zipkin2/dependencies/LogInitializer.java index 732d1448..70a13366 100644 --- a/main/src/main/java/zipkin2/dependencies/LogInitializer.java +++ b/main/src/main/java/zipkin2/dependencies/LogInitializer.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2019 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.dependencies; diff --git a/main/src/main/java/zipkin2/dependencies/ZipkinDependenciesJob.java b/main/src/main/java/zipkin2/dependencies/ZipkinDependenciesJob.java index f070a333..7265d1cd 100644 --- a/main/src/main/java/zipkin2/dependencies/ZipkinDependenciesJob.java +++ b/main/src/main/java/zipkin2/dependencies/ZipkinDependenciesJob.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.dependencies; diff --git a/main/src/main/java/zipkin2/dependencies/package-info.java b/main/src/main/java/zipkin2/dependencies/package-info.java index ba55d0e3..9daaa768 100644 --- a/main/src/main/java/zipkin2/dependencies/package-info.java +++ b/main/src/main/java/zipkin2/dependencies/package-info.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2019 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ @javax.annotation.ParametersAreNonnullByDefault package zipkin2.dependencies; diff --git a/main/src/test/java/zipkin2/dependencies/ZipkinDependenciesJobTest.java b/main/src/test/java/zipkin2/dependencies/ZipkinDependenciesJobTest.java index 28346a53..44faca57 100644 --- a/main/src/test/java/zipkin2/dependencies/ZipkinDependenciesJobTest.java +++ b/main/src/test/java/zipkin2/dependencies/ZipkinDependenciesJobTest.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.dependencies; diff --git a/mysql/pom.xml b/mysql/pom.xml index f9f18dc1..e6edec55 100644 --- a/mysql/pom.xml +++ b/mysql/pom.xml @@ -1,17 +1,8 @@ diff --git a/mysql/src/main/java/zipkin2/dependencies/mysql/DependencyLinkSpanIterator.java b/mysql/src/main/java/zipkin2/dependencies/mysql/DependencyLinkSpanIterator.java index d564b654..3293cf98 100644 --- a/mysql/src/main/java/zipkin2/dependencies/mysql/DependencyLinkSpanIterator.java +++ b/mysql/src/main/java/zipkin2/dependencies/mysql/DependencyLinkSpanIterator.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2019 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.dependencies.mysql; diff --git a/mysql/src/main/java/zipkin2/dependencies/mysql/MySQLDependenciesJob.java b/mysql/src/main/java/zipkin2/dependencies/mysql/MySQLDependenciesJob.java index 0b3f4071..495c8d25 100644 --- a/mysql/src/main/java/zipkin2/dependencies/mysql/MySQLDependenciesJob.java +++ b/mysql/src/main/java/zipkin2/dependencies/mysql/MySQLDependenciesJob.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.dependencies.mysql; diff --git a/mysql/src/main/java/zipkin2/dependencies/mysql/PeekingIterator.java b/mysql/src/main/java/zipkin2/dependencies/mysql/PeekingIterator.java index 3b27ae71..702e93db 100644 --- a/mysql/src/main/java/zipkin2/dependencies/mysql/PeekingIterator.java +++ b/mysql/src/main/java/zipkin2/dependencies/mysql/PeekingIterator.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2019 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.dependencies.mysql; diff --git a/mysql/src/main/java/zipkin2/dependencies/mysql/RowsToDependencyLinks.java b/mysql/src/main/java/zipkin2/dependencies/mysql/RowsToDependencyLinks.java index 3fb1cbff..6caadc1a 100644 --- a/mysql/src/main/java/zipkin2/dependencies/mysql/RowsToDependencyLinks.java +++ b/mysql/src/main/java/zipkin2/dependencies/mysql/RowsToDependencyLinks.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2023 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ package zipkin2.dependencies.mysql; diff --git a/mysql/src/main/java/zipkin2/dependencies/mysql/package-info.java b/mysql/src/main/java/zipkin2/dependencies/mysql/package-info.java index c0abe145..50bb0d81 100644 --- a/mysql/src/main/java/zipkin2/dependencies/mysql/package-info.java +++ b/mysql/src/main/java/zipkin2/dependencies/mysql/package-info.java @@ -1,15 +1,6 @@ /* - * Copyright 2016-2019 The OpenZipkin Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. + * Copyright The OpenZipkin Authors + * SPDX-License-Identifier: Apache-2.0 */ @javax.annotation.ParametersAreNonnullByDefault package zipkin2.dependencies.mysql; diff --git a/mysql/src/test/java/zipkin2/storage/mysql/v1/ITMySQLDependencies.java b/mysql/src/test/java/zipkin2/storage/mysql/v1/ITMySQLDependencies.java index e2c6a3e2..c33c278a 100644 --- a/mysql/src/test/java/zipkin2/storage/mysql/v1/ITMySQLDependencies.java +++ b/mysql/src/test/java/zipkin2/storage/mysql/v1/ITMySQLDependencies.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.mysql.v1; diff --git a/mysql/src/test/java/zipkin2/storage/mysql/v1/ITMySQLDependenciesHeavy.java b/mysql/src/test/java/zipkin2/storage/mysql/v1/ITMySQLDependenciesHeavy.java index 47b65e0e..647d48e6 100644 --- a/mysql/src/test/java/zipkin2/storage/mysql/v1/ITMySQLDependenciesHeavy.java +++ b/mysql/src/test/java/zipkin2/storage/mysql/v1/ITMySQLDependenciesHeavy.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.mysql.v1; diff --git a/mysql/src/test/java/zipkin2/storage/mysql/v1/MySQLContainer.java b/mysql/src/test/java/zipkin2/storage/mysql/v1/MySQLContainer.java index 6a3a29af..8965052c 100644 --- a/mysql/src/test/java/zipkin2/storage/mysql/v1/MySQLContainer.java +++ b/mysql/src/test/java/zipkin2/storage/mysql/v1/MySQLContainer.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.mysql.v1; diff --git a/pom.xml b/pom.xml index 19fb51d0..60d1ffce 100755 --- a/pom.xml +++ b/pom.xml @@ -1,17 +1,8 @@ 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