This is an automated email from the ASF dual-hosted git repository.
luoc 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 baf698f DRILL-8050: Fix license-maven-plugin unknown file extension
warnings
baf698f is described below
commit baf698f63a1e549346fba59254472995e0f7be16
Author: Volodymyr Vysotskyi <[email protected]>
AuthorDate: Sun Oct 31 20:56:53 2021 +0200
DRILL-8050: Fix license-maven-plugin unknown file extension warnings
---
.dockerignore | 1 +
.../src/test/resources/logback-test.txt | 68 ----------------------
.../src/test/resources/queries.cql | 13 +++--
.../src/test/resources/druid/docker-compose.yaml | 12 ++--
.../druid/{environment => environment.env} | 13 ++---
.../mysql_config_override/mysql_override.cnf | 18 ++++++
.../src/test/resources/logback-test.xml.bak | 59 -------------------
hooks/build | 1 +
hooks/push | 1 +
pom.xml | 10 +++-
10 files changed, 49 insertions(+), 147 deletions(-)
diff --git a/.dockerignore b/.dockerignore
index a2292be..ce8c9fd 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -14,6 +14,7 @@
# 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.
+#
.dockerignore
Dockerfile
diff --git a/contrib/format-httpd/src/test/resources/logback-test.txt
b/contrib/format-httpd/src/test/resources/logback-test.txt
deleted file mode 100644
index e26ec99..0000000
--- a/contrib/format-httpd/src/test/resources/logback-test.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- 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.
--->
-<configuration>
- <if condition='property("drill.lilith.enable").equalsIgnoreCase("true")'>
- <then>
- <appender name="SOCKET"
class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender">
- <Compressing>true</Compressing>
- <ReconnectionDelay>10000</ReconnectionDelay>
- <IncludeCallerData>true</IncludeCallerData>
- <RemoteHosts>${LILITH_HOSTNAME:-localhost}</RemoteHosts>
- </appender>
-
- <logger name="org.apache.drill" additivity="false">
- <level value="DEBUG"/>
- <appender-ref ref="SOCKET"/>
- </logger>
-
- <logger name="query.logger" additivity="false">
- <level value="ERROR"/>
- <appender-ref ref="SOCKET"/>
- </logger>
- <logger name="org.apache.drill.exec.store.http">
- <level value="DEBUG"/>
- <appender-ref ref="SOCKET"/>
- </logger>
- </then>
- </if>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} -
%msg%n</pattern>
- </encoder>
- </appender>
-
- <!--<root>
- <level value="WARN"/>
- <if condition='property("drill.lilith.enable").equalsIgnoreCase("true")'>
- <then>
- <appender-ref ref="SOCKET"/>
- </then>
- </if>
- <appender-ref ref="STDOUT"/>
- </root>-->
- <logger name="org.apache.drill.exec.store.httpd" additivity="false">
- <level value="debug" />
- <appender-ref ref="STDOUT" />
- </logger>
- <logger name="nl.basjes.parse" additivity="false">
- <level value="info" />
- <appender-ref ref="STDOUT" />
- </logger>
-</configuration>
\ No newline at end of file
diff --git a/contrib/storage-cassandra/src/test/resources/queries.cql
b/contrib/storage-cassandra/src/test/resources/queries.cql
index 534a604..527d88c 100644
--- a/contrib/storage-cassandra/src/test/resources/queries.cql
+++ b/contrib/storage-cassandra/src/test/resources/queries.cql
@@ -1,10 +1,11 @@
/*
- * 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
*
diff --git a/contrib/storage-druid/src/test/resources/druid/docker-compose.yaml
b/contrib/storage-druid/src/test/resources/druid/docker-compose.yaml
index 6efb68e..4d9a278 100644
--- a/contrib/storage-druid/src/test/resources/druid/docker-compose.yaml
+++ b/contrib/storage-druid/src/test/resources/druid/docker-compose.yaml
@@ -53,7 +53,7 @@ services:
command:
- coordinator
env_file:
- - environment
+ - environment.env
broker:
image: apache/incubator-druid:0.16.1-incubating
@@ -69,7 +69,7 @@ services:
command:
- broker
env_file:
- - environment
+ - environment.env
historical:
image: apache/incubator-druid:0.16.1-incubating
@@ -85,7 +85,7 @@ services:
command:
- historical
env_file:
- - environment
+ - environment.env
overlord:
image: apache/incubator-druid:0.16.1-incubating
@@ -100,7 +100,7 @@ services:
command:
- overlord
env_file:
- - environment
+ - environment.env
middlemanager:
image: apache/incubator-druid:0.16.1-incubating
@@ -116,7 +116,7 @@ services:
command:
- middleManager
env_file:
- - environment
+ - environment.env
router:
image: apache/incubator-druid:0.16.1-incubating
@@ -132,4 +132,4 @@ services:
command:
- router
env_file:
- - environment
+ - environment.env
diff --git a/contrib/storage-druid/src/test/resources/druid/environment
b/contrib/storage-druid/src/test/resources/druid/environment.env
similarity index 82%
rename from contrib/storage-druid/src/test/resources/druid/environment
rename to contrib/storage-druid/src/test/resources/druid/environment.env
index 259bcf5..5516e64 100644
--- a/contrib/storage-druid/src/test/resources/druid/environment
+++ b/contrib/storage-druid/src/test/resources/druid/environment.env
@@ -7,14 +7,13 @@
# "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.
+# 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.
#
# Java tuning
diff --git
a/contrib/storage-jdbc/src/test/resources/mysql_config_override/mysql_override.cnf
b/contrib/storage-jdbc/src/test/resources/mysql_config_override/mysql_override.cnf
index bd2b8fc..86e62ba 100644
---
a/contrib/storage-jdbc/src/test/resources/mysql_config_override/mysql_override.cnf
+++
b/contrib/storage-jdbc/src/test/resources/mysql_config_override/mysql_override.cnf
@@ -1,3 +1,21 @@
+#
+# 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.
+#
+
[mysqld]
tls_version=TLSv1.2
max_allowed_packet=15144486
diff --git a/contrib/storage-splunk/src/test/resources/logback-test.xml.bak
b/contrib/storage-splunk/src/test/resources/logback-test.xml.bak
deleted file mode 100644
index 1d8f1e7..0000000
--- a/contrib/storage-splunk/src/test/resources/logback-test.xml.bak
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- 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.
--->
-
-<!--
- This class is provided in the event someone wishes to do additional work on
this
- plugin. To use, simply rename this file logback-test.xml
--->
-<configuration>
- <if condition='property("drill.lilith.enable").equalsIgnoreCase("true")'>
- <then>
- <appender name="SOCKET"
class="de.huxhorn.lilith.logback.appender.ClassicMultiplexSocketAppender">
- <Compressing>true</Compressing>
- <ReconnectionDelay>10000</ReconnectionDelay>
- <IncludeCallerData>true</IncludeCallerData>
- <RemoteHosts>${LILITH_HOSTNAME:-localhost}</RemoteHosts>
- </appender>
-
- <logger name="org.apache.drill" additivity="false">
- <level value="DEBUG"/>
- <appender-ref ref="SOCKET"/>
- </logger>
-
- <logger name="query.logger" additivity="false">
- <level value="ERROR"/>
- <appender-ref ref="SOCKET"/>
- </logger>
- <logger name="org.apache.drill.exec.store.splunk">
- <level value="DEBUG"/>
- <appender-ref ref="SOCKET"/>
- </logger>
- </then>
- </if>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} -
%msg%n</pattern>
- </encoder>
- </appender>
- <logger name="org.apache.drill.exec.store.splunk" additivity="false">
- <level value="DEBUG" />
- <appender-ref ref="STDOUT" />
- </logger>
-</configuration>
diff --git a/hooks/build b/hooks/build
index 673dbdd..f7b1bab 100644
--- a/hooks/build
+++ b/hooks/build
@@ -15,6 +15,7 @@
# 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.
+#
docker build \
--build-arg BUILD_BASE_IMAGE=maven:3-openjdk-8 \
diff --git a/hooks/push b/hooks/push
index cf73d82..fa5c3bd 100644
--- a/hooks/push
+++ b/hooks/push
@@ -15,6 +15,7 @@
# 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.
+#
docker push apache/drill:$DOCKER_TAG
docker push apache/drill:$DOCKER_TAG-openjdk-8
diff --git a/pom.xml b/pom.xml
index 221f7b6..d520102 100644
--- a/pom.xml
+++ b/pom.xml
@@ -378,7 +378,6 @@
<exclude>**/clientlib/y2038/*.h</exclude> <!-- All the files here
should have MIT License -->
<exclude>**/resources/parquet/**/*</exclude>
<exclude>**/.asf.yaml</exclude>
- <exclude>**/.lgtm.yml</exclude>
<exclude>**/*.woff2</exclude>
<exclude>**/*.ks</exclude>
<exclude>**/*.pcap</exclude>
@@ -462,6 +461,7 @@
<exclude>**/*.shp</exclude>
<exclude>**/*.dbf</exclude>
<exclude>**/*.cnf</exclude>
+ <exclude>**/*.access_log</exclude>
</excludes>
</configuration>
</plugin>
@@ -773,6 +773,7 @@
<exclude>**/*.prj</exclude>
<exclude>**/*.shp</exclude>
<exclude>**/*.dbf</exclude>
+ <exclude>**/*.access_log</exclude>
</excludes>
<mapping>
<java>SLASHSTAR_STYLE</java>
@@ -807,6 +808,13 @@
<tdd>SCRIPT_STYLE</tdd>
<linux>SLASHSTAR_STYLE</linux>
<plist>XML_STYLE</plist>
+ <cql>SLASHSTAR_STYLE</cql>
+ <cnf>SCRIPT_STYLE</cnf>
+ <env>SCRIPT_STYLE</env>
+ <config>SCRIPT_STYLE</config>
+ <dockerignore>SCRIPT_STYLE</dockerignore>
+ <build>SCRIPT_STYLE</build>
+ <push>SCRIPT_STYLE</push>
</mapping>
</configuration>
<executions>
