DRILL-6273: Removed dependency licensed under Category X

closes #1195

3 files changed, 52 insertions, 0 deletions

diff --git a/tools/fmpp/pom.xml b/tools/fmpp/pom.xml
index 0770d176d..708c9b934 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>
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 000000000..09737e61a
--- /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() {
+  }
+}
+
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 000000000..d40c5f411
--- /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;