This is an automated email from the ASF dual-hosted git repository. rmiddleton pushed a commit to branch next_stable in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 60a98129a31b238d8cbef239cf32d7d076bb450b Merge: 849e9eb 6f81004 Author: Robert Middleton <[email protected]> AuthorDate: Sun Jan 9 11:24:08 2022 -0500 Merge branch 'master' into next_stable .github/workflows/abi-compatibility.yml | 10 ++- CMakeLists.txt | 16 +++++ src/CMakeLists.txt | 16 +++++ src/examples/cpp/CMakeLists.txt | 17 +++++ src/main/CMakeLists.txt | 16 +++++ src/main/cpp-qt/CMakeLists.txt | 17 +++++ src/main/cpp-qt/messagehandler.cpp | 5 +- src/main/cpp/CMakeLists.txt | 21 +++++- src/main/cpp/class.cpp | 5 ++ src/main/cpp/locationinfo.cpp | 8 +++ src/main/cpp/patternlayout.cpp | 3 + src/main/cpp/shortfilelocationpatternconverter.cpp | 49 ++++++++++++++ src/main/include/CMakeLists.txt | 17 +++++ src/main/include/log4cxx/log4cxx.h.in | 23 ++++++- .../pattern/shortfilelocationpatternconverter.h | 67 +++++++++++++++++++ src/main/include/log4cxx/patternlayout.h | 6 ++ .../include/log4cxx/spi/location/locationinfo.h | 52 +++++++++++++-- src/main/resources/CMakeLists.txt | 17 +++++ src/site/CMakeLists.txt | 44 +++++++++---- src/site/doxy/Doxyfile.in | 18 +++--- src/site/doxy/footer.html | 2 +- src/site/markdown/filters/MapFilter.md | 23 ++++++- src/site/markdown/usage.md | 10 +++ src/test/CMakeLists.txt | 17 +++++ src/test/cpp/CMakeLists.txt | 21 +++++- src/test/cpp/customlogger/CMakeLists.txt | 17 +++++ src/test/cpp/defaultinit/CMakeLists.txt | 17 +++++ src/test/cpp/filter/CMakeLists.txt | 17 +++++ src/test/cpp/helpers/CMakeLists.txt | 17 +++++ src/test/cpp/jsonlayouttest.cpp | 8 +-- src/test/cpp/locationdisabledtest.cpp | 75 ++++++++++++++++++++++ src/test/cpp/locationtest.cpp | 75 ++++++++++++++++++++++ src/test/cpp/net/CMakeLists.txt | 16 +++++ src/test/cpp/pattern/CMakeLists.txt | 17 +++++ src/test/cpp/patternlayouttest.cpp | 8 +++ src/test/cpp/rolling/CMakeLists.txt | 17 +++++ src/test/cpp/rolling/timebasedrollingtest.cpp | 2 + src/test/cpp/throughput/CMakeLists.txt | 19 ++++++ src/test/cpp/util/CMakeLists.txt | 17 +++++ src/test/cpp/varia/CMakeLists.txt | 17 +++++ src/test/cpp/xml/CMakeLists.txt | 17 +++++ src/test/java/CMakeLists.txt | 17 +++++ src/test/resources/input/location1.properties | 21 ++++++ .../resources/input/locationdisabled.properties | 21 ++++++ .../resources/input/patternLayout14.properties | 21 ++++++ src/test/resources/witness/location1-disabled | 1 + src/test/resources/witness/location1-good | 1 + src/test/resources/witness/patternLayout.14 | 10 +++ 48 files changed, 907 insertions(+), 41 deletions(-) diff --cc src/test/cpp/util/CMakeLists.txt index 35cd3eb,edfe47a..0262053 --- a/src/test/cpp/util/CMakeLists.txt +++ b/src/test/cpp/util/CMakeLists.txt @@@ -1,5 -1,23 +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. + # + # Components required by all tests add_library(testingUtilities STATIC - serializationtesthelper.cpp absolutedateandtimefilter.cpp absolutetimefilter.cpp binarycompare.cpp
