chore: update go mod deps.

cmd/aa-log/main.go

@@ -9,10 +9,10 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"slices"
 	"strings"
 
 	"github.com/roddhjav/apparmor.d/pkg/logs"
-	"golang.org/x/exp/slices"
 )
 
 const usage = `aa-log [-h] [--systemd] [--file file] [--rules | --raw] [profile]

go.mod

@@ -1,9 +1,8 @@
 module github.com/roddhjav/apparmor.d
 
-go 1.21
+go 1.22
 
 require (
 	github.com/arduino/go-paths-helper v1.12.0
-	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
+	gopkg.in/yaml.v3 v3.0.1
-	gopkg.in/yaml.v2 v2.4.0
 )

go.sum

@@ -6,11 +6,7 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ=
-golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

pkg/aa/mount.go

@@ -5,9 +5,8 @@
 package aa
 
 import (
+	"slices"
 	"strings"
-
-	"golang.org/x/exp/slices"
 )
 
 type MountConditions struct {

pkg/aa/profile.go

@@ -7,11 +7,11 @@ package aa
 import (
 	"bytes"
 	"reflect"
+	"slices"
 	"sort"
 	"strings"
 
 	"github.com/arduino/go-paths-helper"
-	"golang.org/x/exp/slices"
 )
 
 // Default Apparmor magic directory: /etc/apparmor.d/.

pkg/aa/variables.go

@@ -9,9 +9,8 @@ package aa
 
 import (
 	"regexp"
+	"slices"
 	"strings"
-
-	"golang.org/x/exp/slices"
 )
 
 var (

pkg/logs/logs.go

@@ -7,11 +7,11 @@ package logs
 import (
 	"io"
 	"regexp"
+	"slices"
 	"strings"
 
 	"github.com/roddhjav/apparmor.d/pkg/aa"
 	"github.com/roddhjav/apparmor.d/pkg/util"
-	"golang.org/x/exp/slices"
 )
 
 // Colors

pkg/prebuild/builder/complain.go

@@ -6,10 +6,10 @@ package builder
 
 import (
 	"regexp"
+	"slices"
 	"strings"
 
 	"github.com/roddhjav/apparmor.d/pkg/prebuild/cfg"
-	"golang.org/x/exp/slices"
 )
 
 var (

pkg/prebuild/builder/core_test.go

@@ -5,9 +5,8 @@
 package builder
 
 import (
+	"slices"
 	"testing"
-
-	"golang.org/x/exp/slices"
 )
 
 func TestBuilder_Apply(t *testing.T) {

pkg/prebuild/builder/enforce.go

@@ -5,10 +5,10 @@
 package builder
 
 import (
+	"slices"
 	"strings"
 
 	"github.com/roddhjav/apparmor.d/pkg/prebuild/cfg"
-	"golang.org/x/exp/slices"
 )
 
 type Enforce struct {

pkg/prebuild/cfg/os.go

@@ -6,10 +6,10 @@ package cfg
 
 import (
 	"os"
+	"slices"
 	"strings"
 
 	"github.com/arduino/go-paths-helper"
-	"golang.org/x/exp/slices"
 )
 
 var (

pkg/prebuild/directive/exec.go

@@ -5,12 +5,12 @@
 package directive
 
 import (
+	"slices"
 	"strings"
 
 	"github.com/roddhjav/apparmor.d/pkg/aa"
 	"github.com/roddhjav/apparmor.d/pkg/prebuild/cfg"
 	"github.com/roddhjav/apparmor.d/pkg/util"
-	"golang.org/x/exp/slices"
 )
 
 type Exec struct {

pkg/prebuild/directive/filter.go

@@ -6,10 +6,10 @@ package directive
 
 import (
 	"regexp"
+	"slices"
 	"strings"
 
 	"github.com/roddhjav/apparmor.d/pkg/prebuild/cfg"
-	"golang.org/x/exp/slices"
 )
 
 type FilterOnly struct {

pkg/prebuild/prepare/core_test.go

@@ -7,11 +7,11 @@ package prepare
 import (
 	"os"
 	"os/exec"
+	"slices"
 	"testing"
 
 	"github.com/arduino/go-paths-helper"
 	"github.com/roddhjav/apparmor.d/pkg/prebuild/cfg"
-	"golang.org/x/exp/slices"
 )
 
 func chdirGitRoot() {

tests/integration/suite.go

@@ -10,7 +10,7 @@ import (
 	"github.com/arduino/go-paths-helper"
 	"github.com/roddhjav/apparmor.d/pkg/logs"
 	"github.com/roddhjav/apparmor.d/pkg/util"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 var (