You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by vi...@apache.org on 2018/12/12 13:00:41 UTC
[drill] branch master updated: DRILL-6895: Warnings for license
headers checks and wrong license headers in some files
This is an automated email from the ASF dual-hosted git repository.
vitalii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new e9c7f51 DRILL-6895: Warnings for license headers checks and wrong license headers in some files
e9c7f51 is described below
commit e9c7f51e8a6b4c4be95fc3aef05b89596414e98d
Author: Vitalii Diravka <vi...@gmail.com>
AuthorDate: Tue Dec 11 14:30:47 2018 +0200
DRILL-6895: Warnings for license headers checks and wrong license headers in some files
- update license-maven-plugin plugin custom mappings
- update files licenses headers
- update from "/usr/bin/env bash" to "/bin/bash" shebang line in shell script files
---
distribution/src/deb/control/conffiles | 17 ++++++++------
distribution/src/resources/auto-setup.sh | 2 +-
distribution/src/resources/distrib-setup.sh | 2 +-
distribution/src/resources/drill-conf | 16 +++++++------
distribution/src/resources/drill-config.sh | 2 +-
distribution/src/resources/drill-embedded | 16 +++++++------
distribution/src/resources/drill-localhost | 16 +++++++------
distribution/src/resources/drill-setup.sh | 2 +-
distribution/src/resources/drillbit | 16 +++++++------
distribution/src/resources/drillbit.sh | 2 +-
distribution/src/resources/dumpcat | 18 ++++++++-------
distribution/src/resources/runbit | 16 +++++++------
distribution/src/resources/sqlline | 16 +++++++------
distribution/src/resources/submit_plan | 16 +++++++------
.../org/apache/drill/yarn/scripts/ScriptUtils.java | 4 ++--
.../org/apache/drill/yarn/scripts/TestScripts.java | 4 ++--
exec/java-exec/src/main/sh/drillbit.sh | 2 +-
exec/java-exec/src/main/sh/runbit | 18 ++++++++-------
exec/java-exec/src/test/sh/runbit | 18 ++++++++-------
exec/java-exec/src/test/sh/runexec | 18 ++++++++-------
pom.xml | 27 +++++++++++++++++++++-
tools/verify_release.sh | 2 +-
22 files changed, 150 insertions(+), 100 deletions(-)
diff --git a/distribution/src/deb/control/conffiles b/distribution/src/deb/control/conffiles
index 1a297aa..40a9114 100644
--- a/distribution/src/deb/control/conffiles
+++ b/distribution/src/deb/control/conffiles
@@ -1,17 +1,20 @@
-# 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
+# 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.
+#
/etc/drill/conf/drill-override.conf
/etc/drill/conf/logback.xml
diff --git a/distribution/src/resources/auto-setup.sh b/distribution/src/resources/auto-setup.sh
index da09ad7..a6f0d2e 100644
--- a/distribution/src/resources/auto-setup.sh
+++ b/distribution/src/resources/auto-setup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/distribution/src/resources/distrib-setup.sh b/distribution/src/resources/distrib-setup.sh
index a9fea50..4718536 100644
--- a/distribution/src/resources/distrib-setup.sh
+++ b/distribution/src/resources/distrib-setup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/distribution/src/resources/drill-conf b/distribution/src/resources/drill-conf
index 104f7ff..1392f7b 100755
--- a/distribution/src/resources/drill-conf
+++ b/distribution/src/resources/drill-conf
@@ -1,19 +1,21 @@
#!/bin/bash
#
-# 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
+# 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
+# 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.
+#
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd -P "$bin">/dev/null; pwd`
diff --git a/distribution/src/resources/drill-config.sh b/distribution/src/resources/drill-config.sh
index 1056b6f..65a85c0 100644
--- a/distribution/src/resources/drill-config.sh
+++ b/distribution/src/resources/drill-config.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/distribution/src/resources/drill-embedded b/distribution/src/resources/drill-embedded
index e81f2b5..eb59a5e 100755
--- a/distribution/src/resources/drill-embedded
+++ b/distribution/src/resources/drill-embedded
@@ -1,19 +1,21 @@
#!/bin/bash
#
-# 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
+# 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
+# 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.
+#
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd -P "$bin">/dev/null; pwd`
diff --git a/distribution/src/resources/drill-localhost b/distribution/src/resources/drill-localhost
index 97add40..da170ce 100755
--- a/distribution/src/resources/drill-localhost
+++ b/distribution/src/resources/drill-localhost
@@ -1,19 +1,21 @@
#!/bin/bash
#
-# 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
+# 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
+# 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.
+#
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd -P "$bin">/dev/null; pwd`
diff --git a/distribution/src/resources/drill-setup.sh b/distribution/src/resources/drill-setup.sh
index 3d81b0f..f49d5a8 100644
--- a/distribution/src/resources/drill-setup.sh
+++ b/distribution/src/resources/drill-setup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/distribution/src/resources/drillbit b/distribution/src/resources/drillbit
index f235ed3..79d7943 100755
--- a/distribution/src/resources/drillbit
+++ b/distribution/src/resources/drillbit
@@ -1,13 +1,14 @@
#!/bin/bash
#
-# 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
+# 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
+# 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,
@@ -15,6 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
# Starts a Drillbit
#
# chkconfig: 345 85 15
diff --git a/distribution/src/resources/drillbit.sh b/distribution/src/resources/drillbit.sh
index 404c6f8..4c8ae62 100755
--- a/distribution/src/resources/drillbit.sh
+++ b/distribution/src/resources/drillbit.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/distribution/src/resources/dumpcat b/distribution/src/resources/dumpcat
index 2979b3e..c16f8b8 100755
--- a/distribution/src/resources/dumpcat
+++ b/distribution/src/resources/dumpcat
@@ -1,19 +1,21 @@
#!/bin/bash
-
-# 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
+# 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.
+#
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd -P "$bin">/dev/null; pwd`
diff --git a/distribution/src/resources/runbit b/distribution/src/resources/runbit
index 1e36f86..3d563bb 100755
--- a/distribution/src/resources/runbit
+++ b/distribution/src/resources/runbit
@@ -1,19 +1,21 @@
#!/bin/bash
#
-# 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
+# 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
+# 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.
+#
# Invoke Drill using Java. Command line arguments are assumed to be
# of the form
diff --git a/distribution/src/resources/sqlline b/distribution/src/resources/sqlline
index 03ca2d5..67232bc 100644
--- a/distribution/src/resources/sqlline
+++ b/distribution/src/resources/sqlline
@@ -1,19 +1,21 @@
#!/bin/bash
#
-# 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
+# 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
+# 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.
+#
# resolve links - "${BASH_SOURCE-$0}" may be a softlink
this="${BASH_SOURCE-$0}"
diff --git a/distribution/src/resources/submit_plan b/distribution/src/resources/submit_plan
index eab7215..9802743 100755
--- a/distribution/src/resources/submit_plan
+++ b/distribution/src/resources/submit_plan
@@ -1,19 +1,21 @@
#!/bin/bash
#
-# 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
+# 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
+# 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.
+#
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd -P "$bin">/dev/null; pwd`
diff --git a/drill-yarn/src/test/java/org/apache/drill/yarn/scripts/ScriptUtils.java b/drill-yarn/src/test/java/org/apache/drill/yarn/scripts/ScriptUtils.java
index f9d2ee3..42fdd45 100644
--- a/drill-yarn/src/test/java/org/apache/drill/yarn/scripts/ScriptUtils.java
+++ b/drill-yarn/src/test/java/org/apache/drill/yarn/scripts/ScriptUtils.java
@@ -319,7 +319,7 @@ public class ScriptUtils {
public void createEnvFile(File file, Map<String, String> env, boolean overrideValue)
throws IOException {
try (PrintWriter out = new PrintWriter(new FileWriter(file))) {
- out.println("#!/usr/bin/env bash");
+ out.println("#!/bin/bash");
for (String key : env.keySet()) {
String value = env.get(key);
writeEnvFile(out, key, value, overrideValue);
@@ -349,7 +349,7 @@ public class ScriptUtils {
Map.Entry currentEnv = (Map.Entry) envIterator.next();
try (PrintWriter out = new PrintWriter(new FileWriter(file))) {
- out.println("#!/usr/bin/env bash");
+ out.println("#!/bin/bash");
for (String condKey : condition.keySet()) {
String condValue = condition.get(condKey);
diff --git a/drill-yarn/src/test/java/org/apache/drill/yarn/scripts/TestScripts.java b/drill-yarn/src/test/java/org/apache/drill/yarn/scripts/TestScripts.java
index 38279f8..846024e 100644
--- a/drill-yarn/src/test/java/org/apache/drill/yarn/scripts/TestScripts.java
+++ b/drill-yarn/src/test/java/org/apache/drill/yarn/scripts/TestScripts.java
@@ -517,7 +517,7 @@ public class TestScripts {
// Dummy drill-env.sh to simulate the shipped "example" file.
context.writeFile(new File(confDir, "drill-env.sh"),
- "#!/usr/bin/env bash\n" + "# Example file");
+ "#!/bin/bash\n" + "# Example file");
File siteJars = new File(siteDir, "jars");
Map<String, String> distribEnv = new HashMap<>();
@@ -1284,7 +1284,7 @@ public class TestScripts {
// with some client-specific changes.
context.writeFile( new File( siteDir, "drill-env.sh" ),
- "#!/usr/bin/env bash\n" +
+ "#!/bin/bash\n" +
"# Example file\n" +
"export SQLLINE_JAVA_OPTS=\"-XX:MaxPermSize=256M\"\n"
);
diff --git a/exec/java-exec/src/main/sh/drillbit.sh b/exec/java-exec/src/main/sh/drillbit.sh
index 2c1607b..1bc68e7 100755
--- a/exec/java-exec/src/main/sh/drillbit.sh
+++ b/exec/java-exec/src/main/sh/drillbit.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
diff --git a/exec/java-exec/src/main/sh/runbit b/exec/java-exec/src/main/sh/runbit
index 0e4af4d..f392d64 100755
--- a/exec/java-exec/src/main/sh/runbit
+++ b/exec/java-exec/src/main/sh/runbit
@@ -1,19 +1,21 @@
#!/bin/bash
-
-# 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
+# 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.
+#
if [ -z $JAVA_HOME ]
then
diff --git a/exec/java-exec/src/test/sh/runbit b/exec/java-exec/src/test/sh/runbit
index 7e4e73b..313b4f4 100755
--- a/exec/java-exec/src/test/sh/runbit
+++ b/exec/java-exec/src/test/sh/runbit
@@ -1,19 +1,21 @@
#!/bin/bash
-
-# 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
+# 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.
+#
PROJECT_ROOT=../../../
diff --git a/exec/java-exec/src/test/sh/runexec b/exec/java-exec/src/test/sh/runexec
index 7a45628..431d16d 100755
--- a/exec/java-exec/src/test/sh/runexec
+++ b/exec/java-exec/src/test/sh/runexec
@@ -1,19 +1,21 @@
#!/bin/bash
-
-# 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
+# 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.
+#
PROJECT_ROOT=../../../
diff --git a/pom.xml b/pom.xml
index 94427b8..35b12b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -588,7 +588,7 @@
<version>3.0</version>
<configuration>
<aggregate>true</aggregate>
- <header>${maven.multiModuleProjectDirectory}/header</header>
+ <header>header</header>
<excludes>
<exclude>**/clientlib/y2038/*.c</exclude> <!-- All the files here should have MIT License -->
<exclude>**/clientlib/y2038/*.h</exclude> <!-- All the files here should have MIT License -->
@@ -650,6 +650,20 @@
<exclude>KEYS</exclude>
<exclude>header</exclude>
<exclude>**/.drill.parquet_metadata</exclude>
+ <exclude>**/*.mov</exclude>
+ <exclude>**/*.mp4</exclude>
+ <exclude>**/*.avi</exclude>
+ <exclude>**/*.pcx</exclude>
+ <exclude>**/*.webp</exclude>
+ <exclude>**/*.pcapng</exclude>
+ <exclude>**/*.psd</exclude>
+ <exclude>**/*.pcx</exclude>
+ <exclude>**/*.log1</exclude>
+ <exclude>**/*.log2</exclude>
+ <exclude>**/*.sqllog</exclude>
+ <exclude>**/*.sqllog2</exclude>
+ <exclude>**/*.wav</exclude>
+ <exclude>**/control</exclude>
<!-- TODO DRILL-4336: try to avoid the need to add this -->
<exclude>dependency-reduced-pom.xml</exclude>
</excludes>
@@ -666,6 +680,17 @@
<linux>SLASHSTAR_STYLE</linux>
<boost>SLASHSTAR_STYLE</boost>
<cmake>SCRIPT_STYLE</cmake>
+ <g4>SLASHSTAR_STYLE</g4>
+ <runbit>SCRIPT_STYLE</runbit>
+ <runexec>SCRIPT_STYLE</runexec>
+ <drill-conf>SCRIPT_STYLE</drill-conf>
+ <sqlline>SCRIPT_STYLE</sqlline>
+ <drillbit>SCRIPT_STYLE</drillbit>
+ <dumpcat>SCRIPT_STYLE</dumpcat>
+ <drill-localhost>SCRIPT_STYLE</drill-localhost>
+ <submit_plan>SCRIPT_STYLE</submit_plan>
+ <drill-embedded>SCRIPT_STYLE</drill-embedded>
+ <conffiles>SCRIPT_STYLE</conffiles>
</mapping>
</configuration>
<executions>
diff --git a/tools/verify_release.sh b/tools/verify_release.sh
index 360a6d8..11f76ff 100755
--- a/tools/verify_release.sh
+++ b/tools/verify_release.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file