Skip to content

Commit

Permalink
license: removes copyright year and uses SPDX ID (#123)
Browse files Browse the repository at this point in the history
This project wasn't using the license plugin, but had some copy-paste
license that should be coherent with other projects. Similarly, we don't
need to specify default fetch-depth on checkout.

See openzipkin/zipkin-reporter-java#257

Signed-off-by: Adrian Cole <[email protected]>
  • Loading branch information
codefromthecrypt authored Apr 14, 2024
1 parent 152af38 commit 2541c60
Show file tree
Hide file tree
Showing 36 changed files with 26 additions and 191 deletions.
2 changes: 0 additions & 2 deletions .github/deploy-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/test-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/deploy-armeria-kafka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/deploy-armeria.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/deploy-jersey2-cassandra3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/deploy-netty4-grpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/deploy-webflux5-sleuth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/deploy-webflux6-micrometer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/deploy-webmvc25-jetty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/deploy-webmvc3-jetty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/deploy-webmvc4-boot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/deploy-webmvc4-jetty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-armeria-kafka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-armeria.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-jersey2-cassandra3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-netty4-grpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-webflux5-sleuth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-webflux6-micrometer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-webmvc25-jetty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-webmvc3-jetty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-webmvc4-boot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test-webmvc4-jetty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
4 changes: 0 additions & 4 deletions build-bin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,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
Expand Down Expand Up @@ -124,8 +122,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:
Expand Down
13 changes: 2 additions & 11 deletions build-bin/docker/configure_docker
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
#!/bin/sh
#
# Copyright 2015-2023 The OpenZipkin Authors
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
# in compliance with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software distributed under the License
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
# or implied. See the License for the specific language governing permissions and limitations under
# the License.
# Copyright The OpenZipkin Authors
# SPDX-License-Identifier: Apache-2.0
#

# Defends against build outages caused by Docker Hub (docker.io) pull rate limits.
Expand Down
13 changes: 2 additions & 11 deletions build-bin/docker/configure_docker_push
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
#!/bin/sh
#
# Copyright 2015-2023 The OpenZipkin Authors
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
# in compliance with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software distributed under the License
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
# or implied. See the License for the specific language governing permissions and limitations under
# the License.
# Copyright The OpenZipkin Authors
# SPDX-License-Identifier: Apache-2.0
#

# Ensures Docker is logged in and it can build multi-architecture.
Expand Down
13 changes: 2 additions & 11 deletions build-bin/docker/docker-healthcheck
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
#!/bin/sh
#
# Copyright 2015-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
#

# HEALTHCHECK for use in `docker ps`, `docker-compose ps`, or a readiness probe in k8s.
Expand Down
13 changes: 2 additions & 11 deletions build-bin/docker/docker_arch
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
#!/bin/sh
#
# Copyright 2015-2023 The OpenZipkin Authors
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
# in compliance with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software distributed under the License
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
# or implied. See the License for the specific language governing permissions and limitations under
# the License.
# Copyright The OpenZipkin Authors
# SPDX-License-Identifier: Apache-2.0
#

# This script gets a normalized name for the architecture as used in Docker. This will be a subset
Expand Down
13 changes: 2 additions & 11 deletions build-bin/docker/docker_args
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
#!/bin/sh
#
# Copyright 2015-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 builds common docker arguments used by docker_build and docker_push.
Expand Down
13 changes: 2 additions & 11 deletions build-bin/docker/docker_block_on_health
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
#!/bin/sh
#
# Copyright 2015-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
#

# Blocks until a named docker container with a valid HEALTHCHECK instruction is healthy or not:
Expand Down
13 changes: 2 additions & 11 deletions build-bin/docker/docker_build
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
#!/bin/sh
#
# Copyright 2015-2023 The OpenZipkin Authors
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
# in compliance with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software distributed under the License
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
# or implied. See the License for the specific language governing permissions and limitations under
# the License.
# Copyright The OpenZipkin Authors
# SPDX-License-Identifier: Apache-2.0
#

set -ue
Expand Down
13 changes: 2 additions & 11 deletions build-bin/docker/docker_push
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
#!/bin/sh
#
# Copyright 2015-2023 The OpenZipkin Authors
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
# in compliance with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software distributed under the License
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
# or implied. See the License for the specific language governing permissions and limitations under
# the License.
# Copyright The OpenZipkin Authors
# SPDX-License-Identifier: Apache-2.0
#

# This script pushes images to GitHub Container Registry (ghcr.io).
Expand Down
13 changes: 2 additions & 11 deletions build-bin/docker/docker_test_image
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
#!/bin/sh
#
# Copyright 2015-2023 The OpenZipkin Authors
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
# in compliance with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software distributed under the License
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
# or implied. See the License for the specific language governing permissions and limitations under
# the License.
# Copyright The OpenZipkin Authors
# SPDX-License-Identifier: Apache-2.0
#

# Tests a an image by awaiting its HEALTHCHECK.
Expand Down
Loading

0 comments on commit 2541c60

Please sign in to comment.