You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2018/05/02 22:28:11 UTC
[GitHub] rob05c closed pull request #2216: Fix vendor issues
rob05c closed pull request #2216: Fix vendor issues
URL: https://github.com/apache/incubator-trafficcontrol/pull/2216
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/.dependency_license b/.dependency_license
index f4636cd89..bff7215e2 100644
--- a/.dependency_license
+++ b/.dependency_license
@@ -114,7 +114,8 @@ datatables\.min, MIT
GeoLite2-City.mmdb.gz, CC-A-SA
jquery\.tree\.min\.css$, MIT
jquery\.dataTables\..*\.(css|js)$, MIT
-^traffic_ops/traffic_ops_golang/vendor/github.com/basho/backoff/.*, MIT
+github\.com/basho/backoff/.*, MIT
+github\.com/dchest/siphash/.*, CC0
# Ignored - Do not report.
\.DS_Store, Ignore # Created automatically OSX.
diff --git a/LICENSE b/LICENSE
index 2c37757b5..d1befb587 100644
--- a/LICENSE
+++ b/LICENSE
@@ -321,13 +321,9 @@ For the jwt-go component:
For the pq component:
@traffic_ops/experimental/traffic_ops_auth/vendor/github.com/lib/pq/*
-@traffic_ops/testing/api/vendor/github.com/lib/pq/*
+@traffic_ops/vendor/github.com/lib/pq/*
./traffic_ops/experimental/traffic_ops_auth/vendor/github.com/lib/pq/LICENSE.md
-and also:
-@traffic_ops/traffic_ops_golang/vendor/github.com/lib/pq/*
-./traffic_ops/traffic_ops_golang/vendor/github.com/lib/pq/LICENSE.md
-
For the influxdb component:
@traffic_stats/vendor/github.com/influxdata/influxdb/*
./traffic_stats/vendor/github.com/influxdata/influxdb/LICENSE
@@ -381,42 +377,40 @@ The invalid_passwords.txt file is from the Projects/OWASP SecLists Project provi
./licenses/MIT-SecLists
For the go-sqlmock component:
-@traffic_ops/traffic_ops_golang/vendor/gopkg.in/DATA-DOG/go-sqlmock.v1/*
-./traffic_ops/traffic_ops_golang/vendor/gopkg.in/DATA-DOG/go-sqlmock.v1/LICENSE
+@traffic_ops/vendor/gopkg.in/DATA-DOG/go-sqlmock.v1/*
+./traffic_ops/vendor/gopkg.in/DATA-DOG/go-sqlmock.v1/LICENSE
For the go-jwx component:
-@traffic_ops/traffic_ops_golang/vendor/github.com/lestrrat/go-jwx/*
-./traffic_ops/traffic_ops_golang/vendor/github.com/lestrrat/go-jwx/LICENSE
+@traffic_ops/vendor/github.com/lestrrat/go-jwx/*
+./traffic_ops/vendor/github.com/lestrrat/go-jwx/LICENSE
For the protobuf component:
-@traffic_ops/traffic_ops_golang/vendor/github.com/golang/protobuf/*
-./traffic_ops/traffic_ops_golang/vendor/github.com/golang/protobuf/LICENSE
+@traffic_ops/vendor/github.com/golang/protobuf/*
+./traffic_ops/vendor/github.com/golang/protobuf/LICENSE
For the sqlx component:
-@traffic_ops/traffic_ops_golang/vendor/github.com/jmoiron/sqlx/*
-@traffic_ops/testing/api/vendor/github.com/jmoiron/sqlx/*
-./traffic_ops/traffic_ops_golang/vendor/github.com/jmoiron/sqlx/LICENSE
+@traffic_ops/vendor/github.com/jmoiron/sqlx/*
+./traffic_ops/vendor/github.com/jmoiron/sqlx/LICENSE
For the backoff component:
-@traffic_ops/traffic_ops_golang/vendor/github.com/basho/backoff/*
-./traffic_ops/traffic_ops_golang/vendor/github.com/basho/backoff/README.md
+@traffic_ops/vendor/github.com/basho/backoff/*
+./traffic_ops/vendor/github.com/basho/backoff/README.md
The riak-go-client component is used under the Apache license:
-@traffic_ops/traffic_ops_golang/vendor/github.com/basho/riak-go-client/*
-./traffic_ops/traffic_ops_golang/vendor/github.com/basho/riak-go-client/LICENSE
+@traffic_ops/vendor/github.com/basho/riak-go-client/*
+./traffic_ops/vendor/github.com/basho/riak-go-client/LICENSE
The envconfig component is used under the MIT license:
-@traffic_ops/testing/api/vendor/github.com/kelseyhightower/envconfig/*
-@traffic_ops/testing/compare/vendor/github.com/kelseyhightower/envconfig/*
-./traffic_ops/testing/api/vendor/github.com/kelseyhightower/envconfig/LICENSE
+@traffic_ops/vendor/github.com/kelseyhightower/envconfig/*
+./traffic_ops/vendor/github.com/kelseyhightower/envconfig/LICENSE
The govalidator component is used under the MIT license:
-@traffic_ops/traffic_ops_golang/vendor/github.com/asaskevich/govalidator/*
-./traffic_ops/traffic_ops_golang/vendor/github.com/asaskevich/govalidator/LICENSE
+@traffic_ops/vendor/github.com/asaskevich/govalidator/*
+./traffic_ops/vendor/github.com/asaskevich/govalidator/LICENSE
The ozzo-validation component is used under the MIT license:
-@traffic_ops/traffic_ops_golang/vendor/github.com/go-ozzo/ozzo-validation/*
-./traffic_ops/traffic_ops_golang/vendor/github.com/go-ozzo/ozzo-validation/LICENSE
+@traffic_ops/vendor/github.com/go-ozzo/ozzo-validation/*
+./traffic_ops/vendor/github.com/go-ozzo/ozzo-validation/LICENSE
The spinner-small.gif is used under the WTFPL license:
@traffic_ops/app/public/images/spinner-small.gif
diff --git a/traffic_ops/build/traffic_ops.spec b/traffic_ops/build/traffic_ops.spec
index 4cac1decd..4631b9de5 100644
--- a/traffic_ops/build/traffic_ops.spec
+++ b/traffic_ops/build/traffic_ops.spec
@@ -67,8 +67,6 @@ Built: %(date) by %{getenv: USER}
# Create build area with proper gopath structure
mkdir -p src pkg bin || { echo "Could not create directories in $(pwd): $!"; exit 1; }
-
-
# build all internal go dependencies (expects package being built as argument)
build_dependencies () {
IFS=$'\n'
@@ -92,10 +90,16 @@ Built: %(date) by %{getenv: USER}
fi
done
}
+ oldpwd=$(pwd)
+ #copy in traffic_ops/vendor
+ vendordir=src/github.com/apache/incubator-trafficcontrol/traffic_ops/vendor
+ ( mkdir -p "$vendordir" && \
+ cd "$vendordir" && \
+ cp -r "$TC_DIR"/traffic_ops/vendor/* . \
+ ) || { echo "could not copy traffic_ops/vendor directory"; exit 1; }
# build traffic_ops_golang binary
godir=src/github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang
- oldpwd=$(pwd)
( mkdir -p "$godir" && \
cd "$godir" && \
cp -r "$TC_DIR"/traffic_ops/traffic_ops_golang/* . && \
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services