Bumped Go version to Go 1.21. Using log/slog instead of golang.org/x/exp/slog

cmd/csaf_aggregator/config.go

@@ -12,6 +12,7 @@ import (
 	"crypto/tls"
 	"errors"
 	"fmt"
+	"log/slog"
 	"net/http"
 	"os"
 	"runtime"
@@ -25,7 +26,6 @@ import (
 	"github.com/csaf-poc/csaf_distribution/v3/internal/models"
 	"github.com/csaf-poc/csaf_distribution/v3/internal/options"
 	"github.com/csaf-poc/csaf_distribution/v3/util"
-	"golang.org/x/exp/slog"
 	"golang.org/x/time/rate"
 )
 

cmd/csaf_aggregator/full.go

@@ -11,6 +11,7 @@ package main
 import (
 	"errors"
 	"fmt"
+	"log/slog"
 	"os"
 	"path/filepath"
 	"strings"
@@ -19,7 +20,6 @@ import (
 
 	"github.com/csaf-poc/csaf_distribution/v3/csaf"
 	"github.com/csaf-poc/csaf_distribution/v3/util"
-	"golang.org/x/exp/slog"
 )
 
 type fullJob struct {

cmd/csaf_aggregator/lazytransaction.go

@@ -9,11 +9,11 @@
 package main
 
 import (
+	"log/slog"
 	"os"
 	"path/filepath"
 
 	"github.com/csaf-poc/csaf_distribution/v3/util"
-	"golang.org/x/exp/slog"
 )
 
 type lazyTransaction struct {

cmd/csaf_aggregator/main.go

@@ -11,13 +11,13 @@ package main
 
 import (
 	"fmt"
+	"log/slog"
 	"os"
 	"path/filepath"
 
 	"github.com/csaf-poc/csaf_distribution/v3/internal/options"
 
 	"github.com/gofrs/flock"
-	"golang.org/x/exp/slog"
 )
 
 func lock(lockFile *string, fn func() error) error {

cmd/csaf_aggregator/processor.go

@@ -10,6 +10,7 @@ package main
 
 import (
 	"fmt"
+	"log/slog"
 	"os"
 	"path/filepath"
 
@@ -17,7 +18,6 @@ import (
 	"github.com/csaf-poc/csaf_distribution/v3/util"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"golang.org/x/exp/slog"
 )
 
 type processor struct {

cmd/csaf_downloader/config.go

@@ -13,13 +13,12 @@ import (
 	"fmt"
 	"io"
 	"log"
+	"log/slog"
 	"net/http"
 	"os"
 	"path/filepath"
 	"time"
 
-	"golang.org/x/exp/slog"
-
 	"github.com/csaf-poc/csaf_distribution/v3/internal/certs"
 	"github.com/csaf-poc/csaf_distribution/v3/internal/filter"
 	"github.com/csaf-poc/csaf_distribution/v3/internal/models"

cmd/csaf_downloader/downloader.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"hash"
 	"io"
+	"log/slog"
 	"net/http"
 	"net/url"
 	"os"
@@ -29,8 +30,6 @@ import (
 	"sync"
 	"time"
 
-	"golang.org/x/exp/slog"
-
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
 	"golang.org/x/time/rate"
 

cmd/csaf_downloader/forwarder.go

@@ -12,14 +12,13 @@ import (
 	"bytes"
 	"crypto/tls"
 	"io"
+	"log/slog"
 	"mime/multipart"
 	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
 
-	"golang.org/x/exp/slog"
-
 	"github.com/csaf-poc/csaf_distribution/v3/internal/misc"
 	"github.com/csaf-poc/csaf_distribution/v3/util"
 )

cmd/csaf_downloader/forwarder_test.go

@@ -14,6 +14,7 @@ import (
 	"encoding/json"
 	"errors"
 	"io"
+	"log/slog"
 	"mime"
 	"mime/multipart"
 	"net/http"
@@ -22,8 +23,6 @@ import (
 	"strings"
 	"testing"
 
-	"golang.org/x/exp/slog"
-
 	"github.com/csaf-poc/csaf_distribution/v3/internal/options"
 	"github.com/csaf-poc/csaf_distribution/v3/util"
 )

cmd/csaf_downloader/main.go

@@ -11,11 +11,10 @@ package main
 
 import (
 	"context"
+	"log/slog"
 	"os"
 	"os/signal"
 
-	"golang.org/x/exp/slog"
-
 	"github.com/csaf-poc/csaf_distribution/v3/internal/options"
 )
 

cmd/csaf_downloader/stats.go

@@ -8,7 +8,7 @@
 
 package main
 
-import "golang.org/x/exp/slog"
+import "log/slog"
 
 // stats contains counters of the downloads.
 type stats struct {

cmd/csaf_downloader/stats_test.go

@@ -11,9 +11,8 @@ package main
 import (
 	"bytes"
 	"encoding/json"
+	"log/slog"
 	"testing"
-
-	"golang.org/x/exp/slog"
 )
 
 func TestStatsAdd(t *testing.T) {