Repository: beam Updated Branches: refs/heads/master 81d304d4b -> baa6ebc0c
add relocate in shading; add NOTICE and include Janino license; Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/9c413d27 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/9c413d27 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/9c413d27 Branch: refs/heads/master Commit: 9c413d27b1fdc4d0dbe4def8c3a9be63af2c10bd Parents: 6718182 Author: mingmxu <ming...@ebay.com> Authored: Fri Sep 15 21:12:29 2017 -0700 Committer: Reuven Lax <re...@relax-macbookpro2.roam.corp.google.com> Committed: Tue Oct 3 08:59:51 2017 +0100 ---------------------------------------------------------------------- sdks/java/extensions/sql/NOTICE | 45 ++++++++++++++++++++ sdks/java/extensions/sql/pom.xml | 20 +++++++++ ...ged.org.codehaus.commons.compiler.properties | 18 ++++++++ 3 files changed, 83 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/9c413d27/sdks/java/extensions/sql/NOTICE ---------------------------------------------------------------------- diff --git a/sdks/java/extensions/sql/NOTICE b/sdks/java/extensions/sql/NOTICE new file mode 100644 index 0000000..112b1e1 --- /dev/null +++ b/sdks/java/extensions/sql/NOTICE @@ -0,0 +1,45 @@ +Apache Beam :: SDKs :: Java :: Extensions :: SQL +Copyright 2016-2017 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +This product includes software developed at +Google (http://www.google.com/). + +This product contains subcomponents with separate copyright notices and +license terms. Your use of the source code for the these subcomponents +is subject to the terms and conditions of their respective licenses. + +======================================================================= +Janino - An embedded Java[TM] compiler + +Copyright (c) 2001-2016, Arno Unkrig +Copyright (c) 2015-2016 TIBCO Software 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: + + 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 JANINO 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 HOLDERS 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. http://git-wip-us.apache.org/repos/asf/beam/blob/9c413d27/sdks/java/extensions/sql/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/extensions/sql/pom.xml b/sdks/java/extensions/sql/pom.xml index cc77971..0c105ba 100644 --- a/sdks/java/extensions/sql/pom.xml +++ b/sdks/java/extensions/sql/pom.xml @@ -108,7 +108,9 @@ <include>com.google.guava:guava</include> <!-- include Apache Calcite and related dependencies --> <include>org.apache.calcite:*</include> + <include>org.apache.calcite.avatica:*</include> <include>org.codehaus.janino:*</include> + <include>com.google.protobuf:*</include> </includes> </artifactSet> <filters> @@ -140,6 +142,24 @@ org.apache.${renderedArtifactId}.repackaged.com.google.thirdparty </shadedPattern> </relocation> + <relocation> + <pattern>com.google.protobuf</pattern> + <shadedPattern> + org.apache.${renderedArtifactId}.repackaged.com.google.protobuf + </shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.calcite</pattern> + <shadedPattern> + org.apache.${renderedArtifactId}.repackaged.org.apache.calcite + </shadedPattern> + </relocation> + <relocation> + <pattern>org.codehaus</pattern> + <shadedPattern> + org.apache.${renderedArtifactId}.repackaged.org.codehaus + </shadedPattern> + </relocation> </relocations> <transformers> <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> http://git-wip-us.apache.org/repos/asf/beam/blob/9c413d27/sdks/java/extensions/sql/src/main/resources/org.apache.beam.sdks.java.extensions.sql.repackaged.org.codehaus.commons.compiler.properties ---------------------------------------------------------------------- diff --git a/sdks/java/extensions/sql/src/main/resources/org.apache.beam.sdks.java.extensions.sql.repackaged.org.codehaus.commons.compiler.properties b/sdks/java/extensions/sql/src/main/resources/org.apache.beam.sdks.java.extensions.sql.repackaged.org.codehaus.commons.compiler.properties new file mode 100644 index 0000000..72a4eec --- /dev/null +++ b/sdks/java/extensions/sql/src/main/resources/org.apache.beam.sdks.java.extensions.sql.repackaged.org.codehaus.commons.compiler.properties @@ -0,0 +1,18 @@ +################################################################################ +# 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. +################################################################################ +compilerFactory=org.apache.beam.sdks.java.extensions.sql.repackaged.org.codehaus.janino.CompilerFactory
