This is an automated email from the ASF dual-hosted git repository.
github-actions[bot] pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/logging-flume.git
The following commit(s) were added to refs/heads/trunk by this push:
new c90b93ec Bump the maven-minor-updates group with 18 updates (#492)
c90b93ec is described below
commit c90b93ec14b65ba146034a184b657065717fbf29
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri Sep 11 19:28:44 2026 +0000
Bump the maven-minor-updates group with 18 updates (#492)
* Bump the maven-minor-updates group with 18 updates
Bumps the maven-minor-updates group with 18 updates:
| Package | From | To |
| --- | --- | --- |
| [org.bouncycastle:bc-jdk18on-bom](https://github.com/bcgit/bc-java) |
`1.85` | `1.85.2` |
| [com.google.guava:guava](https://github.com/google/guava) | `33.6.0-jre`
| `33.7.1-jre` |
|
[com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf)
| `4.35.1` | `4.36.0` |
| org.eclipse.jetty.ee11:jetty-ee11-servlet | `12.1.11` | `12.1.12` |
| org.eclipse.jetty:jetty-security | `12.1.11` | `12.1.12` |
| org.eclipse.jetty:jetty-util | `12.1.11` | `12.1.12` |
| org.eclipse.jetty:jetty-server | `12.1.11` | `12.1.12` |
| org.eclipse.jetty:jetty-jmx | `12.1.11` | `12.1.12` |
| [commons-codec:commons-codec](https://github.com/apache/commons-codec) |
`1.22.0` | `1.22.1` |
|
[com.fasterxml.jackson.core:jackson-core](https://github.com/FasterXML/jackson-core)
| `2.22.1` | `2.22.2` |
|
[com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson-databind)
| `2.22.1` | `2.22.2` |
| [io.netty:netty-all](https://github.com/netty/netty) | `4.2.16.Final` |
`4.2.17.Final` |
| org.mock-server:mockserver-netty | `7.4.0` | `7.6.0` |
|
[org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit-framework)
| `6.1.2` | `6.1.3` |
|
[org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit-framework)
| `6.1.2` | `6.1.3` |
|
[org.junit.vintage:junit-vintage-engine](https://github.com/junit-team/junit-framework)
| `6.1.2` | `6.1.3` |
| org.apache.maven:apache-maven | `3.9.6` | `3.9.16` |
|
[org.apache.maven.wrapper:maven-wrapper](https://github.com/apache/maven-wrapper)
| `3.2.0` | `3.3.4` |
Updates `org.bouncycastle:bc-jdk18on-bom` from 1.85 to 1.85.2
-
[Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.md)
- [Commits](https://github.com/bcgit/bc-java/commits)
Updates `com.google.guava:guava` from 33.6.0-jre to 33.7.1-jre
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)
Updates `com.google.protobuf:protobuf-java` from 4.35.1 to 4.36.0
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Commits](https://github.com/protocolbuffers/protobuf/commits)
Updates `org.eclipse.jetty.ee11:jetty-ee11-servlet` from 12.1.11 to 12.1.12
Updates `org.eclipse.jetty:jetty-security` from 12.1.11 to 12.1.12
Updates `org.eclipse.jetty:jetty-util` from 12.1.11 to 12.1.12
Updates `org.eclipse.jetty:jetty-server` from 12.1.11 to 12.1.12
Updates `org.eclipse.jetty:jetty-jmx` from 12.1.11 to 12.1.12
Updates `org.eclipse.jetty:jetty-security` from 12.1.11 to 12.1.12
Updates `org.eclipse.jetty:jetty-util` from 12.1.11 to 12.1.12
Updates `org.eclipse.jetty:jetty-server` from 12.1.11 to 12.1.12
Updates `org.eclipse.jetty:jetty-jmx` from 12.1.11 to 12.1.12
Updates `commons-codec:commons-codec` from 1.22.0 to 1.22.1
-
[Changelog](https://github.com/apache/commons-codec/blob/master/RELEASE-NOTES.txt)
-
[Commits](https://github.com/apache/commons-codec/compare/rel/commons-codec-1.22.0...rel/commons-codec-1.22.1)
Updates `com.fasterxml.jackson.core:jackson-core` from 2.22.1 to 2.22.2
-
[Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.22.1...jackson-core-2.22.2)
Updates `com.fasterxml.jackson.core:jackson-databind` from 2.22.1 to 2.22.2
-
[Commits](https://github.com/FasterXML/jackson-databind/compare/jackson-databind-2.22.1...jackson-databind-2.22.2)
Updates `io.netty:netty-all` from 4.2.16.Final to 4.2.17.Final
- [Release notes](https://github.com/netty/netty/releases)
-
[Commits](https://github.com/netty/netty/compare/netty-4.2.16.Final...netty-4.2.17.Final)
Updates `org.mock-server:mockserver-netty` from 7.4.0 to 7.6.0
Updates `org.junit.jupiter:junit-jupiter-api` from 6.1.2 to 6.1.3
- [Release notes](https://github.com/junit-team/junit-framework/releases)
-
[Commits](https://github.com/junit-team/junit-framework/compare/r6.1.2...r6.1.3)
Updates `org.junit.jupiter:junit-jupiter-engine` from 6.1.2 to 6.1.3
- [Release notes](https://github.com/junit-team/junit-framework/releases)
-
[Commits](https://github.com/junit-team/junit-framework/compare/r6.1.2...r6.1.3)
Updates `org.junit.vintage:junit-vintage-engine` from 6.1.2 to 6.1.3
- [Release notes](https://github.com/junit-team/junit-framework/releases)
-
[Commits](https://github.com/junit-team/junit-framework/compare/r6.1.2...r6.1.3)
Updates `org.junit.jupiter:junit-jupiter-engine` from 6.1.2 to 6.1.3
- [Release notes](https://github.com/junit-team/junit-framework/releases)
-
[Commits](https://github.com/junit-team/junit-framework/compare/r6.1.2...r6.1.3)
Updates `org.junit.vintage:junit-vintage-engine` from 6.1.2 to 6.1.3
- [Release notes](https://github.com/junit-team/junit-framework/releases)
-
[Commits](https://github.com/junit-team/junit-framework/compare/r6.1.2...r6.1.3)
Updates `org.apache.maven:apache-maven` from 3.9.6 to 3.9.16
Updates `org.apache.maven.wrapper:maven-wrapper` from 3.2.0 to 3.3.4
- [Release notes](https://github.com/apache/maven-wrapper/releases)
-
[Commits](https://github.com/apache/maven-wrapper/compare/maven-wrapper-3.2.0...maven-wrapper-3.3.4)
---
updated-dependencies:
- dependency-name: org.bouncycastle:bc-jdk18on-bom
dependency-version: 1.85.2
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: com.google.guava:guava
dependency-version: 33.7.1-jre
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: maven-minor-updates
- dependency-name: com.google.protobuf:protobuf-java
dependency-version: 4.36.0
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: maven-minor-updates
- dependency-name: org.eclipse.jetty.ee11:jetty-ee11-servlet
dependency-version: 12.1.12
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.eclipse.jetty:jetty-security
dependency-version: 12.1.12
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.eclipse.jetty:jetty-util
dependency-version: 12.1.12
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.eclipse.jetty:jetty-server
dependency-version: 12.1.12
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.eclipse.jetty:jetty-jmx
dependency-version: 12.1.12
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.eclipse.jetty:jetty-security
dependency-version: 12.1.12
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.eclipse.jetty:jetty-util
dependency-version: 12.1.12
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.eclipse.jetty:jetty-server
dependency-version: 12.1.12
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.eclipse.jetty:jetty-jmx
dependency-version: 12.1.12
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: commons-codec:commons-codec
dependency-version: 1.22.1
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: com.fasterxml.jackson.core:jackson-core
dependency-version: 2.22.2
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: com.fasterxml.jackson.core:jackson-databind
dependency-version: 2.22.2
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: io.netty:netty-all
dependency-version: 4.2.17.Final
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.mock-server:mockserver-netty
dependency-version: 7.6.0
dependency-type: direct:development
update-type: version-update:semver-minor
dependency-group: maven-minor-updates
- dependency-name: org.junit.jupiter:junit-jupiter-api
dependency-version: 6.1.3
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.junit.jupiter:junit-jupiter-engine
dependency-version: 6.1.3
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.junit.vintage:junit-vintage-engine
dependency-version: 6.1.3
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.junit.jupiter:junit-jupiter-engine
dependency-version: 6.1.3
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.junit.vintage:junit-vintage-engine
dependency-version: 6.1.3
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.apache.maven:apache-maven
dependency-version: 3.9.16
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: maven-minor-updates
- dependency-name: org.apache.maven.wrapper:maven-wrapper
dependency-version: 3.3.4
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: maven-minor-updates
...
Signed-off-by: dependabot[bot] <[email protected]>
* Generate changelog entries for #492
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
---
.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 63093 bytes
.mvn/wrapper/maven-wrapper.properties | 22 +-
flume-ng-node/pom.xml | 2 +-
flume-parent/pom.xml | 2 +-
flume-third-party/pom.xml | 16 +-
mvnw | 262 ++++++++++++---------
mvnw.cmd | 21 +-
...ate_com.fasterxml.jackson.core_jackson-core.xml | 4 +-
...com.fasterxml.jackson.core_jackson-databind.xml | 4 +-
.../.2.x.x/update_com.google.guava_guava.xml | 4 +-
.../update_com.google.protobuf_protobuf-java.xml | 4 +-
....xml => update_commons-codec_commons-codec.xml} | 4 +-
src/changelog/.2.x.x/update_io.netty_netty-all.xml | 4 +-
...ate_org.apache.maven.wrapper_maven-wrapper.xml} | 4 +-
...ml => update_org.apache.maven_apache-maven.xml} | 4 +-
.../update_org.bouncycastle_bc-jdk18on-bom.xml | 4 +-
...e_org.eclipse.jetty.ee11_jetty-ee11-servlet.xml | 4 +-
.../.2.x.x/update_org.eclipse.jetty_jetty-jmx.xml | 4 +-
.../update_org.eclipse.jetty_jetty-security.xml | 4 +-
.../update_org.eclipse.jetty_jetty-server.xml | 4 +-
.../.2.x.x/update_org.eclipse.jetty_jetty-util.xml | 4 +-
.../update_org.junit.jupiter_junit-jupiter-api.xml | 4 +-
...date_org.junit.jupiter_junit-jupiter-engine.xml | 4 +-
...date_org.junit.vintage_junit-vintage-engine.xml | 4 +-
.../update_org.mock-server_mockserver-netty.xml | 4 +-
25 files changed, 207 insertions(+), 190 deletions(-)
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 00000000..eebc3c18
Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/.mvn/wrapper/maven-wrapper.properties
b/.mvn/wrapper/maven-wrapper.properties
index 346d645f..970a3d02 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,18 +1,4 @@
-# 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.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
+wrapperVersion=3.3.4
+distributionType=bin
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar
diff --git a/flume-ng-node/pom.xml b/flume-ng-node/pom.xml
index 5878f0f5..bda73baf 100644
--- a/flume-ng-node/pom.xml
+++ b/flume-ng-node/pom.xml
@@ -34,7 +34,7 @@
<spotbugs.maxAllowedViolations>12</spotbugs.maxAllowedViolations>
<pmd.maxAllowedViolations>5</pmd.maxAllowedViolations>
<module.name>org.apache.flume.node</module.name>
- <junit-jupiter.version>6.1.2</junit-jupiter.version>
+ <junit-jupiter.version>6.1.3</junit-jupiter.version>
</properties>
<dependencies>
diff --git a/flume-parent/pom.xml b/flume-parent/pom.xml
index 03005e9c..78501237 100644
--- a/flume-parent/pom.xml
+++ b/flume-parent/pom.xml
@@ -268,7 +268,7 @@
<dependency>
<groupId>org.mock-server</groupId>
<artifactId>mockserver-netty</artifactId>
- <version>7.4.0</version>
+ <version>7.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/flume-third-party/pom.xml b/flume-third-party/pom.xml
index 21fded1c..36455576 100644
--- a/flume-third-party/pom.xml
+++ b/flume-third-party/pom.xml
@@ -38,7 +38,7 @@
<maven.deploy.skip>false</maven.deploy.skip>
<commons-cli.version>1.11.0</commons-cli.version>
- <commons-codec.version>1.22.0</commons-codec.version>
+ <commons-codec.version>1.22.1</commons-codec.version>
<commons-collections.version>3.2.2</commons-collections.version>
<commons-compress.version>1.28.0</commons-compress.version>
<commons-io.version>2.22.0</commons-io.version>
@@ -49,24 +49,24 @@
<derby.version>10.17.1.0</derby.version>
<errorprone.version>2.50.0</errorprone.version>
<jackson-annotations.version>2.22</jackson-annotations.version>
- <fasterxml.jackson.version>2.22.1</fasterxml.jackson.version>
-
<fasterxml.jackson.databind.version>2.22.1</fasterxml.jackson.databind.version>
+ <fasterxml.jackson.version>2.22.2</fasterxml.jackson.version>
+
<fasterxml.jackson.databind.version>2.22.2</fasterxml.jackson.databind.version>
<gson.version>2.14.0</gson.version>
- <guava.version>33.6.0-jre</guava.version>
+ <guava.version>33.7.1-jre</guava.version>
<hadoop.version>3.5.0</hadoop.version>
<httpcore.version>4.4.16</httpcore.version>
- <bouncycastle.version>1.85</bouncycastle.version>
+ <bouncycastle.version>1.85.2</bouncycastle.version>
<httpclient.version>4.5.14</httpclient.version>
<irclib.version>1.10</irclib.version>
<jakarta-servlet.version>6.1.0</jakarta-servlet.version>
- <jetty.version>12.1.11</jetty.version>
+ <jetty.version>12.1.12</jetty.version>
<jsr305.version>3.0.2</jsr305.version>
<log4j.version>2.26.1</log4j.version>
<mapdb.version>0.9.9</mapdb.version>
<mina.version>2.2.9</mina.version>
<spotbugs.version>4.9.3</spotbugs.version>
- <netty-all.version>4.2.16.Final</netty-all.version>
- <external.protobuf.version>4.35.1</external.protobuf.version>
+ <netty-all.version>4.2.17.Final</netty-all.version>
+ <external.protobuf.version>4.36.0</external.protobuf.version>
<prometheus.version>1.8.0</prometheus.version>
<slf4j.version>2.0.18</slf4j.version>
<snappy-java.version>1.1.10.8</snappy-java.version>
diff --git a/mvnw b/mvnw
index 8d937f4c..1ddd97b9 100755
--- a/mvnw
+++ b/mvnw
@@ -19,7 +19,7 @@
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
-# Apache Maven Wrapper startup batch script, version 3.2.0
+# Apache Maven Wrapper startup batch script, version 3.3.4
#
# Required ENV vars:
# ------------------
@@ -33,75 +33,84 @@
# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
# ----------------------------------------------------------------------------
-if [ -z "$MAVEN_SKIP_RC" ] ; then
+if [ -z "$MAVEN_SKIP_RC" ]; then
- if [ -f /usr/local/etc/mavenrc ] ; then
+ if [ -f /usr/local/etc/mavenrc ]; then
. /usr/local/etc/mavenrc
fi
- if [ -f /etc/mavenrc ] ; then
+ if [ -f /etc/mavenrc ]; then
. /etc/mavenrc
fi
- if [ -f "$HOME/.mavenrc" ] ; then
+ if [ -f "$HOME/.mavenrc" ]; then
. "$HOME/.mavenrc"
fi
fi
# OS specific support. $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
+cygwin=false
+darwin=false
mingw=false
case "$(uname)" in
- CYGWIN*) cygwin=true ;;
- MINGW*) mingw=true;;
- Darwin*) darwin=true
- # Use /usr/libexec/java_home if available, otherwise fall back to
/Library/Java/Home
- # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
- if [ -z "$JAVA_HOME" ]; then
- if [ -x "/usr/libexec/java_home" ]; then
- JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME
- else
- JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
- fi
+CYGWIN*) cygwin=true ;;
+MINGW*) mingw=true ;;
+Darwin*)
+ darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to
/Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ JAVA_HOME="$(/usr/libexec/java_home)"
+ export JAVA_HOME
+ else
+ JAVA_HOME="/Library/Java/Home"
+ export JAVA_HOME
fi
- ;;
+ fi
+ ;;
esac
-if [ -z "$JAVA_HOME" ] ; then
- if [ -r /etc/gentoo-release ] ; then
+if [ -z "$JAVA_HOME" ]; then
+ if [ -r /etc/gentoo-release ]; then
JAVA_HOME=$(java-config --jre-home)
fi
fi
# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
- [ -n "$CLASSPATH" ] &&
- CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
+if $cygwin; then
+ [ -n "$JAVA_HOME" ] \
+ && JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
+ [ -n "$CLASSPATH" ] \
+ && CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
fi
# For Mingw, ensure paths are in UNIX format before anything is touched
-if $mingw ; then
- [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] &&
- JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit
1); pwd)"
+if $mingw; then
+ [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] \
+ && JAVA_HOME="$(
+ cd "$JAVA_HOME" || (
+ echo "cannot cd into $JAVA_HOME." >&2
+ exit 1
+ )
+ pwd
+ )"
fi
if [ -z "$JAVA_HOME" ]; then
javaExecutable="$(which javac)"
- if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^
]*\)')" = "no" ]; then
+ if [ -n "$javaExecutable" ] && ! [ "$(expr "$javaExecutable" : '\([^ ]*\)')"
= "no" ]; then
# readlink(1) is not available as standard on Solaris 10.
readLink=$(which readlink)
if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then
- if $darwin ; then
- javaHome="$(dirname "\"$javaExecutable\"")"
- javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac"
+ if $darwin; then
+ javaHome="$(dirname "$javaExecutable")"
+ javaExecutable="$(cd "$javaHome" && pwd -P)/javac"
else
- javaExecutable="$(readlink -f "\"$javaExecutable\"")"
+ javaExecutable="$(readlink -f "$javaExecutable")"
fi
- javaHome="$(dirname "\"$javaExecutable\"")"
+ javaHome="$(dirname "$javaExecutable")"
javaHome=$(expr "$javaHome" : '\(.*\)/bin')
JAVA_HOME="$javaHome"
export JAVA_HOME
@@ -109,52 +118,60 @@ if [ -z "$JAVA_HOME" ]; then
fi
fi
-if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+if [ -z "$JAVACMD" ]; then
+ if [ -n "$JAVA_HOME" ]; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ]; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
else
- JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)"
+ JAVACMD="$(
+ \unset -f command 2>/dev/null
+ \command -v java
+ )"
fi
fi
-if [ ! -x "$JAVACMD" ] ; then
+if [ ! -x "$JAVACMD" ]; then
echo "Error: JAVA_HOME is not defined correctly." >&2
echo " We cannot execute $JAVACMD" >&2
exit 1
fi
-if [ -z "$JAVA_HOME" ] ; then
- echo "Warning: JAVA_HOME environment variable is not set."
+if [ -z "$JAVA_HOME" ]; then
+ echo "Warning: JAVA_HOME environment variable is not set." >&2
fi
# traverses directory structure from process work directory to filesystem root
# first directory with .mvn subdirectory is considered project base directory
find_maven_basedir() {
- if [ -z "$1" ]
- then
- echo "Path not specified to find_maven_basedir"
+ if [ -z "$1" ]; then
+ echo "Path not specified to find_maven_basedir" >&2
return 1
fi
basedir="$1"
wdir="$1"
- while [ "$wdir" != '/' ] ; do
- if [ -d "$wdir"/.mvn ] ; then
+ while [ "$wdir" != '/' ]; do
+ if [ -d "$wdir"/.mvn ]; then
basedir=$wdir
break
fi
# workaround for JBEAP-8937 (on Solaris 10/Sparc)
if [ -d "${wdir}" ]; then
- wdir=$(cd "$wdir/.." || exit 1; pwd)
+ wdir=$(
+ cd "$wdir/.." || exit 1
+ pwd
+ )
fi
# end of workaround
done
- printf '%s' "$(cd "$basedir" || exit 1; pwd)"
+ printf '%s' "$(
+ cd "$basedir" || exit 1
+ pwd
+ )"
}
# concatenates all lines of a file
@@ -165,7 +182,7 @@ concat_lines() {
# enabled. Otherwise, we may read lines that are delimited with
# \r\n and produce $'-Xarg\r' rather than -Xarg due to word
# splitting rules.
- tr -s '\r\n' ' ' < "$1"
+ tr -s '\r\n' ' ' <"$1"
fi
}
@@ -177,75 +194,85 @@ log() {
BASE_DIR=$(find_maven_basedir "$(dirname "$0")")
if [ -z "$BASE_DIR" ]; then
- exit 1;
+ exit 1
fi
-MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
+MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+export MAVEN_PROJECTBASEDIR
log "$MAVEN_PROJECTBASEDIR"
+trim() {
+ # MWRAPPER-139:
+ # Trims trailing and leading whitespace, carriage returns, tabs, and
linefeeds.
+ # Needed for removing poorly interpreted newline sequences when running in
more
+ # exotic environments such as mingw bash on Windows.
+ printf "%s" "${1}" | tr -d '[:space:]'
+}
+
##########################################################################################
# Extension to allow automatically downloading the maven-wrapper.jar from
Maven-central
# This allows using the maven wrapper in projects that prohibit checking in
binary data.
##########################################################################################
wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
if [ -r "$wrapperJarPath" ]; then
- log "Found $wrapperJarPath"
+ log "Found $wrapperJarPath"
else
- log "Couldn't find $wrapperJarPath, downloading it ..."
+ log "Couldn't find $wrapperJarPath, downloading it ..."
- if [ -n "$MVNW_REPOURL" ]; then
-
wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
+ if [ -n "$MVNW_REPOURL" ]; then
+
wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar"
+ else
+
wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar";
+ fi
+ while IFS="=" read -r key value; do
+ case "$key" in wrapperUrl)
+ wrapperUrl=$(trim "${value-}")
+ break
+ ;;
+ esac
+ done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
+ log "Downloading from: $wrapperUrl"
+
+ if $cygwin; then
+ wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
+ fi
+
+ if command -v wget >/dev/null; then
+ log "Found wget ... using wget"
+ [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet"
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget ${QUIET:+"$QUIET"} "$wrapperUrl" -O "$wrapperJarPath" || rm -f
"$wrapperJarPath"
else
-
wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar";
+ wget ${QUIET:+"$QUIET"} --http-user="$MVNW_USERNAME"
--http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f
"$wrapperJarPath"
fi
- while IFS="=" read -r key value; do
- # Remove '\r' from value to allow usage on windows as IFS does not
consider '\r' as a separator ( considers space, tab, new line ('\n'), and
custom '=' )
- safeValue=$(echo "$value" | tr -d '\r')
- case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;;
- esac
- done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
- log "Downloading from: $wrapperUrl"
-
+ elif command -v curl >/dev/null; then
+ log "Found curl ... using curl"
+ [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent"
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl ${QUIET:+"$QUIET"} -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm
-f "$wrapperJarPath"
+ else
+ curl ${QUIET:+"$QUIET"} --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o
"$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
+ fi
+ else
+ log "Falling back to using Java to download"
+ javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class"
+ # For Cygwin, switch paths to Windows format before running javac
if $cygwin; then
- wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
+ javaSource=$(cygpath --path --windows "$javaSource")
+ javaClass=$(cygpath --path --windows "$javaClass")
fi
-
- if command -v wget > /dev/null; then
- log "Found wget ... using wget"
- [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet"
- if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
- wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f
"$wrapperJarPath"
- else
- wget $QUIET --http-user="$MVNW_USERNAME"
--http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f
"$wrapperJarPath"
- fi
- elif command -v curl > /dev/null; then
- log "Found curl ... using curl"
- [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent"
- if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
- curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f
"$wrapperJarPath"
- else
- curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o
"$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
- fi
- else
- log "Falling back to using Java to download"
-
javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java"
-
javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class"
- # For Cygwin, switch paths to Windows format before running javac
- if $cygwin; then
- javaSource=$(cygpath --path --windows "$javaSource")
- javaClass=$(cygpath --path --windows "$javaClass")
- fi
- if [ -e "$javaSource" ]; then
- if [ ! -e "$javaClass" ]; then
- log " - Compiling MavenWrapperDownloader.java ..."
- ("$JAVA_HOME/bin/javac" "$javaSource")
- fi
- if [ -e "$javaClass" ]; then
- log " - Running MavenWrapperDownloader.java ..."
- ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader
"$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath"
- fi
- fi
+ if [ -e "$javaSource" ]; then
+ if [ ! -e "$javaClass" ]; then
+ log " - Compiling MavenWrapperDownloader.java ..."
+ ("$JAVA_HOME/bin/javac" "$javaSource")
+ fi
+ if [ -e "$javaClass" ]; then
+ log " - Running MavenWrapperDownloader.java ..."
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader
"$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath"
+ fi
fi
+ fi
fi
##########################################################################################
# End of extension
@@ -254,22 +281,25 @@ fi
# If specified, validate the SHA-256 sum of the Maven wrapper jar file
wrapperSha256Sum=""
while IFS="=" read -r key value; do
- case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;;
+ case "$key" in wrapperSha256Sum)
+ wrapperSha256Sum=$(trim "${value-}")
+ break
+ ;;
esac
-done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
+done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
if [ -n "$wrapperSha256Sum" ]; then
wrapperSha256Result=false
- if command -v sha256sum > /dev/null; then
- if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null
2>&1; then
+ if command -v sha256sum >/dev/null; then
+ if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c - >/dev/null
2>&1; then
wrapperSha256Result=true
fi
- elif command -v shasum > /dev/null; then
- if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c >
/dev/null 2>&1; then
+ elif command -v shasum >/dev/null; then
+ if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c >/dev/null
2>&1; then
wrapperSha256Result=true
fi
else
- echo "Checksum validation was requested but neither 'sha256sum' or
'shasum' are available."
- echo "Please install either command, or disable validation by removing
'wrapperSha256Sum' from your maven-wrapper.properties."
+ echo "Checksum validation was requested but neither 'sha256sum' or
'shasum' are available." >&2
+ echo "Please install either command, or disable validation by removing
'wrapperSha256Sum' from your maven-wrapper.properties." >&2
exit 1
fi
if [ $wrapperSha256Result = false ]; then
@@ -284,12 +314,12 @@ MAVEN_OPTS="$(concat_lines
"$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
- [ -n "$CLASSPATH" ] &&
- CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
- [ -n "$MAVEN_PROJECTBASEDIR" ] &&
- MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
+ [ -n "$JAVA_HOME" ] \
+ && JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
+ [ -n "$CLASSPATH" ] \
+ && CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
+ [ -n "$MAVEN_PROJECTBASEDIR" ] \
+ && MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
fi
# Provide a "standardized" way to retrieve the CLI args that will
diff --git a/mvnw.cmd b/mvnw.cmd
index f80fbad3..c453424c 100644
--- a/mvnw.cmd
+++ b/mvnw.cmd
@@ -18,7 +18,7 @@
@REM
----------------------------------------------------------------------------
@REM
----------------------------------------------------------------------------
-@REM Apache Maven Wrapper startup batch script, version 3.2.0
+@REM Apache Maven Wrapper startup batch script, version 3.3.4
@REM
@REM Required ENV vars:
@REM JAVA_HOME - location of a JDK home dir
@@ -59,22 +59,22 @@ set ERROR_CODE=0
@REM ==== START VALIDATION ====
if not "%JAVA_HOME%" == "" goto OkJHome
-echo.
+echo. >&2
echo Error: JAVA_HOME not found in your environment. >&2
echo Please set the JAVA_HOME variable in your environment to match the >&2
echo location of your Java installation. >&2
-echo.
+echo. >&2
goto error
:OkJHome
if exist "%JAVA_HOME%\bin\java.exe" goto init
-echo.
+echo. >&2
echo Error: JAVA_HOME is set to an invalid directory. >&2
echo JAVA_HOME = "%JAVA_HOME%" >&2
echo Please set the JAVA_HOME variable in your environment to match the >&2
echo location of your Java installation. >&2
-echo.
+echo. >&2
goto error
@REM ==== END VALIDATION ====
@@ -119,7 +119,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-set
WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar";
+set
WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar";
FOR /F "usebackq tokens=1,2 delims==" %%A IN
("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
@@ -133,7 +133,7 @@ if exist %WRAPPER_JAR% (
)
) else (
if not "%MVNW_REPOURL%" == "" (
- SET
WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
+ SET
WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar"
)
if "%MVNW_VERBOSE%" == "true" (
echo Couldn't find %WRAPPER_JAR%, downloading it ...
@@ -160,11 +160,12 @@ FOR /F "usebackq tokens=1,2 delims==" %%A IN
("%MAVEN_PROJECTBASEDIR%\.mvn\wrapp
)
IF NOT %WRAPPER_SHA_256_SUM%=="" (
powershell -Command "&{"^
+ "Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function
Get-FileHash;"^
"$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm
SHA256).Hash.ToLower();"^
"If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^
- " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your
Maven wrapper might be compromised.';"^
- " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean
download.';"^
- " Write-Output 'If you updated your Maven version, you need to update
the specified wrapperSha256Sum property.';"^
+ " Write-Error 'Error: Failed to validate Maven wrapper SHA-256, your
Maven wrapper might be compromised.';"^
+ " Write-Error 'Investigate or delete %WRAPPER_JAR% to attempt a clean
download.';"^
+ " Write-Error 'If you updated your Maven version, you need to update
the specified wrapperSha256Sum property.';"^
" exit 1;"^
"}"^
"}"
diff --git
a/src/changelog/.2.x.x/update_com.fasterxml.jackson.core_jackson-core.xml
b/src/changelog/.2.x.x/update_com.fasterxml.jackson.core_jackson-core.xml
index bcf2174e..93a7e90d 100644
--- a/src/changelog/.2.x.x/update_com.fasterxml.jackson.core_jackson-core.xml
+++ b/src/changelog/.2.x.x/update_com.fasterxml.jackson.core_jackson-core.xml
@@ -3,6 +3,6 @@
xmlns="https://logging.apache.org/xml/ns";
xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="updated">
- <issue id="479" link="https://github.com/apache/logging-flume/pull/479"/>
- <description format="asciidoc">Update
`com.fasterxml.jackson.core:jackson-core` to version `2.22.1`</description>
+ <issue id="492" link="https://github.com/apache/logging-flume/pull/492"/>
+ <description format="asciidoc">Update
`com.fasterxml.jackson.core:jackson-core` to version `2.22.2`</description>
</entry>
diff --git
a/src/changelog/.2.x.x/update_com.fasterxml.jackson.core_jackson-databind.xml
b/src/changelog/.2.x.x/update_com.fasterxml.jackson.core_jackson-databind.xml
index 1b0618bb..cdcf70d7 100644
---
a/src/changelog/.2.x.x/update_com.fasterxml.jackson.core_jackson-databind.xml
+++
b/src/changelog/.2.x.x/update_com.fasterxml.jackson.core_jackson-databind.xml
@@ -3,6 +3,6 @@
xmlns="https://logging.apache.org/xml/ns";
xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="updated">
- <issue id="479" link="https://github.com/apache/logging-flume/pull/479"/>
- <description format="asciidoc">Update
`com.fasterxml.jackson.core:jackson-databind` to version `2.22.1`</description>
+ <issue id="492" link="https://github.com/apache/logging-flume/pull/492"/>
+ <description format="asciidoc">Update
`com.fasterxml.jackson.core:jackson-databind` to version `2.22.2`</description>
</entry>
diff --git a/src/changelog/.2.x.x/update_com.google.guava_guava.xml
b/src/changelog/.2.x.x/update_com.google.guava_guava.xml
index 1a6cced7..eea0222b 100644
--- a/src/changelog/.2.x.x/update_com.google.guava_guava.xml
+++ b/src/changelog/.2.x.x/update_com.google.guava_guava.xml
@@ -3,6 +3,6 @@
xmlns="https://logging.apache.org/xml/ns";
xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="updated">
- <issue id="479" link="https://github.com/apache/logging-flume/pull/479"/>
- <description format="asciidoc">Update `com.google.guava:guava` to version
`33.6.0-jre`</description>
+ <issue id="492" link="https://github.com/apache/logging-flume/pull/492"/>
+ <description format="asciidoc">Update `com.google.guava:guava` to version
`33.7.1-jre`</description>
</entry>
diff --git a/src/changelog/.2.x.x/update_com.google.protobuf_protobuf-java.xml
b/src/changelog/.2.x.x/update_com.google.protobuf_protobuf-java.xml
index f13bd66e..f9f5c9fe 100644
--- a/src/changelog/.2.x.x/update_com.google.protobuf_protobuf-java.xml
+++ b/src/changelog/.2.x.x/update_com.google.protobuf_protobuf-java.xml
@@ -3,6 +3,6 @@
xmlns="https://logging.apache.org/xml/ns";
xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="updated">
- <issue id="479" link="https://github.com/apache/logging-flume/pull/479"/>
- <description format="asciidoc">Update `com.google.protobuf:protobuf-java` to
version `4.35.1`</description>
+ <issue id="492" link="https://github.com/apache/logging-flume/pull/492"/>
+ <description format="asciidoc">Update `com.google.protobuf:protobuf-java` to
version `4.36.0`</description>
</entry>
diff --git a/src/changelog/.2.x.x/update_io.netty_netty-all.xml
b/src/changelog/.2.x.x/update_commons-codec_commons-codec.xml
similarity index 62%
copy from src/changelog/.2.x.x/update_io.netty_netty-all.xml
copy to src/changelog/.2.x.x/update_commons-codec_commons-codec.xml
index c91d1169..dbcbe3c8 100644
--- a/src/changelog/.2.x.x/update_io.netty_netty-all.xml
+++ b/src/changelog/.2.x.x/update_commons-codec_commons-codec.xml
@@ -3,6 +3,6 @@
xmlns="https://logging.apache.org/xml/ns";
xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="updated">
- <issue id="479" link="https://github.com/apache/logging-flume/pull/479"/>
- <description format="asciidoc">Update `io.netty:netty-all` to version
`4.2.16.Final`</description>
+ <issue id="492" link="https://github.com/apache/logging-flume/pull/492"/>
+ <description format="asciidoc">Update `commons-codec:commons-codec` to
version `1.22.1`</description>
</entry>
diff --git a/src/changelog/.2.x.x/update_io.netty_netty-all.xml
b/src/changelog/.2.x.x/update_io.netty_netty-all.xml
index c91d1169..f7e2c54d 100644
--- a/src/changelog/.2.x.x/update_io.netty_netty-all.xml
+++ b/src/changelog/.2.x.x/update_io.netty_netty-all.xml
@@ -3,6 +3,6 @@
xmlns="https://logging.apache.org/xml/ns";
xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="updated">
- <issue id="479" link="https://github.com/apache/logging-flume/pull/479"/>
- <description format="asciidoc">Update `io.netty:netty-all` to version
`4.2.16.Final`</description>
+ <issue id="492" link="https://github.com/apache/logging-flume/pull/492"/>
+ <description format="asciidoc">Update `io.netty:netty-all` to version
`4.2.17.Final`</description>
</entry>
diff --git a/src/changelog/.2.x.x/update_org.bouncycastle_bc-jdk18on-bom.xml
b/src/changelog/.2.x.x/update_org.apache.maven.wrapper_maven-wrapper.xml
similarity index 61%
copy from src/changelog/.2.x.x/update_org.bouncycastle_bc-jdk18on-bom.xml
copy to src/changelog/.2.x.x/update_org.apache.maven.wrapper_maven-wrapper.xml
index e7391d6f..82623382 100644
--- a/src/changelog/.2.x.x/update_org.bouncycastle_bc-jdk18on-bom.xml
+++ b/src/changelog/.2.x.x/update_org.apache.maven.wrapper_maven-wrapper.xml
@@ -3,6 +3,6 @@
xmlns="https://logging.apache.org/xml/ns";
xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="updated">
- <issue id="479" link="https://github.com/apache/logging-flume/pull/479"/>
- <description format="asciidoc">Update `org.bouncycastle:bc-jdk18on-bom` to
version `1.85`</description>
+ <issue id="492" link="https://github.com/apache/logging-flume/pull/492"/>
+ <description format="asciidoc">Update
`org.apache.maven.wrapper:maven-wrapper` to version `3.3.4`</description>
</entry>
diff --git a/src/changelog/.2.x.x/update_org.bouncycastle_bc-jdk18on-bom.xml
b/src/changelog/.2.x.x/update_org.apache.maven_apache-maven.xml
similarity index 62%
copy from src/changelog/.2.x.x/update_org.bouncycastle_bc-jdk18on-bom.xml
copy to src/changelog/.2.x.x/update_org.apache.maven_apache-maven.xml
index e7391d6f..6e4fc2cc 100644
--- a/src/changelog/.2.x.x/update_org.bouncycastle_bc-jdk18on-bom.xml
+++ b/src/changelog/.2.x.x/update_org.apache.maven_apache-maven.xml
@@ -3,6 +3,6 @@
xmlns="https://logging.apache.org/xml/ns";
xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="updated">
- <issue id="479" link="https://github.com/apache/logging-flume/pull/479"/>
- <description format="asciidoc">Update `org.bouncycastle:bc-jdk18on-bom` to
version `1.85`</description>
+ <issue id="492" link="https://github.com/apache/logging-flume/pull/492"/>
+ <description format="asciidoc">Update `org.apache.maven:apache-maven` to
version `3.9.16`</description>
</entry>
diff --git a/src/changelog/.2.x.x/update_org.bouncycastle_bc-jdk18on-bom.xml
b/src/changelog/.2.x.x/update_org.bouncycastle_bc-jdk18on-bom.xml
index e7391d6f..6560df34 100644
--- a/src/changelog/.2.x.x/update_org.bouncycastle_bc-jdk18on-bom.xml
+++ b/src/changelog/.2.x.x/update_org.bouncycastle_bc-jdk18on-bom.xml
@@ -3,6 +3,6 @@
xmlns="https://logging.apache.org/xml/ns";
xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="updated">
- <issue id="479" link="https://github.com/apache/logging-flume/pull/479"/>
- <description format="asciidoc">Update `org.bouncycastle:bc-jdk18on-bom` to
version `1.85`</description>
+ <issue id="492" link="https://github.com/apache/logging-flume/pull/492"/>
+ <description format="asciidoc">Update `org.bouncycastle:bc-jdk18on-bom` to
version `1.85.2`</description>
</entry>
diff --git
a/src/changelog/.2.x.x/update_org.eclipse.jetty.ee11_jetty-ee11-servlet.xml
b/src/changelog/.2.x.x/update_org.eclipse.jetty.ee11_jetty-ee11-servlet.xml
index 482dd0a6..e4fe5ff2 100644
--- a/src/changelog/.2.x.x/update_org.eclipse.jetty.ee11_jetty-ee11-servlet.xml
+++ b/src/changelog/.2.x.x/update_org.eclipse.jetty.ee11_jetty-ee11-servlet.xml
@@ -3,6 +3,6 @@
xmlns="https://logging.apache.org/xml/ns";
xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="updated">
- <issue id="479" link="https://github.com/apache/logging-flume/pull/479"/>
- <description format="asciidoc">Update
`org.eclipse.jetty.ee11:jetty-ee11-servlet` to version `12.1.11`</description>
+ <issue id="492" link="https://github.com/apache/logging-flume/pull/492"/>
+ <description format="asciidoc">Update
`org.eclipse.jetty.ee11:jetty-ee11-servlet` to version `12.1.12`</description>
</entry>
diff --git a/src/changelog/.2.x.x/update_org.eclipse.jetty_jetty-jmx.xml
b/src/changelog/.2.x.x/update_org.eclipse.jetty_jetty-jmx.xml
index 4818b5f5..d6fc0171 100644
--- a/src/changelog/.2.x.x/update_org.eclipse.jetty_jetty-jmx.xml
+++ b/src/changelog/.2.x.x/update_org.eclipse.jetty_jetty-jmx.xml
@@ -3,6 +3,6 @@
xmlns="https://logging.apache.org/xml/ns";
xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="updated">
- <issue id="479" link="https://github.com/apache/logging-flume/pull/479"/>
- <description format="asciidoc">Update `org.eclipse.jetty:jetty-jmx` to
version `12.1.11`</description>
+ <issue id="492" link="https://github.com/apache/logging-flume/pull/492"/>
+ <description format="asciidoc">Update `org.eclipse.jetty:jetty-jmx` to
version `12.1.12`</description>
</entry>
diff --git a/src/changelog/.2.x.x/update_org.eclipse.jetty_jetty-security.xml
b/src/changelog/.2.x.x/update_org.eclipse.jetty_jetty-security.xml
index 839b1f8a..de1d99ac 100644
--- a/src/changelog/.2.x.x/update_org.eclipse.jetty_jetty-security.xml
+++ b/src/changelog/.2.x.x/update_org.eclipse.jetty_jetty-security.xml
@@ -3,6 +3,6 @@
xmlns="https://logging.apache.org/xml/ns";
xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="updated">
- <issue id="479" link="https://github.com/apache/logging-flume/pull/479"/>
- <description format="asciidoc">Update `org.eclipse.jetty:jetty-security` to
version `12.1.11`</description>
+ <issue id="492" link="https://github.com/apache/logging-flume/pull/492"/>
+ <description format="asciidoc">Update `org.eclipse.jetty:jetty-security` to
version `12.1.12`</description>
</entry>
diff --git a/src/changelog/.2.x.x/update_org.eclipse.jetty_jetty-server.xml
b/src/changelog/.2.x.x/update_org.eclipse.jetty_jetty-server.xml
index f4962205..1e7cbc60 100644
--- a/src/changelog/.2.x.x/update_org.eclipse.jetty_jetty-server.xml
+++ b/src/changelog/.2.x.x/update_org.eclipse.jetty_jetty-server.xml
@@ -3,6 +3,6 @@
xmlns="https://logging.apache.org/xml/ns";
xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="updated">
- <issue id="479" link="https://github.com/apache/logging-flume/pull/479"/>
- <description format="asciidoc">Update `org.eclipse.jetty:jetty-server` to
version `12.1.11`</description>
+ <issue id="492" link="https://github.com/apache/logging-flume/pull/492"/>
+ <description format="asciidoc">Update `org.eclipse.jetty:jetty-server` to
version `12.1.12`</description>
</entry>
diff --git a/src/changelog/.2.x.x/update_org.eclipse.jetty_jetty-util.xml
b/src/changelog/.2.x.x/update_org.eclipse.jetty_jetty-util.xml
index a6a99ebc..45c6c8f0 100644
--- a/src/changelog/.2.x.x/update_org.eclipse.jetty_jetty-util.xml
+++ b/src/changelog/.2.x.x/update_org.eclipse.jetty_jetty-util.xml
@@ -3,6 +3,6 @@
xmlns="https://logging.apache.org/xml/ns";
xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="updated">
- <issue id="479" link="https://github.com/apache/logging-flume/pull/479"/>
- <description format="asciidoc">Update `org.eclipse.jetty:jetty-util` to
version `12.1.11`</description>
+ <issue id="492" link="https://github.com/apache/logging-flume/pull/492"/>
+ <description format="asciidoc">Update `org.eclipse.jetty:jetty-util` to
version `12.1.12`</description>
</entry>
diff --git
a/src/changelog/.2.x.x/update_org.junit.jupiter_junit-jupiter-api.xml
b/src/changelog/.2.x.x/update_org.junit.jupiter_junit-jupiter-api.xml
index a13968e7..37a701e2 100644
--- a/src/changelog/.2.x.x/update_org.junit.jupiter_junit-jupiter-api.xml
+++ b/src/changelog/.2.x.x/update_org.junit.jupiter_junit-jupiter-api.xml
@@ -3,6 +3,6 @@
xmlns="https://logging.apache.org/xml/ns";
xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="updated">
- <issue id="480" link="https://github.com/apache/logging-flume/pull/480"/>
- <description format="asciidoc">Update `org.junit.jupiter:junit-jupiter-api`
to version `6.1.2`</description>
+ <issue id="492" link="https://github.com/apache/logging-flume/pull/492"/>
+ <description format="asciidoc">Update `org.junit.jupiter:junit-jupiter-api`
to version `6.1.3`</description>
</entry>
diff --git
a/src/changelog/.2.x.x/update_org.junit.jupiter_junit-jupiter-engine.xml
b/src/changelog/.2.x.x/update_org.junit.jupiter_junit-jupiter-engine.xml
index 2d4a9229..2b049e41 100644
--- a/src/changelog/.2.x.x/update_org.junit.jupiter_junit-jupiter-engine.xml
+++ b/src/changelog/.2.x.x/update_org.junit.jupiter_junit-jupiter-engine.xml
@@ -3,6 +3,6 @@
xmlns="https://logging.apache.org/xml/ns";
xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="updated">
- <issue id="480" link="https://github.com/apache/logging-flume/pull/480"/>
- <description format="asciidoc">Update
`org.junit.jupiter:junit-jupiter-engine` to version `6.1.2`</description>
+ <issue id="492" link="https://github.com/apache/logging-flume/pull/492"/>
+ <description format="asciidoc">Update
`org.junit.jupiter:junit-jupiter-engine` to version `6.1.3`</description>
</entry>
diff --git
a/src/changelog/.2.x.x/update_org.junit.vintage_junit-vintage-engine.xml
b/src/changelog/.2.x.x/update_org.junit.vintage_junit-vintage-engine.xml
index f8bf7502..aecc6e9b 100644
--- a/src/changelog/.2.x.x/update_org.junit.vintage_junit-vintage-engine.xml
+++ b/src/changelog/.2.x.x/update_org.junit.vintage_junit-vintage-engine.xml
@@ -3,6 +3,6 @@
xmlns="https://logging.apache.org/xml/ns";
xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="updated">
- <issue id="480" link="https://github.com/apache/logging-flume/pull/480"/>
- <description format="asciidoc">Update
`org.junit.vintage:junit-vintage-engine` to version `6.1.2`</description>
+ <issue id="492" link="https://github.com/apache/logging-flume/pull/492"/>
+ <description format="asciidoc">Update
`org.junit.vintage:junit-vintage-engine` to version `6.1.3`</description>
</entry>
diff --git a/src/changelog/.2.x.x/update_org.mock-server_mockserver-netty.xml
b/src/changelog/.2.x.x/update_org.mock-server_mockserver-netty.xml
index 13022b39..38acde39 100644
--- a/src/changelog/.2.x.x/update_org.mock-server_mockserver-netty.xml
+++ b/src/changelog/.2.x.x/update_org.mock-server_mockserver-netty.xml
@@ -3,6 +3,6 @@
xmlns="https://logging.apache.org/xml/ns";
xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
type="updated">
- <issue id="482" link="https://github.com/apache/logging-flume/pull/482"/>
- <description format="asciidoc">Update `org.mock-server:mockserver-netty` to
version `7.4.0`</description>
+ <issue id="492" link="https://github.com/apache/logging-flume/pull/492"/>
+ <description format="asciidoc">Update `org.mock-server:mockserver-netty` to
version `7.6.0`</description>
</entry>
