You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zipkin.apache.org by ad...@apache.org on 2019/05/08 00:23:32 UTC
[incubator-zipkin] branch fix-license-stuff created (now 9c69334)
This is an automated email from the ASF dual-hosted git repository.
adriancole pushed a change to branch fix-license-stuff
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin.git.
at 9c69334 Fixes accidental license headers on vendored javascript libraries
This branch includes the following new commits:
new 9c69334 Fixes accidental license headers on vendored javascript libraries
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-zipkin] 01/01: Fixes accidental license headers on
vendored javascript libraries
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adriancole pushed a commit to branch fix-license-stuff
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin.git
commit 9c693346211160475b3c4b50efbb8d253d77e78e
Author: Adrian Cole <ac...@pivotal.io>
AuthorDate: Wed May 8 08:21:15 2019 +0800
Fixes accidental license headers on vendored javascript libraries
The module "zipkin-ui" will be deleted prior to Graduation for reasons
including vendored libraries. Meanwhile, we should note what the license
terms are. Previously, we accidentally attached ASL headers to these
files. This commit reverts that.
This also moves the license notes from NOTICE to LICENSE, a copy/paste
error. Finally, this backfills the license notes about the vendored
files.
Fixes #2567
---
LICENSE | 25 +++++++++++++++++++++++++
NOTICE | 15 ---------------
zipkin-ui/libs/chosen/chosen.css | 16 ----------------
zipkin-ui/libs/dagre-d3/js/dagre-d3.js | 16 ----------------
zipkin-ui/libs/dagre-d3/js/dagre-d3.min.js | 16 ----------------
5 files changed, 25 insertions(+), 63 deletions(-)
diff --git a/LICENSE b/LICENSE
index 8dada3e..930beea 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,3 +199,28 @@
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.
+
+This product contains a modified part of Gson, distributed by Google:
+
+ * License: Apache License v2.0
+ * Homepage: https://github.com/google/gson
+
+This product contains a modified part of Guava, distributed by Google:
+
+ * License: Apache License v2.0
+ * Homepage: https://github.com/google/guava
+
+This product contains a modified part of Okio, distributed by Square:
+
+ * License: Apache License v2.0
+ * Homepage: https://github.com/square/okio
+
+This product contains a modified part of Chosen, distributed by Harvest:
+
+ * License: MIT
+ * Homepage: https://github.com/harvesthq/chosen
+
+This product contains a modified part of Dager-D3, distributed by Dagre:
+
+ * License: MIT
+ * Homepage: https://github.com/dagrejs/dagre-d3
diff --git a/NOTICE b/NOTICE
index f0a06ee..0549969 100644
--- a/NOTICE
+++ b/NOTICE
@@ -4,18 +4,3 @@ Copyright 2019 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-This product contains a modified part of Gson, distributed by Google:
-
- * License: Apache License v2.0
- * Homepage: https://github.com/google/gson
-
-This product contains a modified part of Guava, distributed by Google:
-
- * License: Apache License v2.0
- * Homepage: https://github.com/google/guava
-
-This product contains a modified part of Okio, distributed by Square:
-
- * License: Apache License v2.0
- * Homepage: https://github.com/square/okio
-
diff --git a/zipkin-ui/libs/chosen/chosen.css b/zipkin-ui/libs/chosen/chosen.css
index 5e52375..4599aaa 100644
--- a/zipkin-ui/libs/chosen/chosen.css
+++ b/zipkin-ui/libs/chosen/chosen.css
@@ -1,19 +1,3 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
/*!
Chosen, a Select Box Enhancer for jQuery and Prototype
by Patrick Filler for Harvest, http://getharvest.com
diff --git a/zipkin-ui/libs/dagre-d3/js/dagre-d3.js b/zipkin-ui/libs/dagre-d3/js/dagre-d3.js
index 92b4bd9..8728227 100644
--- a/zipkin-ui/libs/dagre-d3/js/dagre-d3.js
+++ b/zipkin-ui/libs/dagre-d3/js/dagre-d3.js
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
;(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
var global=self;/**
* @license
diff --git a/zipkin-ui/libs/dagre-d3/js/dagre-d3.min.js b/zipkin-ui/libs/dagre-d3/js/dagre-d3.min.js
index 72463d5..8d9ec3a 100644
--- a/zipkin-ui/libs/dagre-d3/js/dagre-d3.min.js
+++ b/zipkin-ui/libs/dagre-d3/js/dagre-d3.min.js
@@ -1,18 +1,2 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
(function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var j=typeof require=="function"&&require;if(!h&&j)return j(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}var f=typeof require=="function"&&require;for(var g=0;g<d.length;g++)e(d[g]);return e})({1:[function(a,b,c){var d=self;d.dagreD3=a("./index")},{"./index":2}],2:[function(a [...]
b,c){var d=c.originalNodes;d&&(d.forEach(function(b){b.value.rank=c.rank,a.addNode(b.u,b.value),a.parent(b.u,b.parent)}),a.delNode(b))}),b.forEach(function(b){a.addEdge(b.e,b.u,b.v,b.value)})}},{}],23:[function(a,b,c){function g(a){function g(d){var e=!0;return a.predecessors(d).forEach(function(f){b.has(f)&&!h(a,f,d)&&(b.has(d)&&(c.addNode(d,{}),b.remove(d),c.graph({root:d})),c.addNode(f,{}),c.addEdge(null,f,d,{reversed:!0}),b.remove(f),g(f),e=!1)}),a.successors(d).forEach(function(f){b [...]
\ No newline at end of file