>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21673?usp=email )
Change subject: [NO ISSUE][MISC] Advance log4j to 2.26.1
......................................................................
[NO ISSUE][MISC] Advance log4j to 2.26.1
- log4j: 2.25.5 → 2.26.1
2.26 adds a getConfiguration(LoggerContext, String, List<URI>) overload
to ConfigurationFactory alongside the existing one taking a single URI,
so the untyped null the CC and NC log configuration factories pass now
matches both and javac rejects the call as ambiguous. Both are cast to
(URI) null, which selects the overload they already used.
That change is source-only. Overload selection is fixed at compile time,
the URI method is untouched in 2.26.1, and code already compiled against
it keeps resolving.
The only class 2.26.1 removes is JmxRuntimeInputArgumentsLookup, the
${jvmrunargs:} lookup; no configuration in the tree uses it. Nothing is
removed from log4j-api, log4j-1.2-api, log4j-jcl, log4j-jul,
log4j-slf4j-impl or log4j-web.
The tree builds clean and AwsS3ExternalDatasetTest, which starts an
instance and so exercises the log configuration, passes in full.
Change-Id: I41841d0ebdc51edfc194b9b69143540cf611d98a
Ext-ref: MB-73268
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21673
Reviewed-by: Ian Maxon <[email protected]>
Integration-Tests: Jenkins <[email protected]>
Tested-by: Jenkins <[email protected]>
---
M asterixdb/pom.xml
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
M hyracks-fullstack/pom.xml
4 files changed, 8 insertions(+), 4 deletions(-)
Approvals:
Jenkins: Verified; Verified
Ian Maxon: Looks good to me, approved
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index ab0f18d..1e5a0e0 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -92,7 +92,7 @@
<!-- @pinned-with: ${awsjavasdk.version} -->
<hadoop.version>3.4.3</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
- <log4j.version>2.25.5</log4j.version>
+ <log4j.version>2.26.1</log4j.version>
<awsjavasdk.version>2.54.11</awsjavasdk.version>
<s3mock.version>5.2.0</s3mock.version>
<parquet.version>1.18.0</parquet.version> <!-- NOTICE: please update
transitives from parquet below on any change -->
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java
index a635084..a0657b5 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCLogConfigurationFactory.java
@@ -77,7 +77,9 @@
@Override
public Configuration getConfiguration(final LoggerContext loggerContext,
final ConfigurationSource source) {
- return getConfiguration(loggerContext, source.toString(), null);
+ // the cast picks the URI overload; log4j 2.26 added a List<URI> one,
which an
+ // untyped null now matches equally well
+ return getConfiguration(loggerContext, source.toString(), (URI) null);
}
@Override
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
index fad6b3e..72d0f80 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
@@ -91,7 +91,9 @@
@Override
public Configuration getConfiguration(final LoggerContext loggerContext,
final ConfigurationSource source) {
- return getConfiguration(loggerContext, source.toString(), null);
+ // the cast picks the URI overload; log4j 2.26 added a List<URI> one,
which an
+ // untyped null now matches equally well
+ return getConfiguration(loggerContext, source.toString(), (URI) null);
}
@Override
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 3d7db90..5678a5c 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -76,7 +76,7 @@
<!-- @pinned-with: ${awsjavasdk.version} -->
<hadoop.version>3.4.3</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
- <log4j.version>2.25.5</log4j.version>
+ <log4j.version>2.26.1</log4j.version>
<snappy.version>1.1.10.8</snappy.version>
<jackson.version>2.22.2</jackson.version>
<jackson-annotations.version>2.22</jackson-annotations.version>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21673?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: asterixdb
Gerrit-Branch: trinity
Gerrit-Change-Id: I41841d0ebdc51edfc194b9b69143540cf611d98a
Gerrit-Change-Number: 21673
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Ian Maxon <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-CC: Anon. E. Moose #1000171
