Skip to content

Commit b367872

Browse files
authored
Merge pull request #2 from jenkins-x-plugins/go1-22
chore: upgrade to go 1.22
2 parents 46dbece + 82e19bb commit b367872

File tree

26 files changed

+469
-1413
lines changed

26 files changed

+469
-1413
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ORG := jenkins-x-plugins
1313
ORG_REPO := $(ORG)/$(NAME)
1414
RELEASE_ORG_REPO := $(ORG_REPO)
1515
ROOT_PACKAGE := github.com/$(ORG_REPO)
16-
GO_VERSION := 1.13
16+
GO_VERSION := 1.22
1717
GO_DEPENDENCIES := $(call rwildcard,pkg/,*.go) $(call rwildcard,cmd/,*.go)
1818

1919
GOPRIVATE := github.com/jenkins-x/jx-apps,github.com/jenkins-x/jx-helpers

OWNERS

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
approvers:
2-
- rawlingsj
3-
- jstrachan
4-
- rajdavies
2+
- maintainers
53
reviewers:
6-
- rawlingsj
7-
- jstrachan
8-
- rajdavies
4+
- maintainers

OWNERS_ALIASES

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
aliases:
2-
- rawlingsj
3-
best-approvers:
4-
- rawlingsj
5-
best-reviewers:
6-
- rawlingsj
1+
foreignAliases:
2+
- name: jx-community
3+
org: jenkins-x

cmd/app/main-win.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build windows
12
// +build windows
23

34
package app

cmd/app/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package app

cmd/docs/main.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
66
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
7+
// http://www.apache.org/licenses/LICENSE-2.0
88
//
99
// Unless required by applicable law or agreed to in writing, software
1010
// distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,7 +15,6 @@ package main
1515

