From 38607adc79267cd2b7e373a142ac37e410888c4d Mon Sep 17 00:00:00 2001 From: github-team-consul-core Date: Wed, 30 Oct 2024 11:46:01 -0600 Subject: [PATCH 1/3] update version in 1.1.x to 1.1.14-dev --- pkg/version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/version/version.go b/pkg/version/version.go index 940f0dc2..5a9418e1 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -14,7 +14,7 @@ var ( // // Version must conform to the format expected by github.com/hashicorp/go-version // for tests to work. - Version = "1.1.13" + Version = "1.1.14" // 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 From 5592ed0a69a47494392f0dff6bebb7189ae59af0 Mon Sep 17 00:00:00 2001 From: John Murret Date: Fri, 1 Nov 2024 16:06:45 -0600 Subject: [PATCH 2/3] update changelog and makefile --- CHANGELOG.md | 7 +++++++ Makefile | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6adaf1b..3736a6f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 1.1.13 (November 1, 2024) + +SECURITY: + +* Upgrade Go to use 1.22.7. This addresses CVE + [CVE-2024-34155](https://nvd.nist.gov/vuln/detail/CVE-2024-34155) [[GH-608](https://github.com/hashicorp/consul-dataplane/pull/608)] + ## 1.1.12 (July 15, 2024) SECURITY: diff --git a/Makefile b/Makefile index 123e7524..bdfcd875 100644 --- a/Makefile +++ b/Makefile @@ -123,8 +123,8 @@ copy-bootstrap-config: ## copy bootstrap config .PHONY: changelog changelog: ## build change log ifdef DP_LAST_RELEASE_GIT_TAG - @changelog-build \ - -last-release $(DP_LAST_RELEASE_GIT_TAG) \ + go run github.com/hashicorp/go-changelog/cmd/changelog-build@latest \ + -last-release $(DP_LAST_RELEASE_GIT_TAG) \ -entries-dir .changelog/ \ -changelog-template .changelog/changelog.tmpl \ -note-template .changelog/note.tmpl \ From 7c9440ec08f76ecd306fb7a061d46b1e77bc8777 Mon Sep 17 00:00:00 2001 From: John Murret Date: Fri, 1 Nov 2024 16:16:50 -0600 Subject: [PATCH 3/3] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bdfcd875..2e63dc23 100644 --- a/Makefile +++ b/Makefile @@ -124,7 +124,7 @@ copy-bootstrap-config: ## copy bootstrap config changelog: ## build change log ifdef DP_LAST_RELEASE_GIT_TAG go run github.com/hashicorp/go-changelog/cmd/changelog-build@latest \ - -last-release $(DP_LAST_RELEASE_GIT_TAG) \ + -last-release $(DP_LAST_RELEASE_GIT_TAG) \ -entries-dir .changelog/ \ -changelog-template .changelog/changelog.tmpl \ -note-template .changelog/note.tmpl \