KYLIN-3195 Fix Apache RAT checks
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/490891e3 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/490891e3 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/490891e3 Branch: refs/heads/sync Commit: 490891e39ca3176f67058a3f7cd4b15fe3941b99 Parents: ff8bece Author: Billy Liu <billy...@apache.org> Authored: Wed Jan 31 17:04:00 2018 +0800 Committer: Billy Liu <billy...@apache.org> Committed: Wed Jan 31 17:23:27 2018 +0800 ---------------------------------------------------------------------- .../calcite/rel/rules/FilterJoinRule.java | 32 +++++++---------- .../resources/mail_templates/JOB_DISCARD.ftl | 17 +++++++++ .../main/resources/mail_templates/JOB_ERROR.ftl | 17 +++++++++ .../resources/mail_templates/JOB_SUCCEED.ftl | 17 +++++++++ .../mail_templates/METADATA_PERSIST_FAIL.ftl | 17 +++++++++ external/htrace/pom.xml | 38 +++++++++----------- external/pom.xml | 38 +++++++++----------- pom.xml | 11 ++++++ 8 files changed, 124 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/490891e3/atopcalcite/src/main/java/org/apache/calcite/rel/rules/FilterJoinRule.java ---------------------------------------------------------------------- diff --git a/atopcalcite/src/main/java/org/apache/calcite/rel/rules/FilterJoinRule.java b/atopcalcite/src/main/java/org/apache/calcite/rel/rules/FilterJoinRule.java index 4fdde17..f758b40 100644 --- a/atopcalcite/src/main/java/org/apache/calcite/rel/rules/FilterJoinRule.java +++ b/atopcalcite/src/main/java/org/apache/calcite/rel/rules/FilterJoinRule.java @@ -1,25 +1,19 @@ /* - * Copyright (C) 2016 Kyligence Inc. All rights reserved. + * 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://kyligence.io + * http://www.apache.org/licenses/LICENSE-2.0 * - * This software is the confidential and proprietary information of - * Kyligence Inc. ("Confidential Information"). You shall not disclose - * such Confidential Information and shall use it only in accordance - * with the terms of the license agreement you entered into with - * Kyligence Inc. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.calcite.rel.rules; http://git-wip-us.apache.org/repos/asf/kylin/blob/490891e3/core-job/src/main/resources/mail_templates/JOB_DISCARD.ftl ---------------------------------------------------------------------- diff --git a/core-job/src/main/resources/mail_templates/JOB_DISCARD.ftl b/core-job/src/main/resources/mail_templates/JOB_DISCARD.ftl index 9712982..ab0de2e 100644 --- a/core-job/src/main/resources/mail_templates/JOB_DISCARD.ftl +++ b/core-job/src/main/resources/mail_templates/JOB_DISCARD.ftl @@ -1,3 +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. +--> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> <html xmlns="http://www.w3.org/1999/xhtml";> http://git-wip-us.apache.org/repos/asf/kylin/blob/490891e3/core-job/src/main/resources/mail_templates/JOB_ERROR.ftl ---------------------------------------------------------------------- diff --git a/core-job/src/main/resources/mail_templates/JOB_ERROR.ftl b/core-job/src/main/resources/mail_templates/JOB_ERROR.ftl index 6012037..1d2e0a7 100644 --- a/core-job/src/main/resources/mail_templates/JOB_ERROR.ftl +++ b/core-job/src/main/resources/mail_templates/JOB_ERROR.ftl @@ -1,3 +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. +--> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> <html xmlns="http://www.w3.org/1999/xhtml";> http://git-wip-us.apache.org/repos/asf/kylin/blob/490891e3/core-job/src/main/resources/mail_templates/JOB_SUCCEED.ftl ---------------------------------------------------------------------- diff --git a/core-job/src/main/resources/mail_templates/JOB_SUCCEED.ftl b/core-job/src/main/resources/mail_templates/JOB_SUCCEED.ftl index f1fb45c..fdce289 100644 --- a/core-job/src/main/resources/mail_templates/JOB_SUCCEED.ftl +++ b/core-job/src/main/resources/mail_templates/JOB_SUCCEED.ftl @@ -1,3 +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. +--> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> <html xmlns="http://www.w3.org/1999/xhtml";> http://git-wip-us.apache.org/repos/asf/kylin/blob/490891e3/core-job/src/main/resources/mail_templates/METADATA_PERSIST_FAIL.ftl ---------------------------------------------------------------------- diff --git a/core-job/src/main/resources/mail_templates/METADATA_PERSIST_FAIL.ftl b/core-job/src/main/resources/mail_templates/METADATA_PERSIST_FAIL.ftl index 2511b57..f39b281 100644 --- a/core-job/src/main/resources/mail_templates/METADATA_PERSIST_FAIL.ftl +++ b/core-job/src/main/resources/mail_templates/METADATA_PERSIST_FAIL.ftl @@ -1,3 +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. +--> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> <html xmlns="http://www.w3.org/1999/xhtml";> http://git-wip-us.apache.org/repos/asf/kylin/blob/490891e3/external/htrace/pom.xml ---------------------------------------------------------------------- diff --git a/external/htrace/pom.xml b/external/htrace/pom.xml index 762f853..1c57ddb 100644 --- a/external/htrace/pom.xml +++ b/external/htrace/pom.xml @@ -1,27 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ Copyright (C) 2016 Kyligence Inc. All rights reserved. - ~ - ~ http://kyligence.io - ~ - ~ This software is the confidential and proprietary information of - ~ Kyligence Inc. ("Confidential Information"). You shall not disclose - ~ such Confidential Information and shall use it only in accordance - ~ with the terms of the license agreement you entered into with - ~ Kyligence Inc. - ~ - ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - --> + 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 xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; http://git-wip-us.apache.org/repos/asf/kylin/blob/490891e3/external/pom.xml ---------------------------------------------------------------------- diff --git a/external/pom.xml b/external/pom.xml index 8e0a40a..8a43a5d 100644 --- a/external/pom.xml +++ b/external/pom.xml @@ -1,27 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ Copyright (C) 2016 Kyligence Inc. All rights reserved. - ~ - ~ http://kyligence.io - ~ - ~ This software is the confidential and proprietary information of - ~ Kyligence Inc. ("Confidential Information"). You shall not disclose - ~ such Confidential Information and shall use it only in accordance - ~ with the terms of the license agreement you entered into with - ~ Kyligence Inc. - ~ - ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ~ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ~ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ~ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ~ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ~ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - --> + 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 xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; http://git-wip-us.apache.org/repos/asf/kylin/blob/490891e3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index dd592bf..7e3cb72 100644 --- a/pom.xml +++ b/pom.xml @@ -1213,6 +1213,9 @@ <id>sandbox</id> <activation> <activeByDefault>true</activeByDefault> + <property> + <name>pre-commit</name> + </property> </activation> <build> <plugins> @@ -1420,6 +1423,11 @@ <!-- This profile adds/overrides few features of the 'apache-release' profile in the parent pom. --> <id>apache-release</id> + <activation> + <property> + <name>pre-commit</name> + </property> + </activation> <build> <plugins> <plugin> @@ -1486,12 +1494,14 @@ <exclude>**/src/test/resources/**</exclude> <exclude>examples/sample_cube/template/**</exclude> <exclude>examples/test_case_data/localmeta/**</exclude> + <exclude>examples/test_metadata/**</exclude> <!-- generated files --> <exclude>**/target/**</exclude> <exclude>lib/**</exclude> <exclude>dist/**</exclude> <exclude>website/**</exclude> + <exclude>**/dependency-reduced-pom.xml</exclude> <!-- text files without comments --> <exclude>**/*.csv</exclude> @@ -1556,6 +1566,7 @@ <exclude>**/*.DEF</exclude> <exclude>**/*.isl</exclude> <exclude>**/*.isproj</exclude> + <exclude>**/*.bmp</exclude> <!-- protobuf generated --> <exclude>
