This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git
The following commit(s) were added to refs/heads/master by this push: new 647022d PHOENIX-6566 shaded phoenix connectors include restricitve log4j config files 647022d is described below commit 647022d8bb6778b5b10ff7c43711e5a6866db478 Author: Istvan Toth <st...@apache.org> AuthorDate: Tue Oct 5 10:32:47 2021 +0200 PHOENIX-6566 shaded phoenix connectors include restricitve log4j config files --- phoenix-hive-base/pom.xml | 2 + phoenix-spark-base/pom.xml | 2 + phoenix-spark-base/src/main/resources/log4j.xml | 70 ------------------------- 3 files changed, 4 insertions(+), 70 deletions(-) diff --git a/phoenix-hive-base/pom.xml b/phoenix-hive-base/pom.xml index 75ac990..2f627cb 100644 --- a/phoenix-hive-base/pom.xml +++ b/phoenix-hive-base/pom.xml @@ -390,6 +390,8 @@ <exclude>NOTICE.*</exclude> <exclude>NOTICE</exclude> <exclude>README*</exclude> + <!-- Coming from Omid, should be fixed there --> + <exclude>log4j.properties</exclude> </excludes> </filter> <filter> diff --git a/phoenix-spark-base/pom.xml b/phoenix-spark-base/pom.xml index e2eff57..cf245b8 100644 --- a/phoenix-spark-base/pom.xml +++ b/phoenix-spark-base/pom.xml @@ -637,6 +637,8 @@ <exclude>NOTICE.*</exclude> <exclude>NOTICE</exclude> <exclude>README*</exclude> + <!-- Coming from Omid, should be fixed there --> + <exclude>log4j.properties</exclude> </excludes> </filter> <filter> diff --git a/phoenix-spark-base/src/main/resources/log4j.xml b/phoenix-spark-base/src/main/resources/log4j.xml deleted file mode 100644 index 10c2dc0..0000000 --- a/phoenix-spark-base/src/main/resources/log4j.xml +++ /dev/null @@ -1,70 +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. - ---> - -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> - <appender name="console" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%-4r [%t] %-5p %c %x - %m%n"/> - </layout> - </appender> - - <logger name="org.eclipse"> - <level value="ERROR"/> - </logger> - - <logger name="org.apache"> - <level value="ERROR"/> - </logger> - - <logger name = "org.apache.phoenix.mapreduce"> - <level value="FATAL"/> - </logger> - - <logger name="org.mortbay"> - <level value="ERROR"/> - </logger> - - <logger name="org.spark-project.jetty"> - <level value="ERROR"/> - </logger> - - <logger name="akka"> - <level value="ERROR"/> - </logger> - - <logger name="BlockStateChange"> - <level value="ERROR"/> - </logger> - - <logger name="io.netty"> - <level value="ERROR"/> - </logger> - - <root> - <priority value="INFO"/> - <appender-ref ref="console"/> - </root> -</log4j:configuration>