This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch release/2.21.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 1350c8dad6fe1f6530d84ee1a781998e2807d0c0 Merge: e0555a82ca 1eef142172 Author: Volkan Yazıcı <[email protected]> AuthorDate: Wed Oct 11 12:53:26 2023 +0200 Merge 'lukaszspyra/issue-1275-broken-javadoc' (#1275, #1753) .../java/org/apache/logging/log4j/BridgeAware.java | 4 ++-- .../main/java/org/apache/logging/log4j/Level.java | 3 +++ .../log4j/message/AbstractMessageFactory.java | 4 +++- .../log4j/message/FormattedMessageFactory.java | 4 +++- .../log4j/message/LocalizedMessageFactory.java | 4 +++- .../log4j/message/MessageFormatMessageFactory.java | 5 +++-- .../logging/log4j/message/ParameterConsumer.java | 2 +- .../log4j/message/ParameterizedMessageFactory.java | 4 +++- .../ParameterizedNoReferenceMessageFactory.java | 4 +++- .../logging/log4j/message/SimpleMessageFactory.java | 5 +++-- .../log4j/message/StringFormattedMessage.java | 4 +++- .../log4j/message/StringFormatterMessageFactory.java | 4 +++- .../logging/log4j/message/StructuredDataId.java | 7 ++++--- .../logging/log4j/spi/MutableThreadContextStack.java | 2 +- .../org/apache/logging/log4j/util/EnglishEnums.java | 6 +++--- .../org/apache/logging/log4j/util/ProcessIdUtil.java | 2 +- .../core/appender/AbstractOutputStreamAppender.java | 4 ++++ .../log4j/core/appender/AbstractWriterAppender.java | 7 +++++++ .../core/appender/db/jdbc/JdbcDatabaseManager.java | 7 ++++--- .../core/appender/rolling/action/DeleteAction.java | 4 ++-- .../appender/rolling/action/ScriptCondition.java | 14 +++++++------- .../core/appender/rolling/action/SortingVisitor.java | 5 ++--- .../log4j/core/appender/routing/PurgePolicy.java | 4 ++-- .../core/async/DiscardingAsyncQueueFullPolicy.java | 2 +- .../logging/log4j/core/config/DefaultAdvertiser.java | 2 +- .../apache/logging/log4j/core/config/Property.java | 2 +- .../core/config/plugins/convert/Base64Converter.java | 2 +- .../core/config/plugins/convert/HexConverter.java | 2 +- .../logging/log4j/core/filter/RegexFilter.java | 4 ++-- .../logging/log4j/core/filter/StringMatchFilter.java | 2 +- .../logging/log4j/core/impl/ExtendedClassInfo.java | 6 +++--- .../log4j/core/impl/ExtendedStackTraceElement.java | 2 +- .../log4j/core/impl/ThrowableFormatOptions.java | 10 +++++----- .../logging/log4j/core/impl/ThrowableProxy.java | 8 ++++---- .../logging/log4j/core/layout/AbstractLayout.java | 4 ++-- .../log4j/core/layout/LevelPatternSelector.java | 10 +++++----- .../log4j/core/layout/MarkerPatternSelector.java | 10 +++++----- .../logging/log4j/core/layout/PatternLayout.java | 16 ++++++++-------- .../log4j/core/layout/ScriptPatternSelector.java | 12 ++++++------ .../log4j/core/net/DatagramSocketManager.java | 14 +++++++------- .../org/apache/logging/log4j/core/net/Facility.java | 4 +++- .../log4j/core/net/MulticastDnsAdvertiser.java | 2 +- .../logging/log4j/core/net/SslSocketManager.java | 20 ++++++++++---------- .../log4j/core/pattern/NamePatternConverter.java | 1 - .../core/pattern/RootThrowablePatternConverter.java | 6 +++--- .../core/pattern/ThrowablePatternConverter.java | 8 ++++---- .../apache/logging/log4j/core/util/Constants.java | 8 ++++---- .../logging/log4j/core/util/CronExpression.java | 1 + .../apache/logging/log4j/core/util/FileUtils.java | 4 ++-- .../org/apache/logging/log4j/core/util/Loader.java | 2 +- .../logging/log4j/core/util/ReflectionUtil.java | 2 +- .../log4j/core/util/datetime/FastDateParser.java | 3 ++- pom.xml | 3 ++- 53 files changed, 158 insertions(+), 123 deletions(-) diff --cc pom.xml index cd947bbf75,ade62ed667..710361a64e --- a/pom.xml +++ b/pom.xml @@@ -326,9 -321,10 +326,10 @@@ <!-- `maven-javadoc-plugin` is only used to generate Javadoc HTML used in the website. We don't deploy any Javadoc JARs. We also don't generate Javadoc HTML for all modules, but only for two modules: `log4j-api` and `log4j-core`. --> + <javadoc.doclint>all,-missing,-html</javadoc.doclint> <javadoc.skip>true</javadoc.skip> <!-- Skipping `maven-site-plugin` globally. - It is manually enabled only for the parent module below. --> + It is manually enabled only for this root module below. --> <maven.site.skip>true</maven.site.skip> <maven.site.deploy.skip>true</maven.site.deploy.skip>
