Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[COMPLIANCE] License changes #18443

Merged
merged 19 commits into from
Aug 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
17fdae4
Adding explicit MPL license for sub-package
hashicorp-copywrite[bot] Aug 10, 2023
6026733
Adding explicit MPL license for sub-package
hashicorp-copywrite[bot] Aug 10, 2023
4956cf0
Updating the license from MPL to Business Source License
hashicorp-copywrite[bot] Aug 10, 2023
078a0be
add missing license headers
hashicorp-copywrite[bot] Aug 10, 2023
bda6e8a
Update copyright file headers to BUSL-1.1
hashicorp-copywrite[bot] Aug 10, 2023
478723b
Update copyright file headers to BUSL-1.1
hashicorp-copywrite[bot] Aug 10, 2023
96006ee
Update copyright file headers to BUSL-1.1
hashicorp-copywrite[bot] Aug 10, 2023
81cddb1
Update copyright file headers to BUSL-1.1
hashicorp-copywrite[bot] Aug 10, 2023
96eb3f7
Update copyright file headers to BUSL-1.1
hashicorp-copywrite[bot] Aug 10, 2023
36ae681
Update copyright file headers to BUSL-1.1
hashicorp-copywrite[bot] Aug 10, 2023
7f99f66
Update copyright file headers to BUSL-1.1
hashicorp-copywrite[bot] Aug 10, 2023
4cbec60
Update copyright file headers to BUSL-1.1
hashicorp-copywrite[bot] Aug 10, 2023
4d0ade0
Update copyright file headers to BUSL-1.1
hashicorp-copywrite[bot] Aug 10, 2023
2d36075
Update copyright file headers to BUSL-1.1
hashicorp-copywrite[bot] Aug 10, 2023
5d2c642
Update copyright file headers to BUSL-1.1
hashicorp-copywrite[bot] Aug 10, 2023
29f1874
Update copyright file headers to BUSL-1.1
hashicorp-copywrite[bot] Aug 10, 2023
763c1b3
Update copyright file headers to BUSL-1.1
hashicorp-copywrite[bot] Aug 10, 2023
b4084ae
Update copyright file headers to BUSL-1.1
hashicorp-copywrite[bot] Aug 10, 2023
78683b4
Update copyright file headers to BUSL-1.1
hashicorp-copywrite[bot] Aug 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 4 additions & 2 deletions .copywrite.hcl
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
schema_version = 1

project {
license = "MPL-2.0"
copyright_year = 2013
license = "BUSL-1.1"
copyright_year = 2023

# (OPTIONAL) A list of globs that should not have copyright/license headers.
# Supports doublestar glob patterns for more flexibility in defining which
Expand All @@ -25,5 +25,7 @@ project {
"agent/proxycfg/proxycfg.deepcopy.go",
"agent/grpc-middleware/rate_limit_mappings.gen.go",
"agent/uiserver/dist/**",
"sdk/**",
"api/**",
]
}
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1

blank_issues_enabled: false
contact_links:
Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1

version: 2
updates:
Expand Down
2 changes: 1 addition & 1 deletion .github/pr-labeler.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1

pr/dependencies:
- vendor/**/*
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/changelog_checker.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1


set -euo pipefail
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/get_runner_classes.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1

#
# This script generates tag-sets that can be used as runs-on: values to select runners.
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/get_runner_classes_windows.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1

#
# This script generates tag-sets that can be used as runs-on: values to select runners.
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/metrics_checker.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1

set -uo pipefail

Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/notify_slack.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1


set -uo pipefail
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/rerun_fails_report.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1

#
# Add a comment on the github PR if there were any rerun tests.
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/set_test_package_matrix.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1

set -euo pipefail
export RUNNER_COUNT=$1
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/verify_artifact.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1


set -euo pipefail
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/verify_bin.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1


set -euo pipefail
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/verify_deb.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1


set -euo pipefail
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/verify_docker.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1


set -euo pipefail
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/verify_envoy_version.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1

set -euo pipefail

Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/verify_rpm.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1


set -euo pipefail
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1

linters:
disable-all: true
Expand Down
2 changes: 1 addition & 1 deletion .release/ci.hcl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1

schema = "1"

Expand Down
2 changes: 1 addition & 1 deletion .release/docker/docker-entrypoint-ubi.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/dumb-init /bin/sh
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1

set -e

Expand Down
3 changes: 3 additions & 0 deletions .release/docker/docker-entrypoint-windows.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#!/usr/bin/dumb-init /bin/sh
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1

set -e

# Note above that we run dumb-init as PID 1 in order to reap zombie processes
Expand Down
2 changes: 1 addition & 1 deletion .release/docker/docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/dumb-init /bin/sh
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1

set -e

Expand Down
2 changes: 1 addition & 1 deletion .release/linux/package/etc/consul.d/consul.hcl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1

# Full configuration options can be found at https://www.consul.io/docs/agent/config

Expand Down
2 changes: 1 addition & 1 deletion .release/release-metadata.hcl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1

url_docker_registry_dockerhub = "https://hub.docker.com/r/hashicorp/consul"
url_docker_registry_ecr = "https://gallery.ecr.aws/hashicorp/consul"
Expand Down
2 changes: 1 addition & 1 deletion .release/security-scan.hcl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1

container {
dependencies = true
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0
# SPDX-License-Identifier: BUSL-1.1

# This Dockerfile contains multiple targets.
# Use 'docker build --target=<name> .' to build one.
Expand Down
Loading