From 2ecaee197a0ff2e42f92df8067fe926560f3654a Mon Sep 17 00:00:00 2001
From: Paul Lorenz <paul.lorenz@netfoundry.io>
Date: Tue, 3 May 2022 09:05:24 -0400
Subject: [PATCH] Update to go 1.18

---
 .github/workflows/main.yml |  6 +++---
 CHANGELOG.md               |  4 ++++
 go.mod                     | 18 +-----------------
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index af218374d..b2a8350b0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: '~1.17.1'
+          go-version: '~1.18.1'
 
       - name: Install Ziti CI
         uses: netfoundry/ziti-ci@v1
@@ -58,7 +58,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: '~1.17.1'
+          go-version: '~1.18.1'
 
       - name: Install Ziti CI
         uses: netfoundry/ziti-ci@v1
@@ -92,7 +92,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: '~1.17.1'
+          go-version: '~1.18.1'
 
       - name: Install Python
         uses: actions/setup-python@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 747c22505..febf00f45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Release 0.25.6
+
+There are no features or bug fixes in the release. The only change is moving from Go 1.17 to 1.18
+
 # Release 0.25.5
 
 * Bug fix: Fixes an issue where dial could fail if the terminator router didn't response to routing last
diff --git a/go.mod b/go.mod
index 2bd36eecd..24f3c4638 100644
--- a/go.mod
+++ b/go.mod
@@ -1,22 +1,6 @@
 module github.com/openziti/ziti
 
-go 1.17
-
-//replace github.com/openziti/foundation => ../foundation
-
-//replace github.com/openziti/channel => ../channel
-
-//replace github.com/openziti/dilithium => ../dilithium
-
-//replace github.com/openziti/fabric => ../fabric
-
-//replace github.com/openziti/sdk-golang => ../sdk-golang
-
-//replace github.com/openziti/edge => ../edge
-
-//replace github.com/michaelquigley/pfxlog => ../pfxlog
-
-//replace go.etcd.io/bbolt => github.com/openziti/bbolt v1.3.6-0.20210317142109-547da822475e
+go 1.18
 
 require (
 	github.com/Jeffail/gabs v1.4.0