zipkin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adrianc...@apache.org
Subject [incubator-zipkin] branch master updated: Fixes accidental license headers on vendored javascript libraries (#2568)
Date Wed, 08 May 2019 08:23:40 GMT
This is an automated email from the ASF dual-hosted git repository.

adriancole pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin.git


The following commit(s) were added to refs/heads/master by this push:
     new 63f59c6  Fixes accidental license headers on vendored javascript libraries (#2568)
63f59c6 is described below

commit 63f59c6c975aa5437ef24da443600f9ff0079be8
Author: Adrian Cole <adriancole@users.noreply.github.com>
AuthorDate: Wed May 8 16:23:34 2019 +0800

    Fixes accidental license headers on vendored javascript libraries (#2568)
    
    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 ---------------
 pom.xml                                    | 11 ++++++++---
 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 ----------------
 6 files changed, 33 insertions(+), 66 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/pom.xml b/pom.xml
index bb45fe1..e9903c2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -651,7 +651,11 @@
             <exclude>**/.eslintrc</exclude>
             <exclude>**/.eslintrc</exclude>
             <exclude>**/.eslintrc.js</exclude>
-            <exclude>zipkin-ui/libs/**</exclude>
+
+            <!-- remove when deleting zipkin-ui #2569 -->
+            <exclude>**/chosen.*</exclude>
+	          <exclude>**/dagre-d3.*</exclude>
+
             <exclude>**/testdata/**/*.json</exclude>
             <exclude>**/test/data/**/*.json</exclude>
             <exclude>LICENSE</exclude>
@@ -755,8 +759,9 @@
             <exclude>**/.eslintrc</exclude>
             <exclude>**/.eslintrc.js</exclude>
 
-            <!-- Vendored libraries -->
-            <exclude>zipkin-ui/libs/**</exclude>
+            <!-- remove when deleting zipkin-ui #2569 -->
+            <exclude>**/chosen.*</exclude>
+            <exclude>**/dagre-d3.*</exclude>
 
             <!-- Maven Wrapper generated files -->
             <exclude>.mvn/wrapper/maven-wrapper.properties</exclude>
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


Mime
View raw message