DRILL-6273: Removed dependency licensed under Category X closes #1195
Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/ead1e9d6 Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/ead1e9d6 Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/ead1e9d6 Branch: refs/heads/master Commit: ead1e9d6325893fde17076b704a1d4b4a94ccef3 Parents: 6370ed6 Author: dvjyothsna <[email protected]> Authored: Thu Mar 29 11:16:56 2018 -0700 Committer: Ben-Zvi <[email protected]> Committed: Fri Apr 13 15:44:39 2018 -0700 ---------------------------------------------------------------------- pom.xml | 1 + tools/fmpp/pom.xml | 4 ++++ tools/fmpp/src/main/java/bsh/EvalError.java | 24 +++++++++++++++++++++ tools/fmpp/src/main/java/bsh/package-info.java | 24 +++++++++++++++++++++ 4 files changed, 53 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/ead1e9d6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b9d395d..4b69426 100644 --- a/pom.xml +++ b/pom.xml @@ -380,6 +380,7 @@ <exclude>log4j:log4j</exclude> <exclude>jdk.tools:jdk.tools</exclude> <exclude>org.json:json</exclude> + <exclude>org.beanshell:bsh</exclude> </excludes> </bannedDependencies> </rules> http://git-wip-us.apache.org/repos/asf/drill/blob/ead1e9d6/tools/fmpp/pom.xml ---------------------------------------------------------------------- diff --git a/tools/fmpp/pom.xml b/tools/fmpp/pom.xml index 0770d17..708c9b9 100644 --- a/tools/fmpp/pom.xml +++ b/tools/fmpp/pom.xml @@ -57,6 +57,10 @@ <artifactId>commons-logging-api</artifactId> <groupId>commons-logging</groupId> </exclusion> + <exclusion> + <artifactId>bsh</artifactId> + <groupId>org.beanshell</groupId> + </exclusion> </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/drill/blob/ead1e9d6/tools/fmpp/src/main/java/bsh/EvalError.java ---------------------------------------------------------------------- diff --git a/tools/fmpp/src/main/java/bsh/EvalError.java b/tools/fmpp/src/main/java/bsh/EvalError.java new file mode 100644 index 0000000..09737e6 --- /dev/null +++ b/tools/fmpp/src/main/java/bsh/EvalError.java @@ -0,0 +1,24 @@ +/* + * 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. + */ +package bsh; + +public class EvalError extends Exception { + private EvalError() { + } +} + http://git-wip-us.apache.org/repos/asf/drill/blob/ead1e9d6/tools/fmpp/src/main/java/bsh/package-info.java ---------------------------------------------------------------------- diff --git a/tools/fmpp/src/main/java/bsh/package-info.java b/tools/fmpp/src/main/java/bsh/package-info.java new file mode 100644 index 0000000..d40c5f4 --- /dev/null +++ b/tools/fmpp/src/main/java/bsh/package-info.java @@ -0,0 +1,24 @@ +/* + * 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. + */ + + /** + * Generate-fmpp has a dependency on beanshell EvalError. Beanshell doesn't have a valid + * Apache License, So beanshell is excluded and EvalError class is added to handle the dependency. + */ + +package bsh;