1616
import (
1717
"fmt"
18-
"io/ioutil"
1918
"log"
2019
"os"
2120
"path/filepath"
@@ -83,7 +82,7 @@ func loadLongDescription(cmd *cobra.Command, path ...string) error {
8382
continue
8483
}
8584

86-
content, err := ioutil.ReadFile(fullpath)
85+
content, err := os.ReadFile(fullpath)
8786
if err != nil {
8887
return err
8988
}

cmd/docs/md_docs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
66
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
7+
// http://www.apache.org/licenses/LICENSE-2.0
88
//
99
// Unless required by applicable law or agreed to in writing, software
1010
// distributed under the License is distributed on an "AS IS" BASIS,

go.mod

Lines changed: 74 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,82 @@ module github.com/jenkins-x-plugins/jx-charter
22

33
require (
44
github.com/cpuguy83/go-md2man v1.0.10
5-
github.com/fatih/color v1.10.0 // indirect
6-
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
7-
github.com/gorilla/mux v1.7.4
8-
github.com/hashicorp/golang-lru v0.5.4 // indirect
9-
github.com/jenkins-x/jx-api/v4 v4.1.5
10-
github.com/jenkins-x/jx-helpers/v3 v3.0.130
11-
github.com/jenkins-x/jx-kube-client/v3 v3.0.2
12-
github.com/jenkins-x/jx-logging/v3 v3.0.6
13-
github.com/onsi/ginkgo v1.14.1 // indirect
14-
github.com/onsi/gomega v1.10.2 // indirect
15-
github.com/pkg/errors v0.9.1
16-
github.com/spf13/cobra v1.2.0
5+
github.com/gorilla/mux v1.8.0
6+
github.com/jenkins-x/jx-api/v4 v4.7.6
7+
github.com/jenkins-x/jx-helpers/v3 v3.7.1
8+
github.com/jenkins-x/jx-kube-client/v3 v3.0.8
9+
github.com/jenkins-x/jx-logging/v3 v3.0.16
10+
github.com/spf13/cobra v1.8.0
1711
github.com/spf13/pflag v1.0.5
18-
github.com/stretchr/testify v1.7.0
19-
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
20-
helm.sh/helm/v3 v3.6.2
21-
k8s.io/api v0.21.0
22-
k8s.io/apimachinery v0.21.0
23-
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
24-
sigs.k8s.io/yaml v1.2.0
12+
github.com/stretchr/testify v1.9.0
13+
helm.sh/helm/v3 v3.15.2
14+
k8s.io/api v0.30.2
15+
k8s.io/apimachinery v0.30.2
16+
k8s.io/client-go v0.30.2
17+
sigs.k8s.io/yaml v1.4.0
2518
)
2619

27-
replace (
28-
// helm dependencies
29-
github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
30-
github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
31-
k8s.io/api => k8s.io/api v0.20.2
32-
k8s.io/apimachinery => k8s.io/apimachinery v0.20.2
33-
k8s.io/client-go => k8s.io/client-go v0.20.2
20+
require (
21+
github.com/AlecAivazis/survey/v2 v2.3.4 // indirect
22+
github.com/MakeNowJust/heredoc v1.0.0 // indirect
23+
github.com/Masterminds/semver/v3 v3.2.1 // indirect
24+
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
25+
github.com/davecgh/go-spew v1.1.1 // indirect
26+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
27+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
28+
github.com/fatih/color v1.15.0 // indirect
29+
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
30+
github.com/go-logr/logr v1.4.2 // indirect
31+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
32+
github.com/go-openapi/jsonreference v0.21.0 // indirect
33+
github.com/go-openapi/swag v0.23.0 // indirect
34+
github.com/go-stack/stack v1.8.1 // indirect
35+
github.com/gogo/protobuf v1.3.2 // indirect
36+
github.com/golang/glog v1.1.0 // indirect
37+
github.com/golang/protobuf v1.5.4 // indirect
38+
github.com/google/gnostic-models v0.6.8 // indirect
39+
github.com/google/go-cmp v0.6.0 // indirect
40+
github.com/google/gofuzz v1.2.0 // indirect
41+
github.com/google/uuid v1.6.0 // indirect
42+
github.com/imdario/mergo v0.3.16 // indirect
43+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
44+
github.com/jenkins-x/logrus-stackdriver-formatter v0.2.7 // indirect
45+
github.com/josharian/intern v1.0.0 // indirect
46+
github.com/json-iterator/go v1.1.12 // indirect
47+
github.com/mailru/easyjson v0.7.7 // indirect
48+
github.com/mattn/go-colorable v0.1.13 // indirect
49+
github.com/mattn/go-isatty v0.0.17 // indirect
50+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
51+
github.com/modern-go/reflect2 v1.0.2 // indirect
52+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
53+
github.com/pkg/errors v0.9.1 // indirect
54+
github.com/pmezard/go-difflib v1.0.0 // indirect
55+
github.com/rawlingsj/jsonschema v0.0.0-20210511142122-a9c2cfdb7dcf // indirect
56+
github.com/russross/blackfriday v1.6.0 // indirect
57+
github.com/sirupsen/logrus v1.9.3 // indirect
58+
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
59+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
60+
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
61+
golang.org/x/mod v0.17.0 // indirect
62+
golang.org/x/net v0.26.0 // indirect
63+
golang.org/x/oauth2 v0.21.0 // indirect
64+
golang.org/x/sync v0.7.0 // indirect
65+
golang.org/x/sys v0.21.0 // indirect
66+
golang.org/x/term v0.21.0 // indirect
67+
golang.org/x/text v0.16.0 // indirect
68+
golang.org/x/time v0.5.0 // indirect
69+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
70+
google.golang.org/protobuf v1.34.2 // indirect
71+
gopkg.in/inf.v0 v0.9.1 // indirect
72+
gopkg.in/yaml.v2 v2.4.0 // indirect
73+
gopkg.in/yaml.v3 v3.0.1 // indirect
74+
k8s.io/code-generator v0.30.2 // indirect
75+
k8s.io/gengo/v2 v2.0.0-20240404160639-a0386bf69313 // indirect
76+
k8s.io/klog/v2 v2.130.0 // indirect
77+
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
78+
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
79+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
80+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
3481
)
3582

36-
go 1.15
83+
go 1.22.3

0 commit comments

Comments
 (0)