From 4b6b2f14f922a827e3c219079d01983de31da270 Mon Sep 17 00:00:00 2001 From: Wilken Rivera Date: Tue, 28 Nov 2023 18:01:10 +0000 Subject: [PATCH] backport of commit 401934871c1fc6b15221e58d6d028676e24da1b6 --- CODEOWNERS | 2 ++ LICENSE | 19 +++++++++---------- command/hcl2_upgrade.go | 1 + version/VERSION | 2 +- version/version.go | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index b92152c7348..0efb6b1ac47 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -2,3 +2,5 @@ # release configuration +/.release/ @hashicorp/release-engineering +/.github/workflows/build.yml @hashicorp/release-engineering diff --git a/LICENSE b/LICENSE index 0918b4a93f4..f7d6cdd08cf 100644 --- a/LICENSE +++ b/LICENSE @@ -1,33 +1,32 @@ License text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved. -"Business Source License" is a trademark of MariaDB Corporation Ab. +“Business Source License” is a trademark of MariaDB Corporation Ab. Parameters Licensor: HashiCorp, Inc. -Licensed Work: Packer Version 1.10.0 or later. The Licensed Work is (c) 2023 - HashiCorp, Inc. +Licensed Work: Packer 1.10.0. The Licensed Work is (c) 2023 HashiCorp, Inc. Additional Use Grant: You may make production use of the Licensed Work, provided Your use does not include offering the Licensed Work to third parties on a hosted or embedded basis in order to compete with - HashiCorp's paid version(s) of the Licensed Work. For purposes + HashiCorp’s paid version(s) of the Licensed Work. For purposes of this license: - A "competitive offering" is a Product that is offered to third + A “competitive offering” is a Product that is offered to third parties on a paid basis, including through paid support arrangements, that significantly overlaps with the capabilities - of HashiCorp's paid version(s) of the Licensed Work. If Your + of HashiCorp’s paid version(s) of the Licensed Work. If Your Product is not a competitive offering when You first make it generally available, it will not become a competitive offering later due to HashiCorp releasing a new version of the Licensed Work with additional capabilities. In addition, Products that are not provided on a paid basis are not competitive. - "Product" means software that is offered to end users to manage + “Product” means software that is offered to end users to manage in their own environments or offered as a service on a hosted basis. - "Embedded" means including the source code or executable code - from the Licensed Work in a competitive offering. "Embedded" + “Embedded” means including the source code or executable code + from the Licensed Work in a competitive offering. “Embedded” also means packaging the competitive offering in such a way that the Licensed Work must be accessed or downloaded for the competitive offering to operate. @@ -86,7 +85,7 @@ Licensor or its affiliates (provided that you may use a trademark or logo of Licensor as expressly required by this License). TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON -AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS, +AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS, EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND TITLE. diff --git a/command/hcl2_upgrade.go b/command/hcl2_upgrade.go index 3393ee86bad..08ffa767e99 100644 --- a/command/hcl2_upgrade.go +++ b/command/hcl2_upgrade.go @@ -104,6 +104,7 @@ var knownPlugins = map[string]string{ "googlecompute": "github.com/hashicorp/googlecompute", "qemu": "github.com/hashicorp/qemu", "vagrant": "github.com/hashicorp/vagrant", + "virtualbox": "github.com/hashicorp/virtualbox", "vmware": "github.com/hashicorp/vmware", "vsphere": "github.com/hashicorp/vsphere", } diff --git a/version/VERSION b/version/VERSION index 169f19b4901..81c871de46b 100644 --- a/version/VERSION +++ b/version/VERSION @@ -1 +1 @@ -1.11.0 \ No newline at end of file +1.10.0 diff --git a/version/version.go b/version/version.go index a7eec6fd4bc..2df08d2d71b 100644 --- a/version/version.go +++ b/version/version.go @@ -22,7 +22,7 @@ var ( // A pre-release marker for the version can also be specified (e.g -dev). If this is omitted // The main version number that is being run at the moment. - Version = "1.11.0" + Version = "1.10.0" // A pre-release marker for the version. If this is "" (empty string) // then it means that it is a final release. Otherwise, this is a pre-release