You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2018/05/08 22:02:52 UTC
[incubator-pulsar] branch branch-2.0 updated (ea1230a -> 9b33a87)
This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a change to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git.
from ea1230a Exclude grpc dependencies in binary distribution (#1724)
new 31ace0b Encode zk-path for function-pkg (#1727)
new 7a83b26 Include Jackson modules in shaded jar as well (#1729)
new 08e8866 remove superfluous usage() call (#1744)
new 9b33a87 Fixed licenses and notice file (#1748)
The 4 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.
Summary of changes:
all/licenses/LICENSE-AspectJ.txt | 64 ++++++++++++++++++
all/licenses/LICENSE-JSR305.txt | 28 ++++++++
.../{LICENSE-protobuf.txt => LICENSE-LevelDB.txt} | 23 ++-----
.../{LICENSE-SemVer.txt => LICENSE-Lombok.txt} | 4 +-
all/licenses/LICENSE-Webbit.txt | 37 +++++++++++
...rotobuf.txt => LICENSE-google-auth-library.txt} | 24 ++-----
.../{LICENSE-SemVer.txt => LICENSE-jbzip2.txt} | 4 +-
all/licenses/LICENSE-jfastlz.txt | 24 +++++++
all/licenses/LICENSE-libdivsufsort.txt | 22 +++++++
all/src/assemble/LICENSE.bin.txt | 63 ++++++++++++++++--
all/src/assemble/NOTICE.bin.txt | 76 ++++++++++++++++++++++
pulsar-client-admin-shaded-for-functions/pom.xml | 1 +
.../pulsar-client-kafka-shaded/pom.xml | 1 +
pulsar-client-shaded/pom.xml | 1 +
.../java/org/apache/pulsar/admin/cli/CmdBase.java | 1 -
.../org/apache/pulsar/functions/worker/Utils.java | 1 +
.../functions/worker/rest/api/FunctionsImpl.java | 23 +++----
.../rest/api/v2/FunctionApiV2ResourceTest.java | 3 +-
18 files changed, 337 insertions(+), 63 deletions(-)
create mode 100644 all/licenses/LICENSE-AspectJ.txt
create mode 100644 all/licenses/LICENSE-JSR305.txt
copy all/licenses/{LICENSE-protobuf.txt => LICENSE-LevelDB.txt} (57%)
copy all/licenses/{LICENSE-SemVer.txt => LICENSE-Lombok.txt} (93%)
create mode 100644 all/licenses/LICENSE-Webbit.txt
copy all/licenses/{LICENSE-protobuf.txt => LICENSE-google-auth-library.txt} (57%)
copy all/licenses/{LICENSE-SemVer.txt => LICENSE-jbzip2.txt} (92%)
create mode 100644 all/licenses/LICENSE-jfastlz.txt
create mode 100644 all/licenses/LICENSE-libdivsufsort.txt
--
To stop receiving notification emails like this one, please contact
mmerli@apache.org.
[incubator-pulsar] 04/04: Fixed licenses and notice file (#1748)
Posted by mm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
commit 9b33a8788f171f98528aeaa9040d16fc702404ef
Author: Matteo Merli <mm...@apache.org>
AuthorDate: Tue May 8 09:51:37 2018 -0700
Fixed licenses and notice file (#1748)
---
all/licenses/LICENSE-AspectJ.txt | 64 +++++++++++++++++++++++
all/licenses/LICENSE-JSR305.txt | 28 ++++++++++
all/licenses/LICENSE-LevelDB.txt | 29 +++++++++++
all/licenses/LICENSE-Lombok.txt | 19 +++++++
all/licenses/LICENSE-Webbit.txt | 37 ++++++++++++++
all/licenses/LICENSE-google-auth-library.txt | 28 ++++++++++
all/licenses/LICENSE-jbzip2.txt | 19 +++++++
all/licenses/LICENSE-jfastlz.txt | 24 +++++++++
all/licenses/LICENSE-libdivsufsort.txt | 22 ++++++++
all/src/assemble/LICENSE.bin.txt | 63 +++++++++++++++++++++--
all/src/assemble/NOTICE.bin.txt | 76 ++++++++++++++++++++++++++++
11 files changed, 405 insertions(+), 4 deletions(-)
diff --git a/all/licenses/LICENSE-AspectJ.txt b/all/licenses/LICENSE-AspectJ.txt
new file mode 100644
index 0000000..8c394dd
--- /dev/null
+++ b/all/licenses/LICENSE-AspectJ.txt
@@ -0,0 +1,64 @@
+
+AspectJTM Compiler and Core Tools License
+
+This is a binary-only release. Source code is available from http://eclipse.org/aspectj
+
+The Eclipse Foundation makes available all content in this distribution ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the Eclipse Public
+License Version 1.0 ("EPL"). A copy of the EPL is available at http://www.eclipse.org/legal/epl-v10.html.
+For purposes of the EPL, "Program" will mean the Content.
+
+If you did not receive this Content directly from the Eclipse Foundation, the Content is being
+redistributed by another party ("Redistributor") and different terms and conditions may apply to
+your use of any object code in the Content. Check the Redistributor's license that was provided with
+the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below,
+the terms and conditions of the EPL still apply to any source code in the Content and such source
+code may be obtained at http://www.eclipse.org.
+
+--- Third Party Content
+
+The Content includes items that have been sourced from third parties as set out below. If you did
+not receive this Content directly from the Eclipse Foundation, the following is provided for
+informational purposes only, and you should look to the Redistributors license for terms and
+conditions of use.
+
+BCEL v5.1
+This product contains software developed by the Apache Software Foundation (http://www.apache.org).
+
+AspectJ includes a modified version of the Apache Jakarta Byte Code Engineering Library (BCEL) v5.1.
+BCEL is available at http://jakarta.apache.org/bcel/. Source code for the modified version of BCEL
+is available at Eclipse.org in the AspectJ source tree. This code is made available under the Apache
+ Software License v1.1 ASM v2.2.1
+
+AspectJ includes a binary version of ASM v2.2.1 (http://asm.objectweb.org/) The source code for ASM
+is available from the ObjectWeb download site at http://asm.objectweb.org/download/.
+
+The ASM license is available at http://asm.ow2.io/license.html. The license is also reproduced here:
+
+ASM: a very small and fast Java bytecode manipulation framework
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/all/licenses/LICENSE-JSR305.txt b/all/licenses/LICENSE-JSR305.txt
new file mode 100644
index 0000000..cf30ea2
--- /dev/null
+++ b/all/licenses/LICENSE-JSR305.txt
@@ -0,0 +1,28 @@
+Copyright (c) 2007-2009, JSR305 expert group
+All rights reserved.
+
+http://www.opensource.org/licenses/bsd-license.php
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of the JSR305 expert group nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/all/licenses/LICENSE-LevelDB.txt b/all/licenses/LICENSE-LevelDB.txt
new file mode 100644
index 0000000..7108b0b
--- /dev/null
+++ b/all/licenses/LICENSE-LevelDB.txt
@@ -0,0 +1,29 @@
+This contains code that is from LevelDB, and that code is under the following license:
+
+Copyright (c) 2011 The LevelDB Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/all/licenses/LICENSE-Lombok.txt b/all/licenses/LICENSE-Lombok.txt
new file mode 100644
index 0000000..5da7dbe
--- /dev/null
+++ b/all/licenses/LICENSE-Lombok.txt
@@ -0,0 +1,19 @@
+Copyright (C) 2009-2015 The Project Lombok Authors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/all/licenses/LICENSE-Webbit.txt b/all/licenses/LICENSE-Webbit.txt
new file mode 100644
index 0000000..7a30ba9
--- /dev/null
+++ b/all/licenses/LICENSE-Webbit.txt
@@ -0,0 +1,37 @@
+(BSD License: http://www.opensource.org/licenses/bsd-license)
+
+Copyright (c) 2011, Joe Walnes, Aslak Hellesøy and contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the
+following conditions are met:
+
+* Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the
+ following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+
+* Neither the name of the Webbit nor the names of
+ its contributors may be used to endorse or promote products
+ derived from this software without specific prior written
+ permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/all/licenses/LICENSE-google-auth-library.txt b/all/licenses/LICENSE-google-auth-library.txt
new file mode 100644
index 0000000..12edf23
--- /dev/null
+++ b/all/licenses/LICENSE-google-auth-library.txt
@@ -0,0 +1,28 @@
+Copyright 2014, Google Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/all/licenses/LICENSE-jbzip2.txt b/all/licenses/LICENSE-jbzip2.txt
new file mode 100644
index 0000000..6d6f1d4
--- /dev/null
+++ b/all/licenses/LICENSE-jbzip2.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2010-2011 Matthew J. Francis and Contributors of the jbzip2 Project
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/all/licenses/LICENSE-jfastlz.txt b/all/licenses/LICENSE-jfastlz.txt
new file mode 100644
index 0000000..6f27e14
--- /dev/null
+++ b/all/licenses/LICENSE-jfastlz.txt
@@ -0,0 +1,24 @@
+The MIT License
+
+Copyright (c) 2009 William Kinney
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/all/licenses/LICENSE-libdivsufsort.txt b/all/licenses/LICENSE-libdivsufsort.txt
new file mode 100644
index 0000000..3bad2dc
--- /dev/null
+++ b/all/licenses/LICENSE-libdivsufsort.txt
@@ -0,0 +1,22 @@
+Copyright (c) 2003-2008 Yuta Mori All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/all/src/assemble/LICENSE.bin.txt b/all/src/assemble/LICENSE.bin.txt
index 944ba2d..dd45fd2 100644
--- a/all/src/assemble/LICENSE.bin.txt
+++ b/all/src/assemble/LICENSE.bin.txt
@@ -338,16 +338,18 @@ The Apache Software License, Version 2.0
BSD 3-clause "New" or "Revised" License
* EA Agent Loader -- com.ea.agentloader-*.jar -- licenses/LICENSE-EA-Agent-Loader.txt
+ * Google auth library - com.google.auth-google-auth-library-*.jar -- licenses/LICENSE-google-auth-library.txt
+ * JLine -- jline-*.jar -- licenses/LICENSE.JLine.txt
+ * LevelDB -- (included in org.rocksdb.*.jar) -- licenses/LICENSE-LevelDB.txt
+ * JSR305 -- com.google.code.findbugs-jsr305-*.jar -- licenses/LICENSE-JSR305.txt
BSD 2-Clause License
* HdrHistogram -- HdrHistogram-*.jar -- licenses/LICENSE-HdrHistogram.txt
-BSD License
- * JLine -- jline-*.jar -- licenses/LICENSE.JLine.txt
-
MIT License
* Java SemVer -- com.github.zafarkhaja-java-semver-*.jar -- licenses/LICENSE-SemVer.txt
* SLF4J -- org.slf4j.*.jar -- licenses/LICENSE-SLF4J.txt
+ * Lombok -- org.projectlombok-*.jar -- licenses/LICENSE-Lombok.txt
Protocol Buffers License
* Protocol Buffers -- com.google.protobuf-*.jar -- licenses/LICENSE-protobuf.txt
@@ -360,8 +362,9 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt
* HK2 - Dependency Injection Kernel -- org.glassfish.hk2*.jar
* Jersey -- org.glassfish.jersey.*.jar
* Javassist -- org.javassist-*.jar
+ * Mimepull -- org.jvnet.mimepull-*.jar
-Eclipse Public License 1.0 -- licenses/LICENSE-EPL-1.0.txt
+Eclipse Public License 1.0 -- licenses/LICENSE-AspectJ.txt
* AspectJ -- org.aspectj-*.jar
Public Domain (CC0) -- licenses/LICENSE-CC0.txt
@@ -369,3 +372,55 @@ Public Domain (CC0) -- licenses/LICENSE-CC0.txt
Bouncy Castle License
* Bouncy Castle -- org.bouncycastle*.jar -- licenses/LICENSE-bouncycastle.txt
+
+
+------------------------
+
+Additionaly, Netty includes code with the following licenses:
+
+Contains a modified portion of 'Webbit', an event based WebSocket and HTTP server, which can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE-Webbit.txt (BSD License)
+ * HOMEPAGE:
+ * https://github.com/joewalnes/webbit
+
+Contains a modified portion of 'SLF4J', a simple logging facade for Java, which can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE-SLF4J.txt (MIT License)
+ * HOMEPAGE:
+ * http://www.slf4j.org/
+
+Contains a modified portion of 'jbzip2', a Java bzip2 compression and decompression library written
+by Matthew J. Francis. It can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE-jbzip2.txt (MIT License)
+ * HOMEPAGE:
+ * https://code.google.com/p/jbzip2/
+
+Contains a modified portion of 'libdivsufsort', a C API library to construct
+the suffix array and the Burrows-Wheeler transformed string for any input string of
+a constant-size alphabet written by Yuta Mori. It can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE-libdivsufsort.txt (MIT License)
+ * HOMEPAGE:
+ * https://github.com/y-256/libdivsufsort
+
+Contains a modified portion of 'jfastlz', a Java port of FastLZ compression
+and decompression library written by William Kinney. It can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE-jfastlz.txt (MIT License)
+ * HOMEPAGE:
+ * https://code.google.com/p/jfastlz/
+
+Contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data
+interchange format, which can be obtained at:
+
+ * LICENSE:
+ * licenses/LICENSE-protobuf.txt (New BSD License)
+ * HOMEPAGE:
+* https://github.com/google/protobuf
diff --git a/all/src/assemble/NOTICE.bin.txt b/all/src/assemble/NOTICE.bin.txt
index c40ddc8..4589854 100644
--- a/all/src/assemble/NOTICE.bin.txt
+++ b/all/src/assemble/NOTICE.bin.txt
@@ -94,13 +94,89 @@ Copyright 2004 Jason Paul Kitchen
TypeUtil.java
Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
+picocli (http://picocli.info)
+Copyright 2017 Remko Popma
+
----------------------------------------------------------------------------------------------------
Prometheus instrumentation library for JVM applications
Copyright 2012-2015 The Prometheus Authors
+This product includes software developed at
+Boxever Ltd. (http://www.boxever.com/).
+
+This product includes software developed at
+SoundCloud Ltd. (http://soundcloud.com/).
+
+This product includes software developed as part of the
+Ocelli project by Netflix Inc. (https://github.com/Netflix/ocelli/).
+
+----------------------------------------------------------------------------------------------------
+
Netty
Copyright 2014 The Netty Project
High Performance Primitive Collections for Java
(c) Carrot Search s.c., http://carrotsearch.com/
+
+
+----------------------------------------------------------------------------------------------------
+gRPC
+Copyright 2014 The gRPC Authors
+
+This product contains a modified portion of 'OkHttp', an open source
+HTTP & SPDY client for Android and Java applications, which can be obtained
+at:
+
+ * LICENSE:
+ * okhttp/third_party/okhttp/LICENSE (Apache License 2.0)
+ * HOMEPAGE:
+ * https://github.com/square/okhttp
+ * LOCATION_IN_GRPC:
+ * okhttp/third_party/okhttp
+
+This product contains a modified portion of 'Netty', an open source
+networking library, which can be obtained at:
+
+ * LICENSE:
+ * netty/third_party/netty/LICENSE.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * https://netty.io
+ * LOCATION_IN_GRPC:
+* netty/third_party/netty
+
+----------------------------------------------------------------------------------------------------
+
+Apache Commons Lang
+Copyright 2001-2018 The Apache Software Foundation
+
+This product includes software from the Spring Framework,
+under the Apache License 2.0 (see: StringUtils.containsWhitespace())
+
+----------------------------------------------------------------------------------------------------
+
+Netty tc-native
+Copyright 2016 The Netty Project
+
+This product contains a forked and modified version of Tomcat Native
+
+ * LICENSE:
+ * ASL2
+ * HOMEPAGE:
+ * http://tomcat.apache.org/native-doc/
+ * https://svn.apache.org/repos/asf/tomcat/native/
+
+----------------------------------------------------------------------------------------------------
+
+Jetty Web Container
+Copyright 1995-2016 Mort Bay Consulting Pty Ltd.
+
+The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
+unless otherwise noted.
+
+The UnixCrypt.java code implements the one way cryptography used by
+Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
+modified April 2001 by Iris Van den Broeke, Daniel Deville.
+Permission to use, copy, modify and distribute UnixCrypt
+for non-commercial or commercial purposes and without fee is
+granted provided that the copyright notice appears in all copies.
--
To stop receiving notification emails like this one, please contact
mmerli@apache.org.
[incubator-pulsar] 02/04: Include Jackson modules in shaded jar as
well (#1729)
Posted by mm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
commit 7a83b266b2bdb82eba4bb3d9ccc71eb9e2434701
Author: Dave Rusek <da...@gmail.com>
AuthorDate: Mon May 7 15:39:48 2018 -0600
Include Jackson modules in shaded jar as well (#1729)
* Include Jackson modules in shaded jar as well
* Add to shaded admin client as well
* Add to shaded client jar
---
pulsar-client-admin-shaded-for-functions/pom.xml | 1 +
pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml | 1 +
pulsar-client-shaded/pom.xml | 1 +
3 files changed, 3 insertions(+)
diff --git a/pulsar-client-admin-shaded-for-functions/pom.xml b/pulsar-client-admin-shaded-for-functions/pom.xml
index 48029c4..56118fa 100644
--- a/pulsar-client-admin-shaded-for-functions/pom.xml
+++ b/pulsar-client-admin-shaded-for-functions/pom.xml
@@ -81,6 +81,7 @@
<include>com.google.guava:guava</include>
<include>com.google.code.gson:gson</include>
<include>com.fasterxml.jackson.core</include>
+ <include>com.fasterxml.jackson.module</include>
<include>net.jpountz.lz4:lz4</include>
<include>com.yahoo.datasketches:sketches-core</include>
<include>org.apache.httpcomponents:httpclient</include>
diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml
index 8ac83a7..9ede657 100644
--- a/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml
+++ b/pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml
@@ -81,6 +81,7 @@
<include>com.google.guava:guava</include>
<include>com.google.code.gson:gson</include>
<include>com.fasterxml.jackson.core</include>
+ <include>com.fasterxml.jackson.module</include>
<include>io.netty:netty</include>
<include>io.netty:netty-all</include>
<include>org.apache.pulsar:pulsar-common</include>
diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml
index 981fb19..da4ed94 100644
--- a/pulsar-client-shaded/pom.xml
+++ b/pulsar-client-shaded/pom.xml
@@ -74,6 +74,7 @@
<include>com.google.guava:guava</include>
<include>com.google.code.gson:gson</include>
<include>com.fasterxml.jackson.core</include>
+ <include>com.fasterxml.jackson.module</include>
<include>io.netty:netty</include>
<include>io.netty:netty-all</include>
<include>io.netty:netty-tcnative-boringssl-static</include>
--
To stop receiving notification emails like this one, please contact
mmerli@apache.org.
[incubator-pulsar] 01/04: Encode zk-path for function-pkg (#1727)
Posted by mm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
commit 31ace0bc0ad7b5af1f2470bb3d3a3caf9b5a1f3c
Author: Rajan Dhabalia <rd...@apache.org>
AuthorDate: Fri May 4 22:38:59 2018 -0700
Encode zk-path for function-pkg (#1727)
* Encode zk-path for function-pkg
* encode only function-name in package-path
* fix test
---
.../org/apache/pulsar/functions/worker/Utils.java | 1 +
.../functions/worker/rest/api/FunctionsImpl.java | 23 +++++++++-------------
.../rest/api/v2/FunctionApiV2ResourceTest.java | 3 ++-
3 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/Utils.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/Utils.java
index 071e946..494368f 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/Utils.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/Utils.java
@@ -39,6 +39,7 @@ import org.apache.distributedlog.impl.metadata.BKDLConfig;
import org.apache.distributedlog.metadata.DLMetadata;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.api.PulsarClientException;
+import org.apache.pulsar.common.util.Codec;
import org.apache.pulsar.functions.proto.Function;
import org.apache.pulsar.functions.worker.dlog.DLInputStream;
import org.apache.pulsar.functions.worker.dlog.DLOutputStream;
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImpl.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImpl.java
index 5261750..2544c7c 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImpl.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImpl.java
@@ -48,6 +48,7 @@ import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.client.api.Producer;
import org.apache.pulsar.client.api.Reader;
import org.apache.pulsar.common.policies.data.ErrorData;
+import org.apache.pulsar.common.util.Codec;
import org.apache.pulsar.functions.proto.Function;
import org.apache.pulsar.functions.proto.Function.FunctionDetails;
import org.apache.pulsar.functions.proto.Function.FunctionMetaData;
@@ -136,12 +137,7 @@ public class FunctionsImpl {
.setVersion(0);
PackageLocationMetaData.Builder packageLocationMetaDataBuilder = PackageLocationMetaData.newBuilder()
- .setPackagePath(String.format(
- "%s/%s/%s/%s",
- tenant,
- namespace,
- functionName,
- Utils.getUniquePackageName(fileDetail.getFileName())));
+ .setPackagePath(createPackagePath(tenant, namespace, functionName, fileDetail.getFileName()));
functionMetaDataBuilder.setPackageLocation(packageLocationMetaDataBuilder);
return updateRequest(functionMetaDataBuilder.build(), uploadedInputStream);
@@ -189,12 +185,7 @@ public class FunctionsImpl {
.setVersion(0);
PackageLocationMetaData.Builder packageLocationMetaDataBuilder = PackageLocationMetaData.newBuilder()
- .setPackagePath(String.format(
- "%s/%s/%s/%s",
- tenant,
- namespace,
- functionName,
- Utils.getUniquePackageName(fileDetail.getFileName())));
+ .setPackagePath(createPackagePath(tenant, namespace, functionName, fileDetail.getFileName()));
functionMetaDataBuilder.setPackageLocation(packageLocationMetaDataBuilder);
return updateRequest(functionMetaDataBuilder.build(), uploadedInputStream);
@@ -617,7 +608,7 @@ public class FunctionsImpl {
Utils.uploadToBookeeper(
worker().getDlogNamespace(),
uploadedInputStream,
- path);
+ Codec.encode(path));
} catch (IOException e) {
log.error("Error uploading file {}", path, e);
return Response.serverError()
@@ -637,7 +628,7 @@ public class FunctionsImpl {
@Override
public void write(final OutputStream output) throws IOException {
Utils.downloadFromBookkeeper(worker().getDlogNamespace(),
- output, path);
+ output, Codec.decode(path));
}
}).build();
}
@@ -781,4 +772,8 @@ public class FunctionsImpl {
.build();
}
+ public static String createPackagePath(String tenant, String namespace, String functionName, String fileName) {
+ return String.format("%s/%s/%s/%s", tenant, namespace, Codec.encode(functionName),
+ Utils.getUniquePackageName(Codec.encode(fileName)));
+ }
}
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionApiV2ResourceTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionApiV2ResourceTest.java
index cddc152..7ba1efc 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionApiV2ResourceTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionApiV2ResourceTest.java
@@ -113,8 +113,9 @@ public class FunctionApiV2ResourceTest {
public void setup() {
this.mockedManager = mock(FunctionMetaDataManager.class);
this.mockedInputStream = mock(InputStream.class);
- this.mockedFormData = mock(FormDataContentDisposition.class);
this.mockedNamespace = mock(Namespace.class);
+ this.mockedFormData = mock(FormDataContentDisposition.class);
+ when(mockedFormData.getFileName()).thenReturn("test");
this.mockedWorkerService = mock(WorkerService.class);
when(mockedWorkerService.getFunctionMetaDataManager()).thenReturn(mockedManager);
--
To stop receiving notification emails like this one, please contact
mmerli@apache.org.
[incubator-pulsar] 03/04: remove superfluous usage() call (#1744)
Posted by mm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
commit 08e8866f46b25d5fb35a910c2d54a69f68114ad0
Author: Luc Perkins <lu...@gmail.com>
AuthorDate: Tue May 8 10:32:59 2018 -0700
remove superfluous usage() call (#1744)
---
.../src/main/java/org/apache/pulsar/admin/cli/CmdBase.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBase.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBase.java
index 0669527..90cfd6a 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBase.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBase.java
@@ -63,7 +63,6 @@ public abstract class CmdBase {
} catch (ParameterException e) {
System.err.println(e.getMessage());
System.err.println();
- jcommander.usage();
return false;
} catch (ConnectException e) {
System.err.println(e.getMessage());
--
To stop receiving notification emails like this one, please contact
mmerli@apache.org.