You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by sn...@apache.org on 2019/01/17 05:42:39 UTC
[incubator-pinot] branch master updated: Cleaning up the
license-maven-plugin (#3706)
This is an automated email from the ASF dual-hosted git repository.
snlee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 25d21cc Cleaning up the license-maven-plugin (#3706)
25d21cc is described below
commit 25d21cc71ebd18d9d3a08798c6c24f3813ba46e4
Author: Seunghyun Lee <sn...@linkedin.com>
AuthorDate: Wed Jan 16 21:42:34 2019 -0800
Cleaning up the license-maven-plugin (#3706)
1. Removed '**/main/resources/**' from 'exclude' list since some of the files
will be included for the pinot distribution.
2. Added headers for some files based on the above change
---
license.header => HEADER | 0
.../config/druid_broker_runtime.properties | 19 +++++++++++++++
.../src/main/resources/log4j-fatal-only.properties | 19 +++++++++++++++
.../main/resources/logging-severe-only.properties | 19 +++++++++++++++
.../src/main/resources/swagger-ui/index.html | 22 ++++++++++++++++++
pinot-controller/src/main/resources/api/index.html | 21 +++++++++++++++++
.../src/main/resources/landing/index.html | 20 ++++++++++++++++
.../src/main/resources/static/css/pinot.css | 18 +++++++++++++++
.../src/main/resources/static/index.html | 21 +++++++++++++++++
.../src/main/resources/static/js/init.js | 18 +++++++++++++++
.../src/main/resources/static/query/index.html | 21 +++++++++++++++++
.../src/main/resources/webapp/css/pinot.css | 18 +++++++++++++++
.../src/main/resources/webapp/index.html | 25 ++++++++++++++++++--
.../src/main/resources/webapp/js/init.js | 18 +++++++++++++++
pinot-perf/src/main/resources/log4j.properties | 19 +++++++++++++++
pinot-server/src/main/resources/api/index.html | 21 +++++++++++++++++
.../src/main/resources/appAssemblerScriptTemplate | 21 ++++++++++++++++-
.../main/resources/conf/default_broker.properties | 19 +++++++++++++++
.../resources/conf/default_controller.properties | 19 +++++++++++++++
.../main/resources/conf/default_server.properties | 19 +++++++++++++++
.../resources/conf/pinot-admin-log4j.properties | 19 +++++++++++++++
.../resources/conf/pinot-broker-log4j.properties | 19 +++++++++++++++
.../conf/pinot-controller-log4j.properties | 19 +++++++++++++++
.../resources/conf/pinot-server-log4j.properties | 19 +++++++++++++++
.../resources/conf/pinot-tools-log4j.properties | 19 +++++++++++++++
.../resources/conf/quickstart-log4j.properties | 19 +++++++++++++++
.../conf/quickstart-offline-log4j.properties | 19 +++++++++++++++
.../conf/quickstart-realtime-log4j.properties | 19 +++++++++++++++
.../main/resources/conf/sample_perf_benchmark.yaml | 19 +++++++++++++++
pinot-tools/src/main/resources/log4j.properties | 19 +++++++++++++++
pinot-tools/src/main/resources/star-tree.html | 21 +++++++++++++++++
pom.xml | 27 ++++++++++++++++++----
32 files changed, 608 insertions(+), 7 deletions(-)
diff --git a/license.header b/HEADER
similarity index 100%
rename from license.header
rename to HEADER
diff --git a/contrib/pinot-druid-benchmark/src/main/resources/config/druid_broker_runtime.properties b/contrib/pinot-druid-benchmark/src/main/resources/config/druid_broker_runtime.properties
index 322dbc7..cd39b08 100644
--- a/contrib/pinot-druid-benchmark/src/main/resources/config/druid_broker_runtime.properties
+++ b/contrib/pinot-druid-benchmark/src/main/resources/config/druid_broker_runtime.properties
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
druid.service=druid/broker
druid.port=8082
diff --git a/pinot-common/src/main/resources/log4j-fatal-only.properties b/pinot-common/src/main/resources/log4j-fatal-only.properties
index f41cd5e..fc94581 100644
--- a/pinot-common/src/main/resources/log4j-fatal-only.properties
+++ b/pinot-common/src/main/resources/log4j-fatal-only.properties
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
log4j.rootLogger=FATAL, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target=System.out
diff --git a/pinot-common/src/main/resources/logging-severe-only.properties b/pinot-common/src/main/resources/logging-severe-only.properties
index a55ee0b..d5fdb18 100644
--- a/pinot-common/src/main/resources/logging-severe-only.properties
+++ b/pinot-common/src/main/resources/logging-severe-only.properties
@@ -1 +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
+#
+# 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.
+#
+
.level = SEVERE
diff --git a/pinot-common/src/main/resources/swagger-ui/index.html b/pinot-common/src/main/resources/swagger-ui/index.html
index 9df07ea..04dd1b5 100644
--- a/pinot-common/src/main/resources/swagger-ui/index.html
+++ b/pinot-common/src/main/resources/swagger-ui/index.html
@@ -1,3 +1,25 @@
+<!--
+
+ 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 is directly copied from Swagger repository and modified to change url variable -->
<!DOCTYPE html>
<html>
<head>
diff --git a/pinot-controller/src/main/resources/api/index.html b/pinot-controller/src/main/resources/api/index.html
index 8c2304c..d6ba570 100644
--- a/pinot-controller/src/main/resources/api/index.html
+++ b/pinot-controller/src/main/resources/api/index.html
@@ -1,3 +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.
+
+-->
+
<!-- This is directly copied from Swagger repository and modified to change url variable -->
<!DOCTYPE html>
<html>
diff --git a/pinot-controller/src/main/resources/landing/index.html b/pinot-controller/src/main/resources/landing/index.html
index ae489a7..bd3a8e6 100644
--- a/pinot-controller/src/main/resources/landing/index.html
+++ b/pinot-controller/src/main/resources/landing/index.html
@@ -1,3 +1,23 @@
+<!--
+
+ 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.
+
+-->
<!DOCTYPE html>
<html lang="en">
<head>
diff --git a/pinot-controller/src/main/resources/static/css/pinot.css b/pinot-controller/src/main/resources/static/css/pinot.css
index 164b37c..a2fbfe1 100644
--- a/pinot-controller/src/main/resources/static/css/pinot.css
+++ b/pinot-controller/src/main/resources/static/css/pinot.css
@@ -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.
+ */
body {
/* font-family: tahoma;*/
background:#e8e8e8;
diff --git a/pinot-controller/src/main/resources/static/index.html b/pinot-controller/src/main/resources/static/index.html
index ae489a7..af34b20 100644
--- a/pinot-controller/src/main/resources/static/index.html
+++ b/pinot-controller/src/main/resources/static/index.html
@@ -1,3 +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.
+
+-->
+
<!DOCTYPE html>
<html lang="en">
<head>
diff --git a/pinot-controller/src/main/resources/static/js/init.js b/pinot-controller/src/main/resources/static/js/init.js
index a67b94f..1efb9f0 100644
--- a/pinot-controller/src/main/resources/static/js/init.js
+++ b/pinot-controller/src/main/resources/static/js/init.js
@@ -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.
+ */
var JS_BEAUTIFY_SETTINGS = {
indent_size : 4,
indent_char : ' ',
diff --git a/pinot-controller/src/main/resources/static/query/index.html b/pinot-controller/src/main/resources/static/query/index.html
index 6d8af4f..68beccd 100644
--- a/pinot-controller/src/main/resources/static/query/index.html
+++ b/pinot-controller/src/main/resources/static/query/index.html
@@ -1,3 +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.
+
+-->
+
<!DOCTYPE html>
<head>
diff --git a/pinot-controller/src/main/resources/webapp/css/pinot.css b/pinot-controller/src/main/resources/webapp/css/pinot.css
index 164b37c..a2fbfe1 100644
--- a/pinot-controller/src/main/resources/webapp/css/pinot.css
+++ b/pinot-controller/src/main/resources/webapp/css/pinot.css
@@ -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.
+ */
body {
/* font-family: tahoma;*/
background:#e8e8e8;
diff --git a/pinot-controller/src/main/resources/webapp/index.html b/pinot-controller/src/main/resources/webapp/index.html
index aba0717..7f209c9 100644
--- a/pinot-controller/src/main/resources/webapp/index.html
+++ b/pinot-controller/src/main/resources/webapp/index.html
@@ -1,3 +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.
+
+-->
+
<!DOCTYPE html>
<head>
@@ -113,7 +134,7 @@
{{else}}
<td class="{{incomingGranularitySpec.fieldType}}">{{incomingGranularitySpec.name}}</td>
<td class="{{incomingGranularitySpec.fieldType}}">{{incomingGranularitySpec.dataType}}</td>
- {{/if}}
+ {{/if}}
{{/if}}
</tbody>
@@ -130,7 +151,7 @@
{{/each}}
</tr>
</thead>
-
+
<tbody>
{{#each results}}
<tr>
diff --git a/pinot-controller/src/main/resources/webapp/js/init.js b/pinot-controller/src/main/resources/webapp/js/init.js
index cd5c2ab..a01b65a 100644
--- a/pinot-controller/src/main/resources/webapp/js/init.js
+++ b/pinot-controller/src/main/resources/webapp/js/init.js
@@ -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.
+ */
var JS_BEAUTIFY_SETTINGS = {
indent_size : 4,
indent_char : ' ',
diff --git a/pinot-perf/src/main/resources/log4j.properties b/pinot-perf/src/main/resources/log4j.properties
index 49727a2..0b6dcde 100644
--- a/pinot-perf/src/main/resources/log4j.properties
+++ b/pinot-perf/src/main/resources/log4j.properties
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
log4j.rootLogger=INFO, stdout
log4j.logger.org.apache.pinot=INFO
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/pinot-server/src/main/resources/api/index.html b/pinot-server/src/main/resources/api/index.html
index 8c2304c..d6ba570 100644
--- a/pinot-server/src/main/resources/api/index.html
+++ b/pinot-server/src/main/resources/api/index.html
@@ -1,3 +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.
+
+-->
+
<!-- This is directly copied from Swagger repository and modified to change url variable -->
<!DOCTYPE html>
<html>
diff --git a/pinot-tools/src/main/resources/appAssemblerScriptTemplate b/pinot-tools/src/main/resources/appAssemblerScriptTemplate
index 800adbd..3c106e8 100644
--- a/pinot-tools/src/main/resources/appAssemblerScriptTemplate
+++ b/pinot-tools/src/main/resources/appAssemblerScriptTemplate
@@ -1,3 +1,22 @@
+#!/bin/bash -x
+#
+# 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.
+#
# resolve links - $0 may be a softlink
PRG="$0"
@@ -36,7 +55,7 @@ case "`uname`" in
else
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
fi
- fi
+ fi
;;
esac
diff --git a/pinot-tools/src/main/resources/conf/default_broker.properties b/pinot-tools/src/main/resources/conf/default_broker.properties
index e69de29..d8a500d 100644
--- a/pinot-tools/src/main/resources/conf/default_broker.properties
+++ b/pinot-tools/src/main/resources/conf/default_broker.properties
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+
diff --git a/pinot-tools/src/main/resources/conf/default_controller.properties b/pinot-tools/src/main/resources/conf/default_controller.properties
index e69de29..d8a500d 100644
--- a/pinot-tools/src/main/resources/conf/default_controller.properties
+++ b/pinot-tools/src/main/resources/conf/default_controller.properties
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+
diff --git a/pinot-tools/src/main/resources/conf/default_server.properties b/pinot-tools/src/main/resources/conf/default_server.properties
index e69de29..d8a500d 100644
--- a/pinot-tools/src/main/resources/conf/default_server.properties
+++ b/pinot-tools/src/main/resources/conf/default_server.properties
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+
diff --git a/pinot-tools/src/main/resources/conf/pinot-admin-log4j.properties b/pinot-tools/src/main/resources/conf/pinot-admin-log4j.properties
index 3717e9b..833c2d0 100644
--- a/pinot-tools/src/main/resources/conf/pinot-admin-log4j.properties
+++ b/pinot-tools/src/main/resources/conf/pinot-admin-log4j.properties
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
log4j.rootLogger=INFO, stdout
log4j.logger.org.apache.pinot=INFO
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/pinot-tools/src/main/resources/conf/pinot-broker-log4j.properties b/pinot-tools/src/main/resources/conf/pinot-broker-log4j.properties
index 3093e7b..62b5569 100644
--- a/pinot-tools/src/main/resources/conf/pinot-broker-log4j.properties
+++ b/pinot-tools/src/main/resources/conf/pinot-broker-log4j.properties
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
log4j.rootLogger=INFO, brokerLog, consoleWarn
log4j.appender.brokerLog=org.apache.log4j.FileAppender
diff --git a/pinot-tools/src/main/resources/conf/pinot-controller-log4j.properties b/pinot-tools/src/main/resources/conf/pinot-controller-log4j.properties
index c79b8ae..4df8014 100644
--- a/pinot-tools/src/main/resources/conf/pinot-controller-log4j.properties
+++ b/pinot-tools/src/main/resources/conf/pinot-controller-log4j.properties
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
log4j.rootLogger=INFO, controllerLog, consoleWarn
# Direct most logs to the log file
diff --git a/pinot-tools/src/main/resources/conf/pinot-server-log4j.properties b/pinot-tools/src/main/resources/conf/pinot-server-log4j.properties
index 4756957..4f49f19 100644
--- a/pinot-tools/src/main/resources/conf/pinot-server-log4j.properties
+++ b/pinot-tools/src/main/resources/conf/pinot-server-log4j.properties
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
log4j.rootLogger=INFO, serverLog, consoleWarn
log4j.appender.serverLog=org.apache.log4j.FileAppender
diff --git a/pinot-tools/src/main/resources/conf/pinot-tools-log4j.properties b/pinot-tools/src/main/resources/conf/pinot-tools-log4j.properties
index aded2f7..e282ea0 100644
--- a/pinot-tools/src/main/resources/conf/pinot-tools-log4j.properties
+++ b/pinot-tools/src/main/resources/conf/pinot-tools-log4j.properties
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
log4j.rootLogger=INFO, stdout
log4j.logger.org.apache.pinot=INFO
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/pinot-tools/src/main/resources/conf/quickstart-log4j.properties b/pinot-tools/src/main/resources/conf/quickstart-log4j.properties
index 46d3256..99d41ec 100644
--- a/pinot-tools/src/main/resources/conf/quickstart-log4j.properties
+++ b/pinot-tools/src/main/resources/conf/quickstart-log4j.properties
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
log4j.rootLogger=ERROR, stdout
log4j.logger.org.apache.pinot=ERROR
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/pinot-tools/src/main/resources/conf/quickstart-offline-log4j.properties b/pinot-tools/src/main/resources/conf/quickstart-offline-log4j.properties
index 9b1b13a..6cd3826 100644
--- a/pinot-tools/src/main/resources/conf/quickstart-offline-log4j.properties
+++ b/pinot-tools/src/main/resources/conf/quickstart-offline-log4j.properties
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
log4j.rootLogger=ERROR, stdout
log4j.logger.org.apache.pinot=ERROR
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/pinot-tools/src/main/resources/conf/quickstart-realtime-log4j.properties b/pinot-tools/src/main/resources/conf/quickstart-realtime-log4j.properties
index 9b1b13a..6cd3826 100644
--- a/pinot-tools/src/main/resources/conf/quickstart-realtime-log4j.properties
+++ b/pinot-tools/src/main/resources/conf/quickstart-realtime-log4j.properties
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
log4j.rootLogger=ERROR, stdout
log4j.logger.org.apache.pinot=ERROR
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/pinot-tools/src/main/resources/conf/sample_perf_benchmark.yaml b/pinot-tools/src/main/resources/conf/sample_perf_benchmark.yaml
index eab302b..218be57 100644
--- a/pinot-tools/src/main/resources/conf/sample_perf_benchmark.yaml
+++ b/pinot-tools/src/main/resources/conf/sample_perf_benchmark.yaml
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
!!org.apache.pinot.tools.perf.PerfBenchmarkDriverConf
brokerPort: 8099
cleanOnStartup: false
diff --git a/pinot-tools/src/main/resources/log4j.properties b/pinot-tools/src/main/resources/log4j.properties
index 50d39e7..1bdef99 100644
--- a/pinot-tools/src/main/resources/log4j.properties
+++ b/pinot-tools/src/main/resources/log4j.properties
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
log4j.rootLogger=INFO, stdout
log4j.logger.org.apache.pinot=INFO
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/pinot-tools/src/main/resources/star-tree.html b/pinot-tools/src/main/resources/star-tree.html
index 19682d4..c39d7b7 100644
--- a/pinot-tools/src/main/resources/star-tree.html
+++ b/pinot-tools/src/main/resources/star-tree.html
@@ -1,3 +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.
+
+-->
+
<!DOCTYPE html>
<meta charset="utf-8">
<style>
diff --git a/pom.xml b/pom.xml
index 89f41c8..423568a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1007,14 +1007,20 @@
<artifactId>license-maven-plugin</artifactId>
<version>2.8</version>
<configuration>
- <header>license.header</header>
+ <header>HEADER</header>
<excludes>
<!-- Text and log files -->
<exclude>**/*.txt</exclude>
<exclude>**/*.log</exclude>
- <!-- Resource directories under main and test -->
- <exclude>**/src/main/resources/**</exclude>
+ <exclude>**/*.pql</exclude>
+ <exclude>**/*.config</exclude>
+ <exclude>**/*.csv</exclude>
+ <exclude>**/*.avro</exclude>
+ <exclude>**/*.conf</exclude>
+ <exclude>**/appAssemblerScriptTemplate</exclude>
+
+ <!-- Resource directories under test -->
<exclude>**/src/test/resources/**</exclude>
<!-- Auto-generated target directories -->
@@ -1030,9 +1036,22 @@
<!-- Top level files -->
<exclude>.codecov*</exclude>
- <exclude>license.header</exclude>
+ <exclude>HEADER</exclude>
<exclude>LICENSE</exclude>
<exclude>NOTICE</exclude>
+
+ <!-- js, css files that are exact copies of the third-party works. In this case, the original header has to
+ be kept. Please refer to 'Treatment of Third-party works' in https://www.apache.org/legal/src-headers.html
+ -->
+ <exclude>**/codemirror/**</exclude>
+ <exclude>**/codemirror*</exclude>
+ <exclude>**/foundation*</exclude>
+ <exclude>**/angular*</exclude>
+ <exclude>**/underscore*</exclude>
+ <exclude>**/jquery*</exclude>
+ <exclude>**/normalize*</exclude>
+ <exclude>**/handlebars*</exclude>
+ <exclude>**/beautify*</exclude>
</excludes>
<mapping>
<thrift>JAVADOC_STYLE</thrift>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org