Merge pull request #17 from arduino/scerza/update-pluggable-discovery-protocol-handler

silvanocerza · web-flow · commit af6b4d089d6e · 2021-11-26T10:40:28.000+01:00
Update `pluggable-discovery-protocol-handler` library
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,14 @@
+# Build artifacts
+/mdns-discovery
+!/mdns-discovery/
+mdns-discovery.exe
+__pycache__/
+
+# IDEs
+.idea/
+.vscode/
+*.bak
+*.code-workspace
+*.sublime-workspace
+
+/dist
diff --git a/.licenses/mdns-discovery/go/github.com/arduino/go-properties-orderedmap.dep.yml b/.licenses/mdns-discovery/go/github.com/arduino/go-properties-orderedmap.dep.yml
@@ -1,6 +1,6 @@
 ---
 name: github.com/arduino/go-properties-orderedmap
-version: v1.5.0
+version: v1.6.0
 type: go
 summary: Package properties is a library for handling maps of hierarchical properties.
 homepage: https://pkg.go.dev/github.com/arduino/go-properties-orderedmap
diff --git a/.licenses/mdns-discovery/go/github.com/arduino/pluggable-discovery-protocol-handler/v2.dep.yml b/.licenses/mdns-discovery/go/github.com/arduino/pluggable-discovery-protocol-handler/v2.dep.yml
@@ -1,13 +1,13 @@
 ---
-name: github.com/arduino/pluggable-discovery-protocol-handler
-version: v1.2.0
+name: github.com/arduino/pluggable-discovery-protocol-handler/v2
+version: v2.0.2
 type: go
