From c6968c380d6b8e5ecfddd781e3d01dd735c897f7 Mon Sep 17 00:00:00 2001
From: Liviu Ilea <15732974+codemental@users.noreply.github.com>
Date: Sat, 10 Feb 2024 00:39:46 +0100
Subject: [PATCH] Updated dependency on clarum-core

---
 client/endpoint.go                     | 10 +++++-----
 go.mod                                 |  4 +---
 go.sum                                 |  2 ++
 internal/utils/urls.go                 |  2 +-
 internal/validators/validators.go      |  6 +++---
 internal/validators/validators_test.go |  4 ++--
 itests/errors/setup_test.go            |  2 +-
 itests/setup_test.go                   |  2 +-
 server/endpoint.go                     |  8 ++++----
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/client/endpoint.go b/client/endpoint.go
index c2eb70c..a04f015 100644
--- a/client/endpoint.go
+++ b/client/endpoint.go
@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/goclarum/clarum/core/config"
-	"github.com/goclarum/clarum/core/control"
-	"github.com/goclarum/clarum/core/durations"
-	"github.com/goclarum/clarum/core/logging"
-	clarumstrings "github.com/goclarum/clarum/core/validators/strings"
+	"github.com/go-clarum/clarum-core/config"
+	"github.com/go-clarum/clarum-core/control"
+	"github.com/go-clarum/clarum-core/durations"
+	"github.com/go-clarum/clarum-core/logging"
+	clarumstrings "github.com/go-clarum/clarum-core/validators/strings"
 	"github.com/goclarum/clarum/http/constants"
 	"github.com/goclarum/clarum/http/internal/utils"
 	"github.com/goclarum/clarum/http/internal/validators"
diff --git a/go.mod b/go.mod
index 4b1d3a4..8ff9297 100644
--- a/go.mod
+++ b/go.mod
@@ -3,10 +3,8 @@ module github.com/goclarum/clarum/http
 go 1.21
 
 // until core is published
-require github.com/goclarum/clarum/core v0.0.0
+require github.com/go-clarum/clarum-core v0.1.0
 
 require github.com/go-clarum/clarum-json v1.0.0
 
 require gopkg.in/yaml.v3 v3.0.1 // indirect
-
-replace github.com/goclarum/clarum/core => ../clarum-core
diff --git a/go.sum b/go.sum
index 3b35f87..1d6b8de 100644
--- a/go.sum
+++ b/go.sum
@@ -1,3 +1,5 @@
+github.com/go-clarum/clarum-core v0.1.0 h1:GkXUn5U2JaUlIi/ojkgexPXcXwhfzwefs5klmn4P1q0=
+github.com/go-clarum/clarum-core v0.1.0/go.mod h1:L1guRHi+CrM6CE2PNr2raAvfVPzJSR6VaEyC1a3bP1o=
 github.com/go-clarum/clarum-json v1.0.0 h1:HFnhhzDjT4et/X/ricK7pXDPhtsZSEpORuSPKUiFrCY=
 github.com/go-clarum/clarum-json v1.0.0/go.mod h1:SZi2GKhcHUUCN0g2njGi9vrgr1+8gLwEjhMAiNZao1s=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
diff --git a/internal/utils/urls.go b/internal/utils/urls.go
index 684e7c3..2788484 100644
--- a/internal/utils/urls.go
+++ b/internal/utils/urls.go
@@ -2,7 +2,7 @@ package utils
 
 import (
 	"fmt"
-	clarumstrings "github.com/goclarum/clarum/core/validators/strings"
+	clarumstrings "github.com/go-clarum/clarum-core/validators/strings"
 	"net/url"
 )
 
diff --git a/internal/validators/validators.go b/internal/validators/validators.go
index ce2a9e6..0ecc2a9 100644
--- a/internal/validators/validators.go
+++ b/internal/validators/validators.go
@@ -3,11 +3,11 @@ package validators
 import (
 	"errors"
 	"fmt"
+	"github.com/go-clarum/clarum-core/arrays"
+	"github.com/go-clarum/clarum-core/logging"
+	clarumstrings "github.com/go-clarum/clarum-core/validators/strings"
 	"github.com/go-clarum/clarum-json/comparator"
 	"github.com/go-clarum/clarum-json/recorder"
-	"github.com/goclarum/clarum/core/arrays"
-	"github.com/goclarum/clarum/core/logging"
-	clarumstrings "github.com/goclarum/clarum/core/validators/strings"
 	"github.com/goclarum/clarum/http/internal"
 	"github.com/goclarum/clarum/http/message"
 	"io"
diff --git a/internal/validators/validators_test.go b/internal/validators/validators_test.go
index e3eeb83..74e2f2a 100644
--- a/internal/validators/validators_test.go
+++ b/internal/validators/validators_test.go
@@ -1,8 +1,8 @@
 package validators
 
 import (
-	"github.com/goclarum/clarum/core/config"
-	"github.com/goclarum/clarum/core/logging"
+	"github.com/go-clarum/clarum-core/config"
+	"github.com/go-clarum/clarum-core/logging"
 	"github.com/goclarum/clarum/http/constants"
 	"github.com/goclarum/clarum/http/message"
 	"net/http"
diff --git a/itests/errors/setup_test.go b/itests/errors/setup_test.go
index 6c12d77..842f67a 100644
--- a/itests/errors/setup_test.go
+++ b/itests/errors/setup_test.go
@@ -2,7 +2,7 @@ package errors
 
 import (
 	"errors"
-	clarumcore "github.com/goclarum/clarum/core"
+	clarumcore "github.com/go-clarum/clarum-core"
 	clarumhttp "github.com/goclarum/clarum/http"
 
 	"os"
diff --git a/itests/setup_test.go b/itests/setup_test.go
index 9047857..765c66b 100644
--- a/itests/setup_test.go
+++ b/itests/setup_test.go
@@ -1,7 +1,7 @@
 package itests
 
 import (
-	clarumcore "github.com/goclarum/clarum/core"
+	clarumcore "github.com/go-clarum/clarum-core"
 	clarumhttp "github.com/goclarum/clarum/http"
 	"os"
 	"testing"
diff --git a/server/endpoint.go b/server/endpoint.go
index 5e94540..eea4e62 100644
--- a/server/endpoint.go
+++ b/server/endpoint.go
@@ -5,10 +5,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/goclarum/clarum/core/config"
-	"github.com/goclarum/clarum/core/control"
-	"github.com/goclarum/clarum/core/logging"
-	clarumstrings "github.com/goclarum/clarum/core/validators/strings"
+	"github.com/go-clarum/clarum-core/config"
+	"github.com/go-clarum/clarum-core/control"
+	"github.com/go-clarum/clarum-core/logging"
+	clarumstrings "github.com/go-clarum/clarum-core/validators/strings"
 	"github.com/goclarum/clarum/http/constants"
 	"github.com/goclarum/clarum/http/internal/validators"
 	"github.com/goclarum/clarum/http/message"