From a7135c000b55fbc2a346baf1dbf8169beedccf0f Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Thu, 10 Aug 2023 17:05:19 -0700 Subject: [PATCH] Apply license adjustments and fixes Add configuration file for automated license modifications, remove automated licese modifications from specific locations, and update the license set in the gem specification. --- .copywrite.hcl | 15 +++++++++++++++ internal/pkg/defaults/.travis.yml | 3 --- internal/pkg/defaults/defaults.go | 3 --- internal/pkg/defaults/defaults_test.go | 3 --- internal/pkg/defaults/internal/fixture/test.go | 3 --- internal/pkg/defaults/setter.go | 3 --- internal/pkg/spinner/.travis.yml | 3 --- internal/pkg/spinner/_example/main.go | 3 --- internal/pkg/spinner/character_sets.go | 3 --- internal/pkg/spinner/spinner.go | 3 --- internal/server/bindata_ui.go | 3 --- .../gen/ruby/proto/ruby_vagrant/ruby-server_pb.rb | 3 --- .../proto/ruby_vagrant/ruby-server_services_pb.rb | 3 --- .../gen/ruby/proto/vagrant_server/server_pb.rb | 3 --- .../proto/vagrant_server/server_services_pb.rb | 3 --- .../protobufs/proto/plugin/grpc_broker_pb.rb | 3 --- .../proto/plugin/grpc_broker_services_pb.rb | 3 --- lib/vagrant/protobufs/proto/protostructure_pb.rb | 3 --- .../proto/ruby_vagrant/ruby-server_pb.rb | 3 --- .../proto/ruby_vagrant/ruby-server_services_pb.rb | 3 --- .../proto/vagrant_plugin_sdk/plugin_pb.rb | 3 --- .../vagrant_plugin_sdk/plugin_services_pb.rb | 3 --- .../protobufs/proto/vagrant_server/server_pb.rb | 3 --- .../proto/vagrant_server/server_services_pb.rb | 3 --- vagrant.gemspec | 2 +- 25 files changed, 16 insertions(+), 70 deletions(-) create mode 100644 .copywrite.hcl diff --git a/.copywrite.hcl b/.copywrite.hcl new file mode 100644 index 00000000000..831000dd664 --- /dev/null +++ b/.copywrite.hcl @@ -0,0 +1,15 @@ +schema_version = 1 + +project { + license = "BUSL-1.1" + copyright_year = 2010 + + header_ignore = [ + "internal/pkg/defaults/**", + "internal/pkg/spinner/**", + "internal/server/bindata_ui.go", + "internal/server/gen/**", + "lib/vagrant/protobufs/**", + "thirdparty/**", + ] +} diff --git a/internal/pkg/defaults/.travis.yml b/internal/pkg/defaults/.travis.yml index eaf00fd02ca..560c6878ac2 100644 --- a/internal/pkg/defaults/.travis.yml +++ b/internal/pkg/defaults/.travis.yml @@ -1,6 +1,3 @@ -# Copyright (c) HashiCorp, Inc. -# SPDX-License-Identifier: BUSL-1.1 - language: go go: 1.13 diff --git a/internal/pkg/defaults/defaults.go b/internal/pkg/defaults/defaults.go index b3b0c79b39b..21af52a5c50 100644 --- a/internal/pkg/defaults/defaults.go +++ b/internal/pkg/defaults/defaults.go @@ -1,6 +1,3 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: BUSL-1.1 - package defaults import ( diff --git a/internal/pkg/defaults/defaults_test.go b/internal/pkg/defaults/defaults_test.go index 9251caec03d..78d31b05eb5 100644 --- a/internal/pkg/defaults/defaults_test.go +++ b/internal/pkg/defaults/defaults_test.go @@ -1,6 +1,3 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: BUSL-1.1 - package defaults import ( diff --git a/internal/pkg/defaults/internal/fixture/test.go b/internal/pkg/defaults/internal/fixture/test.go index fda22a90dd8..94c3d416ebc 100644 --- a/internal/pkg/defaults/internal/fixture/test.go +++ b/internal/pkg/defaults/internal/fixture/test.go @@ -1,6 +1,3 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: BUSL-1.1 - package fixture // Sample is a struct that contains 1 exported field and 1 unexported field diff --git a/internal/pkg/defaults/setter.go b/internal/pkg/defaults/setter.go index 3db1e51bbad..1f64aa65993 100644 --- a/internal/pkg/defaults/setter.go +++ b/internal/pkg/defaults/setter.go @@ -1,6 +1,3 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: BUSL-1.1 - package defaults // Setter is an interface for setting default values diff --git a/internal/pkg/spinner/.travis.yml b/internal/pkg/spinner/.travis.yml index 65058399b09..defaf2def9d 100644 --- a/internal/pkg/spinner/.travis.yml +++ b/internal/pkg/spinner/.travis.yml @@ -1,6 +1,3 @@ -# Copyright (c) HashiCorp, Inc. -# SPDX-License-Identifier: BUSL-1.1 - language: go go: - 1.13 diff --git a/internal/pkg/spinner/_example/main.go b/internal/pkg/spinner/_example/main.go index 70b782bb0a8..fb14f679b72 100644 --- a/internal/pkg/spinner/_example/main.go +++ b/internal/pkg/spinner/_example/main.go @@ -1,6 +1,3 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: BUSL-1.1 - // Example application that uses all of the available API options. package main diff --git a/internal/pkg/spinner/character_sets.go b/internal/pkg/spinner/character_sets.go index ce586e61fb4..a7290321f64 100644 --- a/internal/pkg/spinner/character_sets.go +++ b/internal/pkg/spinner/character_sets.go @@ -1,6 +1,3 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: BUSL-1.1 - package spinner const ( diff --git a/internal/pkg/spinner/spinner.go b/internal/pkg/spinner/spinner.go index 15ef8eed491..12e6454020a 100644 --- a/internal/pkg/spinner/spinner.go +++ b/internal/pkg/spinner/spinner.go @@ -1,6 +1,3 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: BUSL-1.1 - // 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 diff --git a/internal/server/bindata_ui.go b/internal/server/bindata_ui.go index f1281d158fa..aa6247bd352 100644 --- a/internal/server/bindata_ui.go +++ b/internal/server/bindata_ui.go @@ -1,6 +1,3 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: BUSL-1.1 - // Code generated by go-bindata. // sources: // ui/dist/android-chrome-144x144.png diff --git a/internal/server/gen/ruby/proto/ruby_vagrant/ruby-server_pb.rb b/internal/server/gen/ruby/proto/ruby_vagrant/ruby-server_pb.rb index 0f886c756cc..580524445fe 100644 --- a/internal/server/gen/ruby/proto/ruby_vagrant/ruby-server_pb.rb +++ b/internal/server/gen/ruby/proto/ruby_vagrant/ruby-server_pb.rb @@ -1,6 +1,3 @@ -# Copyright (c) HashiCorp, Inc. -# SPDX-License-Identifier: BUSL-1.1 - # Generated by the protocol buffer compiler. DO NOT EDIT! # source: proto/ruby_vagrant/ruby-server.proto diff --git a/internal/server/gen/ruby/proto/ruby_vagrant/ruby-server_services_pb.rb b/internal/server/gen/ruby/proto/ruby_vagrant/ruby-server_services_pb.rb index 73cbe46568b..8521da8772c 100644 --- a/internal/server/gen/ruby/proto/ruby_vagrant/ruby-server_services_pb.rb +++ b/internal/server/gen/ruby/proto/ruby_vagrant/ruby-server_services_pb.rb @@ -1,6 +1,3 @@ -# Copyright (c) HashiCorp, Inc. -# SPDX-License-Identifier: BUSL-1.1 - # Generated by the protocol buffer compiler. DO NOT EDIT! # Source: proto/ruby_vagrant/ruby-server.proto for package 'hashicorp.vagrant' diff --git a/internal/server/gen/ruby/proto/vagrant_server/server_pb.rb b/internal/server/gen/ruby/proto/vagrant_server/server_pb.rb index 0578f289057..698494b160d 100644 --- a/internal/server/gen/ruby/proto/vagrant_server/server_pb.rb +++ b/internal/server/gen/ruby/proto/vagrant_server/server_pb.rb @@ -1,6 +1,3 @@ -# Copyright (c) HashiCorp, Inc. -# SPDX-License-Identifier: BUSL-1.1 - # Generated by the protocol buffer compiler. DO NOT EDIT! # source: proto/vagrant_server/server.proto diff --git a/internal/server/gen/ruby/proto/vagrant_server/server_services_pb.rb b/internal/server/gen/ruby/proto/vagrant_server/server_services_pb.rb index fd21723d127..6eee38dbfa1 100644 --- a/internal/server/gen/ruby/proto/vagrant_server/server_services_pb.rb +++ b/internal/server/gen/ruby/proto/vagrant_server/server_services_pb.rb @@ -1,6 +1,3 @@ -# Copyright (c) HashiCorp, Inc. -# SPDX-License-Identifier: BUSL-1.1 - # Generated by the protocol buffer compiler. DO NOT EDIT! # Source: proto/vagrant_server/server.proto for package 'hashicorp.vagrant' diff --git a/lib/vagrant/protobufs/proto/plugin/grpc_broker_pb.rb b/lib/vagrant/protobufs/proto/plugin/grpc_broker_pb.rb index 603ea1e35e9..0e6eca8ac94 100644 --- a/lib/vagrant/protobufs/proto/plugin/grpc_broker_pb.rb +++ b/lib/vagrant/protobufs/proto/plugin/grpc_broker_pb.rb @@ -1,6 +1,3 @@ -# Copyright (c) HashiCorp, Inc. -# SPDX-License-Identifier: BUSL-1.1 - # Generated by the protocol buffer compiler. DO NOT EDIT! # source: plugin/grpc_broker.proto diff --git a/lib/vagrant/protobufs/proto/plugin/grpc_broker_services_pb.rb b/lib/vagrant/protobufs/proto/plugin/grpc_broker_services_pb.rb index f9bf9196124..0eccb7c4154 100644 --- a/lib/vagrant/protobufs/proto/plugin/grpc_broker_services_pb.rb +++ b/lib/vagrant/protobufs/proto/plugin/grpc_broker_services_pb.rb @@ -1,6 +1,3 @@ -# Copyright (c) HashiCorp, Inc. -# SPDX-License-Identifier: BUSL-1.1 - # Generated by the protocol buffer compiler. DO NOT EDIT! # Source: plugin/grpc_broker.proto for package 'plugin' diff --git a/lib/vagrant/protobufs/proto/protostructure_pb.rb b/lib/vagrant/protobufs/proto/protostructure_pb.rb index a574c4b8242..9b2a9c0c1ca 100644 --- a/lib/vagrant/protobufs/proto/protostructure_pb.rb +++ b/lib/vagrant/protobufs/proto/protostructure_pb.rb @@ -1,6 +1,3 @@ -# Copyright (c) HashiCorp, Inc. -# SPDX-License-Identifier: BUSL-1.1 - # Generated by the protocol buffer compiler. DO NOT EDIT! # source: protostructure.proto diff --git a/lib/vagrant/protobufs/proto/ruby_vagrant/ruby-server_pb.rb b/lib/vagrant/protobufs/proto/ruby_vagrant/ruby-server_pb.rb index 3974a11be5d..c271c75024e 100644 --- a/lib/vagrant/protobufs/proto/ruby_vagrant/ruby-server_pb.rb +++ b/lib/vagrant/protobufs/proto/ruby_vagrant/ruby-server_pb.rb @@ -1,6 +1,3 @@ -# Copyright (c) HashiCorp, Inc. -# SPDX-License-Identifier: BUSL-1.1 - # Generated by the protocol buffer compiler. DO NOT EDIT! # source: proto/ruby_vagrant/ruby-server.proto diff --git a/lib/vagrant/protobufs/proto/ruby_vagrant/ruby-server_services_pb.rb b/lib/vagrant/protobufs/proto/ruby_vagrant/ruby-server_services_pb.rb index b7d80681400..0bbb5d557f1 100644 --- a/lib/vagrant/protobufs/proto/ruby_vagrant/ruby-server_services_pb.rb +++ b/lib/vagrant/protobufs/proto/ruby_vagrant/ruby-server_services_pb.rb @@ -1,6 +1,3 @@ -# Copyright (c) HashiCorp, Inc. -# SPDX-License-Identifier: BUSL-1.1 - # Generated by the protocol buffer compiler. DO NOT EDIT! # Source: proto/ruby_vagrant/ruby-server.proto for package 'hashicorp.vagrant' diff --git a/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb index 928350a9fca..aa45dab04b3 100644 --- a/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb +++ b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb @@ -1,6 +1,3 @@ -# Copyright (c) HashiCorp, Inc. -# SPDX-License-Identifier: BUSL-1.1 - # Generated by the protocol buffer compiler. DO NOT EDIT! # source: vagrant_plugin_sdk/plugin.proto diff --git a/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb index e35513eae6f..cdaeb4da720 100644 --- a/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb +++ b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb @@ -1,6 +1,3 @@ -# Copyright (c) HashiCorp, Inc. -# SPDX-License-Identifier: BUSL-1.1 - # Generated by the protocol buffer compiler. DO NOT EDIT! # Source: vagrant_plugin_sdk/plugin.proto for package 'hashicorp.vagrant.sdk' diff --git a/lib/vagrant/protobufs/proto/vagrant_server/server_pb.rb b/lib/vagrant/protobufs/proto/vagrant_server/server_pb.rb index 819693dc6db..6e65a5b1071 100644 --- a/lib/vagrant/protobufs/proto/vagrant_server/server_pb.rb +++ b/lib/vagrant/protobufs/proto/vagrant_server/server_pb.rb @@ -1,6 +1,3 @@ -# Copyright (c) HashiCorp, Inc. -# SPDX-License-Identifier: BUSL-1.1 - # Generated by the protocol buffer compiler. DO NOT EDIT! # source: proto/vagrant_server/server.proto diff --git a/lib/vagrant/protobufs/proto/vagrant_server/server_services_pb.rb b/lib/vagrant/protobufs/proto/vagrant_server/server_services_pb.rb index 4dc8992bf26..a235ffad71f 100644 --- a/lib/vagrant/protobufs/proto/vagrant_server/server_services_pb.rb +++ b/lib/vagrant/protobufs/proto/vagrant_server/server_services_pb.rb @@ -1,6 +1,3 @@ -# Copyright (c) HashiCorp, Inc. -# SPDX-License-Identifier: BUSL-1.1 - # Generated by the protocol buffer compiler. DO NOT EDIT! # Source: proto/vagrant_server/server.proto for package 'hashicorp.vagrant' diff --git a/vagrant.gemspec b/vagrant.gemspec index 56781e88ff8..7bc16d54c54 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -8,7 +8,7 @@ Gem::Specification.new do |s| s.authors = ["Mitchell Hashimoto", "John Bender"] s.email = ["mitchell.hashimoto@gmail.com", "john.m.bender@gmail.com"] s.homepage = "https://www.vagrantup.com" - s.license = 'MIT' + s.license = 'BUSL-1.1' s.summary = "Build and distribute virtualized development environments." s.description = "Vagrant is a tool for building and distributing virtualized development environments."