A number of fixes, as itemized:
authorKenneth Shaw <kenshaw@gmail.com>
Mon, 16 Oct 2017 04:14:56 +0000 (11:14 +0700)
committerFrancis Chuang <francis.chuang@boostport.com>
Tue, 17 Oct 2017 00:10:29 +0000 (11:10 +1100)
- Change import paths for github.com/jcmturner/gokrb5/* -> gopkg.in/jcmturner/gokrb5.v1/*
- Update Gopkg.lock accordingly
- Adding line end to files missing them
- Reorder import list on class_mappings.go
- Fix gen-protobuf.sh script and permissions
- Generate latest message/*.pb.go files

.gitignore
Gopkg.lock
LICENSE
gen-protobuf.bat
gen-protobuf.sh
http_client.go

index 83b32d0..3162373 100644 (file)
@@ -1,2 +1,2 @@
-calcite-tmp/
-vendor/
\ No newline at end of file
+/vendor/
+/avatica-tmp/
index e6591f8..591c436 100644 (file)
 
 [[projects]]
   branch = "master"
-  name = "github.com/jcmturner/asn1"
+  name = "github.com/hashicorp/go-uuid"
   packages = ["."]
-  revision = "478ccf09c45d824f741022c79e542624952a83c5"
+  revision = "64130c7a86d732268a38cb04cfbaf0cc987fda98"
 
 [[projects]]
-  name = "github.com/jcmturner/gokrb5"
-  packages = ["asn1tools","client","config","credentials","crypto","crypto/aescts","crypto/common","crypto/etype","crypto/rfc3961","crypto/rfc3962","crypto/rfc8009","gssapi","iana","iana/adtype","iana/asnAppTag","iana/chksumtype","iana/errorcode","iana/etypeID","iana/flags","iana/keyusage","iana/msgtype","iana/nametype","iana/patype","keytab","krberror","messages","mstypes","ndr","pac","types"]
-  revision = "c26bda0a3bb400baa018645465f49407ef530f27"
+  branch = "master"
+  name = "github.com/jcmturner/asn1"
+  packages = ["."]
+  revision = "478ccf09c45d824f741022c79e542624952a83c5"
 
 [[projects]]
   name = "github.com/satori/go.uuid"
@@ -38,7 +39,7 @@
 [[projects]]
   branch = "master"
   name = "golang.org/x/crypto"
-  packages = ["pbkdf2"]
+  packages = ["md4","pbkdf2"]
   revision = "7f7c0c2d75ebb4e32a21396ce36e87b6dadc91c9"
 
 [[projects]]
   packages = ["context","context/ctxhttp"]
   revision = "054b33e6527139ad5b1ec2f6232c3b175bd9a30c"
 
+[[projects]]
+  name = "gopkg.in/jcmturner/aescts.v1"
+  packages = ["."]
+  revision = "f6abebb3171c4c1b1fea279cb7c7325020a26290"
+  version = "v1.0.1"
+
+[[projects]]
+  name = "gopkg.in/jcmturner/gokrb5.v1"
+  packages = ["asn1tools","client","config","credentials","crypto","crypto/common","crypto/etype","crypto/rfc3961","crypto/rfc3962","crypto/rfc4757","crypto/rfc8009","gssapi","iana","iana/adtype","iana/asnAppTag","iana/chksumtype","iana/errorcode","iana/etypeID","iana/flags","iana/keyusage","iana/msgtype","iana/nametype","iana/patype","keytab","krberror","messages","mstypes","ndr","pac","types"]
+  revision = "f5b5d035fe8c9212b223058a3a8c22c099e623cf"
+  version = "v1.1.3"
+
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "0954c9752efc99bbfd938a977802d6a8902d3b5f7c09bbb444bf95ec8c77ab19"
+  inputs-digest = "bd9d17a95e066641ed78da4e8044d997e2686ea4c10549684ec833b79d8de791"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/LICENSE b/LICENSE
index 7d7b26a..57b2078 100644 (file)
--- a/LICENSE
+++ b/LICENSE
 -----------------------------------------------------------------------
 
 APACHE CALCITE AVATICA-GO SUBCOMPONENTS:
-
index b986a99..143b6dc 100644 (file)
@@ -34,4 +34,4 @@ protoc --proto_path=avatica-tmp/core/src/main/protobuf/ --go_out=import_path=mes
 rmdir /Q /S avatica-tmp
 
 echo.
-echo Protobufs generated!
\ No newline at end of file
+echo Protobufs generated!
index db23b81..73d9793 100644 (file)
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+set -e
+
+rm -rf message avatica-tmp
 
 export AVATICA_VER="rel/avatica-1.10.0"
 
-rm -rf message
-rm -rf avatica-tmp
+mkdir -p avatica-tmp
+pushd avatica-tmp &> /dev/null
 
-git init avatica-tmp
-cd avatica-tmp
-git remote add origin https://github.com/apache/calcite-avatica/
+git init
+git remote add origin https://github.com/apache/calcite-avatica.git
 git config core.sparsecheckout true
 echo "core/src/main/protobuf/*" >> .git/info/sparse-checkout
+
 git fetch --depth=1 origin $AVATICA_VER
 git checkout FETCH_HEAD
 
-cd ..
-mkdir message
-protoc --proto_path=avatica-tmp/core/src/main/protobuf/ --go_out=import_path=message/message avatica-tmp/core/src/main/protobuf/*.proto
+popd &> /dev/null
+
+mkdir -p message
+
+protoc --proto_path=avatica-tmp/core/src/main/protobuf --go_out=import_path=message:message avatica-tmp/core/src/main/protobuf/*.proto
 
 rm -rf avatica-tmp
 
-echo -e "\nProtobufs generated!"
\ No newline at end of file
+echo -e "\nProtobufs generated!"
index 70a6b7c..070986f 100644 (file)
@@ -28,13 +28,13 @@ import (
        avaticaMessage "github.com/apache/calcite-avatica-go/message"
        "github.com/golang/protobuf/proto"
        "github.com/hashicorp/go-cleanhttp"
-       "github.com/jcmturner/gokrb5/client"
-       "github.com/jcmturner/gokrb5/config"
-       "github.com/jcmturner/gokrb5/credentials"
-       "github.com/jcmturner/gokrb5/keytab"
        "github.com/xinsnake/go-http-digest-auth-client"
        "golang.org/x/net/context"
        "golang.org/x/net/context/ctxhttp"
+       "gopkg.in/jcmturner/gokrb5.v1/client"
+       "gopkg.in/jcmturner/gokrb5.v1/config"
+       "gopkg.in/jcmturner/gokrb5.v1/credentials"
+       "gopkg.in/jcmturner/gokrb5.v1/keytab"
 )
 
 var (
@@ -90,7 +90,6 @@ func NewHTTPClient(host string, authenticationConf httpClientAuthConfig) (*httpC
                        }
 
                        kc, err := client.NewClientFromCCache(tc)
-
                        if err != nil {
                                return nil, fmt.Errorf("error creating kerberos client: %s", err)
                        }