This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 4318f4b2b refactor(plc4go): switch from github.com/google/gopacket to
github.com/gopacket/gopacket
4318f4b2b is described below
commit 4318f4b2b0b89a17c6f3276fda13e4c19af0cb64
Author: Sebastian Rühl <[email protected]>
AuthorDate: Tue Nov 1 16:05:19 2022 +0100
refactor(plc4go): switch from github.com/google/gopacket to
github.com/gopacket/gopacket
https://github.com/google/gopacket/issues/1016
---
plc4go/go.mod | 2 +-
plc4go/go.sum | 4 ++--
plc4go/spi/transports/pcap/Transport.go | 6 +++---
plc4go/spi/utils/Net.go | 6 +++---
plc4go/tools/plc4xpcapanalyzer/internal/analyzer/analyzer.go | 4 ++--
plc4go/tools/plc4xpcapanalyzer/internal/cbusanalyzer/analyzer.go | 2 +-
plc4go/tools/plc4xpcapanalyzer/internal/common/common.go | 2 +-
plc4go/tools/plc4xpcapanalyzer/internal/extractor/extractor.go | 2 +-
plc4go/tools/plc4xpcapanalyzer/internal/pcaphandler/pcaphandler.go | 4 ++--
9 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/plc4go/go.mod b/plc4go/go.mod
index 35052f388..c817fac0a 100644
--- a/plc4go/go.mod
+++ b/plc4go/go.mod
@@ -26,7 +26,7 @@ require (
github.com/ajankovic/xdiff v0.0.1
github.com/fatih/color v1.13.0
github.com/gdamore/tcell/v2 v2.5.3
- github.com/google/gopacket v1.1.19
+ github.com/gopacket/gopacket v0.0.0-20221006103438-9e6d99b9b443
github.com/icza/bitio v1.1.0
github.com/jacobsa/go-serial v0.0.0-20180131005756-15cf729a72d4
github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213
diff --git a/plc4go/go.sum b/plc4go/go.sum
index 3a97f6325..a9ff93214 100644
--- a/plc4go/go.sum
+++ b/plc4go/go.sum
@@ -113,8 +113,6 @@ github.com/google/go-cmp v0.5.1/go.mod
h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.2/go.mod
h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.4/go.mod
h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
-github.com/google/gopacket v1.1.19
h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
-github.com/google/gopacket v1.1.19/go.mod
h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
github.com/google/martian v2.1.0+incompatible/go.mod
h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
github.com/google/martian/v3 v3.0.0/go.mod
h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
github.com/google/martian/v3 v3.1.0/go.mod
h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -133,6 +131,8 @@ github.com/google/uuid v1.1.2/go.mod
h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
github.com/googleapis/gax-go/v2 v2.0.4/go.mod
h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod
h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
github.com/googleapis/google-cloud-go-testing
v0.0.0-20200911160855-bcd43fbb19e8/go.mod
h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
+github.com/gopacket/gopacket v0.0.0-20221006103438-9e6d99b9b443
h1:nZcBvHjudAMfouyqauDctCqWgl0wsphtiCu4yiVCs6g=
+github.com/gopacket/gopacket v0.0.0-20221006103438-9e6d99b9b443/go.mod
h1:DlRRfaM/QjAu2ADqraIure1Eif0HpNL8hmyVQ+qci5Y=
github.com/hashicorp/golang-lru v0.5.0/go.mod
h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.1/go.mod
h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
diff --git a/plc4go/spi/transports/pcap/Transport.go
b/plc4go/spi/transports/pcap/Transport.go
index bdeea2d7d..6363caf34 100644
--- a/plc4go/spi/transports/pcap/Transport.go
+++ b/plc4go/spi/transports/pcap/Transport.go
@@ -23,9 +23,9 @@ import (
"bufio"
"bytes"
"github.com/apache/plc4x/plc4go/spi/transports"
- "github.com/google/gopacket"
- "github.com/google/gopacket/layers"
- "github.com/google/gopacket/pcap"
+ "github.com/gopacket/gopacket"
+ "github.com/gopacket/gopacket/layers"
+ "github.com/gopacket/gopacket/pcap"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"io"
diff --git a/plc4go/spi/utils/Net.go b/plc4go/spi/utils/Net.go
index 712a1709e..6ef0005fc 100644
--- a/plc4go/spi/utils/Net.go
+++ b/plc4go/spi/utils/Net.go
@@ -26,9 +26,9 @@ import (
"sync"
"time"
- "github.com/google/gopacket"
- "github.com/google/gopacket/layers"
- "github.com/google/gopacket/pcap"
+ "github.com/gopacket/gopacket"
+ "github.com/gopacket/gopacket/layers"
+ "github.com/gopacket/gopacket/pcap"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
)
diff --git a/plc4go/tools/plc4xpcapanalyzer/internal/analyzer/analyzer.go
b/plc4go/tools/plc4xpcapanalyzer/internal/analyzer/analyzer.go
index 3c32661a6..85a89e613 100644
--- a/plc4go/tools/plc4xpcapanalyzer/internal/analyzer/analyzer.go
+++ b/plc4go/tools/plc4xpcapanalyzer/internal/analyzer/analyzer.go
@@ -30,8 +30,8 @@ import (
"github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/cbusanalyzer"
"github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/common"
"github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/pcaphandler"
- "github.com/google/gopacket"
- "github.com/google/gopacket/layers"
+ "github.com/gopacket/gopacket"
+ "github.com/gopacket/gopacket/layers"
"github.com/k0kubun/go-ansi"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
diff --git a/plc4go/tools/plc4xpcapanalyzer/internal/cbusanalyzer/analyzer.go
b/plc4go/tools/plc4xpcapanalyzer/internal/cbusanalyzer/analyzer.go
index e324694ab..1a35f3465 100644
--- a/plc4go/tools/plc4xpcapanalyzer/internal/cbusanalyzer/analyzer.go
+++ b/plc4go/tools/plc4xpcapanalyzer/internal/cbusanalyzer/analyzer.go
@@ -27,7 +27,7 @@ import (
"github.com/apache/plc4x/plc4go/spi/utils"
"github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/config"
"github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/common"
- "github.com/google/gopacket"
+ "github.com/gopacket/gopacket"
"github.com/pkg/errors"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
diff --git a/plc4go/tools/plc4xpcapanalyzer/internal/common/common.go
b/plc4go/tools/plc4xpcapanalyzer/internal/common/common.go
index bd20adabb..afab92d18 100644
--- a/plc4go/tools/plc4xpcapanalyzer/internal/common/common.go
+++ b/plc4go/tools/plc4xpcapanalyzer/internal/common/common.go
@@ -21,7 +21,7 @@ package common
import (
"fmt"
- "github.com/google/gopacket"
+ "github.com/gopacket/gopacket"
"github.com/pkg/errors"
"net"
"time"
diff --git a/plc4go/tools/plc4xpcapanalyzer/internal/extractor/extractor.go
b/plc4go/tools/plc4xpcapanalyzer/internal/extractor/extractor.go
index 03464ff1d..dd6268856 100644
--- a/plc4go/tools/plc4xpcapanalyzer/internal/extractor/extractor.go
+++ b/plc4go/tools/plc4xpcapanalyzer/internal/extractor/extractor.go
@@ -26,7 +26,7 @@ import (
"github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/common"
"github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/pcaphandler"
"github.com/fatih/color"
- "github.com/google/gopacket/layers"
+ "github.com/gopacket/gopacket/layers"
"github.com/k0kubun/go-ansi"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
diff --git a/plc4go/tools/plc4xpcapanalyzer/internal/pcaphandler/pcaphandler.go
b/plc4go/tools/plc4xpcapanalyzer/internal/pcaphandler/pcaphandler.go
index 957d50f8c..2cd989658 100644
--- a/plc4go/tools/plc4xpcapanalyzer/internal/pcaphandler/pcaphandler.go
+++ b/plc4go/tools/plc4xpcapanalyzer/internal/pcaphandler/pcaphandler.go
@@ -20,8 +20,8 @@
package pcaphandler
import (
- "github.com/google/gopacket"
- "github.com/google/gopacket/pcap"
+ "github.com/gopacket/gopacket"
+ "github.com/gopacket/gopacket/pcap"
"github.com/pkg/errors"
"time"
)
