From dc40db2db782231044fe5690fd28538e27ef33b1 Mon Sep 17 00:00:00 2001 From: mingmxu Date: Wed, 13 Sep 2017 10:31:19 -0700 Subject: [PATCH 1/2] update shade settings to handle Calcite dependencies --- sdks/java/extensions/sql/pom.xml | 84 +++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 29 deletions(-) diff --git a/sdks/java/extensions/sql/pom.xml b/sdks/java/extensions/sql/pom.xml index b4aa223a08f2..cc779713c119 100644 --- a/sdks/java/extensions/sql/pom.xml +++ b/sdks/java/extensions/sql/pom.xml @@ -92,35 +92,61 @@ - org.apache.maven.plugins - maven-shade-plugin - - - bundle-and-repackage - package - - shade - - - true - - - com.google.guava:guava - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - + org.apache.maven.plugins + maven-shade-plugin + + + bundle-and-repackage + package + + shade + + + true + + + com.google.guava:guava + + org.apache.calcite:* + org.codehaus.janino:* + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + com.google.common + + + com.google.common.**.testing.* + + + + org.apache.${renderedArtifactId}.repackaged.com.google.common + + + + com.google.thirdparty + + + org.apache.${renderedArtifactId}.repackaged.com.google.thirdparty + + + + + + + + + From ed07fe19c51ecf646e53a36e23c40e5dde419d97 Mon Sep 17 00:00:00 2001 From: mingmxu Date: Fri, 15 Sep 2017 21:12:29 -0700 Subject: [PATCH 2/2] add relocate in shading; add NOTICE and include Janino license; --- sdks/java/extensions/sql/NOTICE | 45 +++++++++++++++++++ sdks/java/extensions/sql/pom.xml | 20 +++++++++ ...d.org.codehaus.commons.compiler.properties | 18 ++++++++ 3 files changed, 83 insertions(+) create mode 100644 sdks/java/extensions/sql/NOTICE create mode 100644 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/NOTICE b/sdks/java/extensions/sql/NOTICE new file mode 100644 index 000000000000..112b1e1e975c --- /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. diff --git a/sdks/java/extensions/sql/pom.xml b/sdks/java/extensions/sql/pom.xml index cc779713c119..0c105ba961df 100644 --- a/sdks/java/extensions/sql/pom.xml +++ b/sdks/java/extensions/sql/pom.xml @@ -108,7 +108,9 @@ com.google.guava:guava org.apache.calcite:* + org.apache.calcite.avatica:* org.codehaus.janino:* + com.google.protobuf:* @@ -140,6 +142,24 @@ org.apache.${renderedArtifactId}.repackaged.com.google.thirdparty + + com.google.protobuf + + org.apache.${renderedArtifactId}.repackaged.com.google.protobuf + + + + org.apache.calcite + + org.apache.${renderedArtifactId}.repackaged.org.apache.calcite + + + + org.codehaus + + org.apache.${renderedArtifactId}.repackaged.org.codehaus + + 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 000000000000..72a4eecd2a83 --- /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