You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by ja...@apache.org on 2019/01/15 01:50:07 UTC
[incubator-pinot] 01/01: Update license-maven-plugin setting to
correctly exclude files
This is an automated email from the ASF dual-hosted git repository.
jackie pushed a commit to branch fix_license_check
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit 96520042ae9b84fd5cb292543e3bcd186ba93a0d
Author: Jackie (Xiaotian) Jiang <xa...@linkedin.com>
AuthorDate: Mon Jan 14 17:30:04 2019 -0800
Update license-maven-plugin setting to correctly exclude files
Also remove stale license headers from excluded files
---
.codecov.yml | 19 --------------
.gitignore | 18 --------------
contrib/pinot-druid-benchmark/run_benchmark.sh | 1 -
pinot-api/src/test/resources/log4j.properties | 16 ------------
pinot-broker/src/test/resources/log4j.properties | 16 ------------
.../metadata/segment/SegmentPartitionMetadata.java | 16 ------------
.../src/main/resources/log4j-fatal-only.properties | 16 ------------
.../main/resources/logging-severe-only.properties | 16 ------------
pinot-common/src/test/resources/log4j.properties | 16 ------------
.../src/test/resources/log4j.properties | 16 ------------
.../test/resources/conf/pinot-broker.properties | 17 -------------
.../test/resources/conf/query-executor.properties | 15 -----------
pinot-core/src/test/resources/log4j.properties | 16 ------------
.../src/test/resources/log4j.properties | 16 ------------
pinot-minion/src/test/resources/log4j.properties | 15 -----------
pinot-perf/src/main/resources/log4j.properties | 16 ------------
.../test/resources/conf/pinot-broker.properties | 17 -------------
.../pinot/tools/scan/query/GroupByOperator.java | 16 ------------
.../resources/conf/pinot-admin-log4j.properties | 16 ------------
.../resources/conf/pinot-broker-log4j.properties | 16 ------------
.../conf/pinot-controller-log4j.properties | 16 ------------
.../resources/conf/pinot-server-log4j.properties | 16 ------------
.../resources/conf/pinot-tools-log4j.properties | 16 ------------
.../resources/conf/quickstart-log4j.properties | 16 ------------
.../conf/quickstart-offline-log4j.properties | 16 ------------
.../conf/quickstart-realtime-log4j.properties | 16 ------------
.../main/resources/conf/sample_perf_benchmark.yaml | 16 ------------
pinot-tools/src/main/resources/log4j.properties | 16 ------------
pinot-tools/src/main/resources/star-tree.html | 18 --------------
pom.xml | 29 +++++++++++++++-------
30 files changed, 20 insertions(+), 465 deletions(-)
diff --git a/.codecov.yml b/.codecov.yml
index c0e4b9b..ee708be 100644
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -1,22 +1,3 @@
-#
-# 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.
-#
-
coverage:
ignore:
# Ignore all files under pinot-tools, pinot-perf and pinot-hadoop.
diff --git a/.gitignore b/.gitignore
index bf695e0..205d401 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,3 @@
-#
-# 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.
-#
cscope.*
.classpath
.project
diff --git a/contrib/pinot-druid-benchmark/run_benchmark.sh b/contrib/pinot-druid-benchmark/run_benchmark.sh
index e51669e..7121268 100755
--- a/contrib/pinot-druid-benchmark/run_benchmark.sh
+++ b/contrib/pinot-druid-benchmark/run_benchmark.sh
@@ -18,7 +18,6 @@
# under the License.
#
-
echo "Compiling the benchmark driver..."
mvn clean install > /dev/null
rm -rf temp results
diff --git a/pinot-api/src/test/resources/log4j.properties b/pinot-api/src/test/resources/log4j.properties
index 9f399d0..90083a8 100644
--- a/pinot-api/src/test/resources/log4j.properties
+++ b/pinot-api/src/test/resources/log4j.properties
@@ -1,19 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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=WARN, stdout
log4j.logger.org.apache.pinot=WARN
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/pinot-broker/src/test/resources/log4j.properties b/pinot-broker/src/test/resources/log4j.properties
index 9f399d0..90083a8 100644
--- a/pinot-broker/src/test/resources/log4j.properties
+++ b/pinot-broker/src/test/resources/log4j.properties
@@ -1,19 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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=WARN, stdout
log4j.logger.org.apache.pinot=WARN
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/SegmentPartitionMetadata.java b/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/SegmentPartitionMetadata.java
index 34a3703..1c41990 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/SegmentPartitionMetadata.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/metadata/segment/SegmentPartitionMetadata.java
@@ -18,22 +18,6 @@
*/
package org.apache.pinot.common.metadata.segment;
-/**
- * Copyright (C) 2014-2018 LinkedIn Corp. (pinot-core@linkedin.com)
- *
- * Licensed 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.
- */
-
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/pinot-common/src/main/resources/log4j-fatal-only.properties b/pinot-common/src/main/resources/log4j-fatal-only.properties
index ce07baa..f41cd5e 100644
--- a/pinot-common/src/main/resources/log4j-fatal-only.properties
+++ b/pinot-common/src/main/resources/log4j-fatal-only.properties
@@ -1,19 +1,3 @@
-#
-# Copyright (C) 2014-2018 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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 2a8be44..a55ee0b 100644
--- a/pinot-common/src/main/resources/logging-severe-only.properties
+++ b/pinot-common/src/main/resources/logging-severe-only.properties
@@ -1,17 +1 @@
-#
-# Copyright (C) 2014-2018 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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/test/resources/log4j.properties b/pinot-common/src/test/resources/log4j.properties
index 9f399d0..90083a8 100644
--- a/pinot-common/src/test/resources/log4j.properties
+++ b/pinot-common/src/test/resources/log4j.properties
@@ -1,19 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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=WARN, stdout
log4j.logger.org.apache.pinot=WARN
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/pinot-controller/src/test/resources/log4j.properties b/pinot-controller/src/test/resources/log4j.properties
index 9f399d0..90083a8 100644
--- a/pinot-controller/src/test/resources/log4j.properties
+++ b/pinot-controller/src/test/resources/log4j.properties
@@ -1,19 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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=WARN, stdout
log4j.logger.org.apache.pinot=WARN
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/pinot-core/src/test/resources/conf/pinot-broker.properties b/pinot-core/src/test/resources/conf/pinot-broker.properties
index e28cb4d..2efa525 100644
--- a/pinot-core/src/test/resources/conf/pinot-broker.properties
+++ b/pinot-core/src/test/resources/conf/pinot-broker.properties
@@ -1,20 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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.
-#
-
-
pinot.broker.routing.tableName=testTable
# Number of nodes constituting a replica-set. A replica-set has 0-(n-1) nodes where n is the below config value.
pinot.broker.routing.testTable.numNodesPerReplica=1
diff --git a/pinot-core/src/test/resources/conf/query-executor.properties b/pinot-core/src/test/resources/conf/query-executor.properties
index 8f0b293..ad40f06 100644
--- a/pinot-core/src/test/resources/conf/query-executor.properties
+++ b/pinot-core/src/test/resources/conf/query-executor.properties
@@ -1,18 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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.
-#
pruner.class=ColumnValueSegmentPruner,DataSchemaSegmentPruner,ValidSegmentPruner,PartitionSegmentPruner
pruner.ColumnValueSegmentPruner.id=0
pruner.DataSchemaSegmentPruner.id=1
diff --git a/pinot-core/src/test/resources/log4j.properties b/pinot-core/src/test/resources/log4j.properties
index 9f399d0..90083a8 100644
--- a/pinot-core/src/test/resources/log4j.properties
+++ b/pinot-core/src/test/resources/log4j.properties
@@ -1,19 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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=WARN, stdout
log4j.logger.org.apache.pinot=WARN
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/pinot-integration-tests/src/test/resources/log4j.properties b/pinot-integration-tests/src/test/resources/log4j.properties
index 517150a..ca6440f 100644
--- a/pinot-integration-tests/src/test/resources/log4j.properties
+++ b/pinot-integration-tests/src/test/resources/log4j.properties
@@ -1,19 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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=WARN, stdout
log4j.logger.org.apache.pinot=WARN
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/pinot-minion/src/test/resources/log4j.properties b/pinot-minion/src/test/resources/log4j.properties
index 4161aca..90083a8 100644
--- a/pinot-minion/src/test/resources/log4j.properties
+++ b/pinot-minion/src/test/resources/log4j.properties
@@ -1,18 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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=WARN, stdout
log4j.logger.org.apache.pinot=WARN
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/pinot-perf/src/main/resources/log4j.properties b/pinot-perf/src/main/resources/log4j.properties
index a39ee26..49727a2 100644
--- a/pinot-perf/src/main/resources/log4j.properties
+++ b/pinot-perf/src/main/resources/log4j.properties
@@ -1,19 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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/test/resources/conf/pinot-broker.properties b/pinot-server/src/test/resources/conf/pinot-broker.properties
index e28cb4d..2efa525 100644
--- a/pinot-server/src/test/resources/conf/pinot-broker.properties
+++ b/pinot-server/src/test/resources/conf/pinot-broker.properties
@@ -1,20 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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.
-#
-
-
pinot.broker.routing.tableName=testTable
# Number of nodes constituting a replica-set. A replica-set has 0-(n-1) nodes where n is the below config value.
pinot.broker.routing.testTable.numNodesPerReplica=1
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/scan/query/GroupByOperator.java b/pinot-tools/src/main/java/org/apache/pinot/tools/scan/query/GroupByOperator.java
index 7064f4b..67dcde0 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/scan/query/GroupByOperator.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/scan/query/GroupByOperator.java
@@ -18,22 +18,6 @@
*/
package org.apache.pinot.tools.scan.query;
-/**
- * Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
- *
- * Licensed 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.
- */
-
import java.util.List;
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 3b8ad77..3717e9b 100644
--- a/pinot-tools/src/main/resources/conf/pinot-admin-log4j.properties
+++ b/pinot-tools/src/main/resources/conf/pinot-admin-log4j.properties
@@ -1,19 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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 b8be455..3093e7b 100644
--- a/pinot-tools/src/main/resources/conf/pinot-broker-log4j.properties
+++ b/pinot-tools/src/main/resources/conf/pinot-broker-log4j.properties
@@ -1,19 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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 c8be6da..c79b8ae 100644
--- a/pinot-tools/src/main/resources/conf/pinot-controller-log4j.properties
+++ b/pinot-tools/src/main/resources/conf/pinot-controller-log4j.properties
@@ -1,19 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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 2fc4185..4756957 100644
--- a/pinot-tools/src/main/resources/conf/pinot-server-log4j.properties
+++ b/pinot-tools/src/main/resources/conf/pinot-server-log4j.properties
@@ -1,19 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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 04ab34d..aded2f7 100644
--- a/pinot-tools/src/main/resources/conf/pinot-tools-log4j.properties
+++ b/pinot-tools/src/main/resources/conf/pinot-tools-log4j.properties
@@ -1,19 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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 15a87e2..46d3256 100644
--- a/pinot-tools/src/main/resources/conf/quickstart-log4j.properties
+++ b/pinot-tools/src/main/resources/conf/quickstart-log4j.properties
@@ -1,19 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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 ee39f8f..9b1b13a 100644
--- a/pinot-tools/src/main/resources/conf/quickstart-offline-log4j.properties
+++ b/pinot-tools/src/main/resources/conf/quickstart-offline-log4j.properties
@@ -1,19 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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 ee39f8f..9b1b13a 100644
--- a/pinot-tools/src/main/resources/conf/quickstart-realtime-log4j.properties
+++ b/pinot-tools/src/main/resources/conf/quickstart-realtime-log4j.properties
@@ -1,19 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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 5440b62..eab302b 100644
--- a/pinot-tools/src/main/resources/conf/sample_perf_benchmark.yaml
+++ b/pinot-tools/src/main/resources/conf/sample_perf_benchmark.yaml
@@ -1,19 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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 f8125d0..50d39e7 100644
--- a/pinot-tools/src/main/resources/log4j.properties
+++ b/pinot-tools/src/main/resources/log4j.properties
@@ -1,19 +1,3 @@
-#
-# Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-#
-# Licensed 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 4896679..19682d4 100644
--- a/pinot-tools/src/main/resources/star-tree.html
+++ b/pinot-tools/src/main/resources/star-tree.html
@@ -1,22 +1,4 @@
<!DOCTYPE html>
-<!--
-
- Copyright (C) 2014-2015 LinkedIn Corp. (pinot-core@linkedin.com)
-
- Licensed 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.
-
--->
-
<meta charset="utf-8">
<style>
diff --git a/pom.xml b/pom.xml
index a28205b..0736dc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1036,20 +1036,31 @@
<configuration>
<header>license.header</header>
<excludes>
+ <!-- Text and log files -->
<exclude>**/*.txt</exclude>
<exclude>**/*.log</exclude>
- <exclude>**/target/**/*.*</exclude>
- <!-- Top level resources under main and test -->
- <exclude>**/main/resources/**/*.*</exclude>
- <exclude>**/test/resources/**/*.*</exclude>
- <exclude>thirdeye/**/*</exclude>
- <!-- Documentation files -->
- <exclude>**/docs/_build/**</exclude>
- <exclude>**/?*</exclude>
+
+ <!-- Resource directories under main and test -->
+ <exclude>**/src/main/resources/**</exclude>
+ <exclude>**/src/test/resources/**</exclude>
+
+ <!-- Auto-generated target directories -->
+ <exclude>target/**</exclude>
+ <exclude>pinot-*/target/**</exclude>
+
+ <!-- Top level directories -->
+ <exclude>thirdeye/**</exclude>
+ <exclude>docs/**</exclude>
+ <exclude>?/**</exclude>
+
+ <!-- Top level files -->
+ <exclude>.codecov*</exclude>
+ <exclude>license.header</exclude>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
</excludes>
<mapping>
<thrift>JAVADOC_STYLE</thrift>
- <g>DOUBLESLASH_STYLE</g>
<g4>JAVADOC_STYLE</g4>
</mapping>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org