-summary: discovery is a library for handling the Arduino Pluggable-Discovery protocol
-  (https://github.com/arduino/tooling-rfcs/blob/main/RFCs/0002-pluggable-discovery.md#pluggable-discovery-api-via-stdinstdout)
+summary: Package discovery is a library for handling the Arduino Pluggable-Discovery
+  protocol (https://github.com/arduino/tooling-rfcs/blob/main/RFCs/0002-pluggable-discovery.md#pluggable-discovery-api-via-stdinstdout)
   The library implements the state machine and the parsing logic to communicate with
   a pluggable-discovery client.
-homepage: https://pkg.go.dev/github.com/arduino/pluggable-discovery-protocol-handler
-license: gpl-3.0-only
+homepage: https://pkg.go.dev/github.com/arduino/pluggable-discovery-protocol-handler/v2
+license: other
 licenses:
 - sources: LICENSE.txt
   text: |
@@ -707,5 +707,5 @@ licenses:
     of the serial-discovery code. The terms of this license can be found at:
     https://www.gnu.org/licenses/gpl-3.0.en.html
 
-    See [LICENSE.txt](https://github.com/arduino/serial-discovery/blob/master/LICENSE.txt) for details.
+    See [LICENSE.txt](https://github.com/arduino/pluggable-discovery-protocol-handler/blob/master/LICENSE.txt) for details.
 notices: []
diff --git a/.licenses/mdns-discovery/go/github.com/miekg/dns.dep.yml b/.licenses/mdns-discovery/go/github.com/miekg/dns.dep.yml
@@ -1,6 +1,6 @@
 ---
 name: github.com/miekg/dns
-version: v1.1.41
+version: v1.1.43
 type: go
 summary: Package dns implements a full featured interface to the Domain Name System.
 homepage: https://pkg.go.dev/github.com/miekg/dns
diff --git a/.licenses/mdns-discovery/go/golang.org/x/net/bpf.dep.yml b/.licenses/mdns-discovery/go/golang.org/x/net/bpf.dep.yml
@@ -1,13 +1,13 @@
 ---
 name: golang.org/x/net/bpf
-version: v0.0.0-20210410081132-afb366fc7cd1
+version: v0.0.0-20210505024714-0287a6fb4125
 type: go
 summary: Package bpf implements marshaling and unmarshaling of programs for the Berkeley
   Packet Filter virtual machine, and provides a Go implementation of the virtual machine.
 homepage: https://pkg.go.dev/golang.org/x/net/bpf
 license: bsd-3-clause
 licenses:
-- sources: net@v0.0.0-20210410081132-afb366fc7cd1/LICENSE
+- sources: net@v0.0.0-20210505024714-0287a6fb4125/LICENSE
   text: |
     Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -36,7 +36,7 @@ licenses:
     THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-- sources: net@v0.0.0-20210410081132-afb366fc7cd1/PATENTS
+- sources: net@v0.0.0-20210505024714-0287a6fb4125/PATENTS
   text: |
     Additional IP Rights Grant (Patents)
 
diff --git a/.licenses/mdns-discovery/go/golang.org/x/net/internal/iana.dep.yml b/.licenses/mdns-discovery/go/golang.org/x/net/internal/iana.dep.yml
@@ -1,13 +1,13 @@
 ---
 name: golang.org/x/net/internal/iana
-version: v0.0.0-20210410081132-afb366fc7cd1
+version: v0.0.0-20210505024714-0287a6fb4125
 type: go
 summary: Package iana provides protocol number resources managed by the Internet Assigned
   Numbers Authority (IANA).
 homepage: https://pkg.go.dev/golang.org/x/net/internal/iana
 license: bsd-3-clause
 licenses:
-- sources: net@v0.0.0-20210410081132-afb366fc7cd1/LICENSE
+- sources: net@v0.0.0-20210505024714-0287a6fb4125/LICENSE
   text: |
     Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -36,7 +36,7 @@ licenses:
     THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-- sources: net@v0.0.0-20210410081132-afb366fc7cd1/PATENTS
+- sources: net@v0.0.0-20210505024714-0287a6fb4125/PATENTS
   text: |
     Additional IP Rights Grant (Patents)
 
diff --git a/.licenses/mdns-discovery/go/golang.org/x/net/internal/socket.dep.yml b/.licenses/mdns-discovery/go/golang.org/x/net/internal/socket.dep.yml
@@ -1,12 +1,12 @@
 ---
 name: golang.org/x/net/internal/socket
-version: v0.0.0-20210410081132-afb366fc7cd1
+version: v0.0.0-20210505024714-0287a6fb4125
 type: go
 summary: Package socket provides a portable interface for socket system calls.
 homepage: https://pkg.go.dev/golang.org/x/net/internal/socket
 license: bsd-3-clause
 licenses:
-- sources: net@v0.0.0-20210410081132-afb366fc7cd1/LICENSE
+- sources: net@v0.0.0-20210505024714-0287a6fb4125/LICENSE
   text: |
     Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -35,7 +35,7 @@ licenses:
     THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-- sources: net@v0.0.0-20210410081132-afb366fc7cd1/PATENTS
+- sources: net@v0.0.0-20210505024714-0287a6fb4125/PATENTS
   text: |
     Additional IP Rights Grant (Patents)
 
diff --git a/.licenses/mdns-discovery/go/golang.org/x/net/ipv4.dep.yml b/.licenses/mdns-discovery/go/golang.org/x/net/ipv4.dep.yml
@@ -1,13 +1,13 @@
 ---
 name: golang.org/x/net/ipv4
-version: v0.0.0-20210410081132-afb366fc7cd1
+version: v0.0.0-20210505024714-0287a6fb4125
 type: go
 summary: Package ipv4 implements IP-level socket options for the Internet Protocol
   version 4.
 homepage: https://pkg.go.dev/golang.org/x/net/ipv4
 license: bsd-3-clause
 licenses:
-- sources: net@v0.0.0-20210410081132-afb366fc7cd1/LICENSE
+- sources: net@v0.0.0-20210505024714-0287a6fb4125/LICENSE
   text: |
     Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -36,7 +36,7 @@ licenses:
     THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-- sources: net@v0.0.0-20210410081132-afb366fc7cd1/PATENTS
+- sources: net@v0.0.0-20210505024714-0287a6fb4125/PATENTS
   text: |
     Additional IP Rights Grant (Patents)
 
diff --git a/.licenses/mdns-discovery/go/golang.org/x/net/ipv6.dep.yml b/.licenses/mdns-discovery/go/golang.org/x/net/ipv6.dep.yml
@@ -1,13 +1,13 @@
 ---
 name: golang.org/x/net/ipv6
-version: v0.0.0-20210410081132-afb366fc7cd1
+version: v0.0.0-20210505024714-0287a6fb4125
 type: go
 summary: Package ipv6 implements IP-level socket options for the Internet Protocol
   version 6.
 homepage: https://pkg.go.dev/golang.org/x/net/ipv6
 license: bsd-3-clause
 licenses:
-- sources: net@v0.0.0-20210410081132-afb366fc7cd1/LICENSE
+- sources: net@v0.0.0-20210505024714-0287a6fb4125/LICENSE
   text: |
     Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -36,7 +36,7 @@ licenses:
     THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-- sources: net@v0.0.0-20210410081132-afb366fc7cd1/PATENTS
+- sources: net@v0.0.0-20210505024714-0287a6fb4125/PATENTS
   text: |
     Additional IP Rights Grant (Patents)
 
diff --git a/.licenses/mdns-discovery/go/golang.org/x/sys/internal/unsafeheader.dep.yml b/.licenses/mdns-discovery/go/golang.org/x/sys/internal/unsafeheader.dep.yml
@@ -1,13 +1,13 @@
 ---
 name: golang.org/x/sys/internal/unsafeheader
-version: v0.0.0-20210330210617-4fbd30eecc44
+version: v0.0.0-20210823070655-63515b42dcdf
 type: go
 summary: Package unsafeheader contains header declarations for the Go runtime's slice
   and string implementations.
 homepage: https://pkg.go.dev/golang.org/x/sys/internal/unsafeheader
 license: bsd-3-clause
 licenses:
-- sources: sys@v0.0.0-20210330210617-4fbd30eecc44/LICENSE
+- sources: sys@v0.0.0-20210823070655-63515b42dcdf/LICENSE
   text: |
     Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -36,7 +36,7 @@ licenses:
     THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-- sources: sys@v0.0.0-20210330210617-4fbd30eecc44/PATENTS
+- sources: sys@v0.0.0-20210823070655-63515b42dcdf/PATENTS
   text: |
     Additional IP Rights Grant (Patents)
 
diff --git a/.licenses/mdns-discovery/go/golang.org/x/sys/unix.dep.yml b/.licenses/mdns-discovery/go/golang.org/x/sys/unix.dep.yml
@@ -1,12 +1,12 @@
 ---
 name: golang.org/x/sys/unix
-version: v0.0.0-20210330210617-4fbd30eecc44
+version: v0.0.0-20210823070655-63515b42dcdf
 type: go
 summary: Package unix contains an interface to the low-level operating system primitives.
 homepage: https://pkg.go.dev/golang.org/x/sys/unix
 license: bsd-3-clause
 licenses:
-- sources: sys@v0.0.0-20210330210617-4fbd30eecc44/LICENSE
+- sources: sys@v0.0.0-20210823070655-63515b42dcdf/LICENSE
   text: |
     Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -35,7 +35,7 @@ licenses:
     THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-- sources: sys@v0.0.0-20210330210617-4fbd30eecc44/PATENTS
+- sources: sys@v0.0.0-20210823070655-63515b42dcdf/PATENTS
   text: |
     Additional IP Rights Grant (Patents)
 
diff --git a/cache.go b/cache.go
@@ -23,7 +23,7 @@ import (
 	"sync"
 	"time"
 
-	discovery "github.com/arduino/pluggable-discovery-protocol-handler"
+	discovery "github.com/arduino/pluggable-discovery-protocol-handler/v2"
 )
 
 // cacheItem stores TTL of discovered ports and its timer to handle TTL.
diff --git a/go.mod b/go.mod
@@ -3,8 +3,7 @@ module github.com/arduino/mdns-discovery
 go 1.16
 
 require (
-	github.com/arduino/go-paths-helper v1.6.1 // indirect
-	github.com/arduino/go-properties-orderedmap v1.5.0
+	github.com/arduino/go-properties-orderedmap v1.6.0
 	github.com/arduino/mdns v1.0.5-0.20211124112247-3bf2ec2117c5
-	github.com/arduino/pluggable-discovery-protocol-handler v1.2.0
+	github.com/arduino/pluggable-discovery-protocol-handler/v2 v2.0.2
 )
diff --git a/go.sum b/go.sum
diff --git a/main.go b/main.go
diff --git a/mdns-discovery b/mdns-discovery
