Merge remote-tracking branch 'origin/master'

Author: mjpt777

build.gradle

@@ -46,7 +46,7 @@ def toolchainLauncher = javaToolchains.launcherFor {
 
 def checkstyleVersion = '8.39'
 def hamcrestVersion = '2.2'
-def mockitoVersion = '3.9.0'
+def mockitoVersion = '3.10.0'
 def byteBuddyVersion = '1.11.0'
 def junitVersion = '5.7.1'
 def jmhVersion = '1.31'
@@ -618,6 +618,9 @@ task generateGolangCodecsWithXSD(type: JavaExec) {
  'sbe-tool/src/test/resources/issue488.xml',
  'sbe-tool/src/test/resources/issue560.xml',
  'sbe-tool/src/test/resources/issue661.xml',
+ 'sbe-tool/src/test/resources/issue847.xml',
+ 'sbe-tool/src/test/resources/issue848.xml',
+ 'sbe-tool/src/test/resources/issue849.xml',
  'sbe-tool/src/test/resources/since-deprecated-test-schema.xml',
  'sbe-tool/src/test/resources/example-bigendian-test-schema.xml',
  'gocode/resources/example-composite.xml',

gocode/Makefile

@@ -1,9 +1,13 @@
 ROOT=..
 SBE_TOOL_VERSION=$(shell cat $(ROOT)/version.txt)
 SBE_JAR=$(ROOT)/sbe-all/build/libs/sbe-all-${SBE_TOOL_VERSION}.jar
+
 # FIXME: Go doesn't like relative paths so us a gnumake extension for now
 GOPATH=$(realpath $(ROOT)/gocode)
 
+# GO111MODULE=off is required for building with Go 1.16
+# GOPATH-style support will be removed in Go 1.17
+export GO111MODULE=off
 
 # Convenience during development
 #SAVE_FORMAT=mkdir -p fmt && cp *.go fmt &&
@@ -25,7 +29,7 @@ $(DEP): $(SBE_JAR)
 go fmt && \
 go test)
 
-# Wil regenerate codecs by removing dependencies
+# Will regenerate codecs by removing dependencies
 clean:
 rm -f src/*/SbeMarshalling.go src/*/*/SbeMarshalling.go
 
@@ -56,7 +60,7 @@ src/baseline/SbeMarshalling.go: $(DEP)
 # The first set does a make install as there is a test that uses
 # multiple packages and needs them in GOPATH The second set work in
 # src/foo, and the third need a GOPATH addition as for Java and C++
-# they geenrate into the same directory but golang doesn't allow that
+# they generate into the same directory but golang doesn't allow that
 test: $(DEP)
 (export GOPATH=$(GOPATH) && \
 (for t in baseline extension; do \
@@ -68,7 +72,7 @@ test: $(DEP)
 go install \
 ;done))
 (export GOPATH=$(GOPATH) && \
-(for t in baseline-bigendian mktdata group_with_data group_with_data_extension composite_elements composite since-deprecated simple issue435 issue472 issue483 issue488 issue560; do \
+(for t in baseline-bigendian mktdata group_with_data group_with_data_extension composite_elements composite since-deprecated simple issue435 issue472 issue483 issue488 issue560 issue847 issue848 issue849; do \
 cd $(GOPATH)/src/$$t && \
 go build && \
 go fmt && \

gocode/src/issue847/issue847_test.go

@@ -0,0 +1,9 @@
+package issue847
+
+import (
+"testing"
+)
+
+func TestNothing(t *testing.T) {
+// placeholder, really just looking for clean builds
+}

gocode/src/issue848/issue848_test.go

@@ -0,0 +1,9 @@
+package issue848
+
+import (
+"testing"
+)
+
+func TestNothing(t *testing.T) {
+// placeholder, really just looking for clean builds
+}

gocode/src/issue849/issue849_test.go

@@ -0,0 +1,9 @@
+package issue849
+
+import (
+"testing"
+)
+
+func TestNothing(t *testing.T) {
+// placeholder, really just looking for clean builds
+}