You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gi...@apache.org on 2023/12/15 07:27:45 UTC

(logging-log4j-samples) branch dependabot/maven/org.jetbrains.kotlin-kotlin-bom-1.9.21 updated (3b50ec0 -> 1cc8a48)

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch dependabot/maven/org.jetbrains.kotlin-kotlin-bom-1.9.21
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git


    omit 3b50ec0  Bump org.jetbrains.kotlin:kotlin-bom from 1.9.10 to 1.9.21
     add b849174  Replace XML configuration with JSON
     add 5eb0d42  Fix version of modules removed from Log4j BOM
     add 1f18d44  Fix dependency convergence
     add 0dd6532  Fix versioning breaking the build
     add 1c72117  Add Maven Central explictly to Dependabot config
     add 3489c7e  Reformat using Palantir formatter
     add c3e9137  Pin reusable workflows to version 10.4.0
     add 299abc0  Fix remaining formatting errors
     add 14ffa23  Revert "Fix remaining formatting errors"
     add 58b59f2  Disable BND Baseline
     add 75dc112  Update `org.apache.logging:logging-parent` to version `10.4.0` (#92)
     add 1cc8a48  Bump org.jetbrains.kotlin:kotlin-bom from 1.9.10 to 1.9.21

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (3b50ec0)
            \
             N -- N -- N   refs/heads/dependabot/maven/org.jetbrains.kotlin-kotlin-bom-1.9.21 (1cc8a48)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .github/dependabot.yaml                            | 10 +++
 .github/workflows/build.yaml                       |  2 +-
 .github/workflows/merge-dependabot.yaml            |  4 +-
 .../log4j/samples/async/Log4J2AsyncLogger.java     | 11 ++-
 .../async/Log4J2AsyncLoggerExceptionExample.java   |  1 -
 .../samples/configuration/CustomConfiguration.java |  8 +-
 .../configuration/CustomConfigurationFactory.java  |  6 +-
 .../logging/log4j/samples/app/LogEventFactory.java | 16 ++--
 .../logging/log4j/samples/app/LoggingApp.java      |  6 +-
 .../log4j/samples/app/LoggingController.java       | 98 +++++++++++-----------
 .../log4j/samples/app/MockEventsSupplier.java      |  9 +-
 .../logging/log4j/samples/dto/Constraint.java      |  1 -
 .../logging/log4j/samples/dto/RequestContext.java  | 19 ++---
 .../apache/logging/log4j/samples/events/Alert.java |  1 -
 .../log4j/samples/events/ChangePassword.java       |  1 -
 .../apache/logging/log4j/samples/events/Login.java |  2 -
 .../log4j/samples/events/ScheduledTransaction.java |  3 -
 .../logging/log4j/samples/events/Transfer.java     |  3 -
 .../apache/logging/log4j/samples/jlink/Main.java   |  1 -
 log4j-samples-jlink/src/main/resources/log4j2.json | 20 +++++
 log4j-samples-jlink/src/main/resources/log4j2.xml  | 29 -------
 .../apache/logging/log4j/lookup/CustomLookup.java  |  3 -
 .../logging/log4j/lookup/CustomMapMessage.java     |  2 -
 .../logging/log4j/lookup/MapMessageLookup.java     |  3 -
 .../apache/logging/log4j/CustomPropertiesTest.java |  3 -
 .../apache/logging/log4j/MapMessageLookupTest.java | 18 ++--
 log4j-server/pom.xml                               |  3 +
 .../log4j/server/AbstractLogEventBridge.java       |  2 -
 .../logging/log4j/server/AbstractSocketServer.java | 32 ++++---
 .../log4j/server/InputStreamLogEventBridge.java    |  7 +-
 .../org/apache/logging/log4j/server/JmsServer.java | 34 +++++---
 .../server/JsonInputStreamLogEventBridge.java      | 41 +++++----
 .../logging/log4j/server/LogEventBridge.java       |  1 -
 .../server/ObjectInputStreamLogEventBridge.java    |  3 +-
 .../log4j/server/SecureTcpSocketServer.java        | 19 +++--
 .../logging/log4j/server/TcpSocketServer.java      | 51 ++++++-----
 .../logging/log4j/server/UdpSocketServer.java      | 15 ++--
 .../log4j/server/XmlInputStreamLogEventBridge.java |  4 +-
 .../log4j/server/mom/jms/AbstractJmsReceiver.java  |  9 +-
 .../log4j/server/mom/jms/JmsQueueReceiver.java     |  5 +-
 .../log4j/server/mom/jms/JmsTopicReceiver.java     |  5 +-
 .../log4j/server/AbstractSocketServerTest.java     | 60 ++++++-------
 .../log4j/server/SslXmlSocketServerTest.java       | 37 ++++----
 .../log4j/server/TcpJsonSocketServerTest.java      |  2 -
 .../log4j/server/TcpXmlSocketServerTest.java       |  6 +-
 .../log4j/server/UdpJsonSocketServerTest.java      |  2 -
 .../log4j/server/UdpXmlSocketServerTest.java       |  5 +-
 .../mom/activemq/ActiveMqBrokerServiceHelper.java  |  2 -
 .../mom/activemq/ActiveMqBrokerServiceRule.java    | 20 +++--
 .../log4j/server/mom/jms/JmsQueueReceiverTest.java | 19 +++--
 .../cloud/config/sample/SampleApplication.java     |  3 +-
 .../sample/config/GlobalExceptionHandler.java      |  2 -
 .../cloud/config/sample/config/WebMvcConfig.java   |  2 -
 .../config/sample/controller/K8SController.java    |  9 +-
 .../config/sample/controller/SampleController.java | 13 ++-
 .../utils/spring/SampleResponseErrorHandler.java   |  5 +-
 .../service/config/SecurityConfiguration.java      |  4 +-
 .../service/ConfigServiceApplicationTest.java      |  4 +-
 pom.xml                                            | 27 ++++--
 .../update_org_apache_logging_logging_parent.xml}  |  5 +-
 60 files changed, 364 insertions(+), 374 deletions(-)
 create mode 100644 log4j-samples-jlink/src/main/resources/log4j2.json
 delete mode 100644 log4j-samples-jlink/src/main/resources/log4j2.xml
 copy src/changelog/{.2.x.x/update_org_springframework_boot_spring_boot_starter_parent.xml => .0.x.x/update_org_apache_logging_logging_parent.xml} (56%)