You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by xy...@apache.org on 2022/08/02 08:46:31 UTC
[pulsar] branch bewaremypower/2.8-pick-16884 updated (ce5216b59a0 -> fb294589682)
This is an automated email from the ASF dual-hosted git repository.
xyz pushed a change to branch bewaremypower/2.8-pick-16884
in repository https://gitbox.apache.org/repos/asf/pulsar.git
discard ce5216b59a0 [fix][broker] Upgrade log4j2 version to 2.18.0 (#16884)
new fb294589682 [branch-2.8][fix][broker] Upgrade log4j2 version to 2.18.0 (#16884)
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 (ce5216b59a0)
\
N -- N -- N refs/heads/bewaremypower/2.8-pick-16884 (fb294589682)
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.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/pulsar/io/flume/node/TestEnvVarResolverProperties.java | 1 -
1 file changed, 1 deletion(-)
[pulsar] 01/01: [branch-2.8][fix][broker] Upgrade log4j2 version to 2.18.0 (#16884)
Posted by xy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xyz pushed a commit to branch bewaremypower/2.8-pick-16884
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit fb294589682165d9eb9bbede1ecd4f1e0ba4c7c0
Author: Dezhi LIiu <33...@users.noreply.github.com>
AuthorDate: Tue Aug 2 16:00:49 2022 +0800
[branch-2.8][fix][broker] Upgrade log4j2 version to 2.18.0 (#16884)
Co-authored-by: liudezhi <li...@163.com>
(cherry picked from commit 09ec578dd0b710d2591b06c2ede0e2591bce84e7)
---
buildtools/pom.xml | 2 +-
distribution/server/src/assemble/LICENSE.bin.txt | 10 +++---
pom.xml | 10 +++++-
.../EnvironmentBasedSecretsProviderTest.java | 37 +++-----------------
.../flume/node/TestEnvVarResolverProperties.java | 39 ++++++++++++----------
5 files changed, 41 insertions(+), 57 deletions(-)
diff --git a/buildtools/pom.xml b/buildtools/pom.xml
index e8911ae28b9..13dd4c4d157 100644
--- a/buildtools/pom.xml
+++ b/buildtools/pom.xml
@@ -39,7 +39,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<surefire.version>3.0.0-M3</surefire.version>
- <log4j2.version>2.17.1</log4j2.version>
+ <log4j2.version>2.18.0</log4j2.version>
<slf4j.version>1.7.25</slf4j.version>
<testng.version>7.3.0</testng.version>
<commons-lang3.version>3.11</commons-lang3.version>
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index 038b763d8b2..9f95bd92d0c 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -390,11 +390,11 @@ The Apache Software License, Version 2.0
- jakarta.validation-jakarta.validation-api-2.0.2.jar
- javax.validation-validation-api-1.1.0.Final.jar
* Log4J
- - org.apache.logging.log4j-log4j-api-2.17.1.jar
- - org.apache.logging.log4j-log4j-core-2.17.1.jar
- - org.apache.logging.log4j-log4j-slf4j-impl-2.17.1.jar
- - org.apache.logging.log4j-log4j-web-2.17.1.jar
- - org.apache.logging.log4j-log4j-1.2-api-2.17.1.jar
+ - org.apache.logging.log4j-log4j-api-2.18.0.jar
+ - org.apache.logging.log4j-log4j-core-2.18.0.jar
+ - org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar
+ - org.apache.logging.log4j-log4j-web-2.18.0.jar
+ - org.apache.logging.log4j-log4j-1.2-api-2.18.0.jar
* Java Native Access JNA -- net.java.dev.jna-jna-4.2.0.jar
* BookKeeper
- org.apache.bookkeeper-bookkeeper-common-4.14.5.jar
diff --git a/pom.xml b/pom.xml
index 7e99d93a452..786fa17cd41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@ flexible messaging model and an intuitive client API.</description>
<rocksdb.version>6.10.2</rocksdb.version>
<slf4j.version>1.7.25</slf4j.version>
<commons.collections.version>3.2.2</commons.collections.version>
- <log4j2.version>2.17.1</log4j2.version>
+ <log4j2.version>2.18.0</log4j2.version>
<bouncycastle.version>1.69</bouncycastle.version>
<bouncycastlefips.version>1.0.2</bouncycastlefips.version>
<jackson.version>2.13.2</jackson.version>
@@ -137,6 +137,7 @@ flexible messaging model and an intuitive client API.</description>
<perfmark.version>0.19.0</perfmark.version>
<protoc-gen-grpc-java.version>${grpc.version}</protoc-gen-grpc-java.version>
<gson.version>2.8.9</gson.version>
+ <system-lambda.version>1.2.1</system-lambda.version>
<sketches.version>0.8.3</sketches.version>
<hbc-core.version>2.2.0</hbc-core.version>
<cassandra-driver-core.version>3.6.0</cassandra-driver-core.version>
@@ -1191,6 +1192,13 @@ flexible messaging model and an intuitive client API.</description>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.github.stefanbirkner</groupId>
+ <artifactId>system-lambda</artifactId>
+ <version>${system-lambda.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-testng</artifactId>
diff --git a/pulsar-functions/secrets/src/test/java/org/apache/pulsar/functions/secretsprovider/EnvironmentBasedSecretsProviderTest.java b/pulsar-functions/secrets/src/test/java/org/apache/pulsar/functions/secretsprovider/EnvironmentBasedSecretsProviderTest.java
index 1fc76b337a5..e86b5e47783 100644
--- a/pulsar-functions/secrets/src/test/java/org/apache/pulsar/functions/secretsprovider/EnvironmentBasedSecretsProviderTest.java
+++ b/pulsar-functions/secrets/src/test/java/org/apache/pulsar/functions/secretsprovider/EnvironmentBasedSecretsProviderTest.java
@@ -22,9 +22,9 @@ package org.apache.pulsar.functions.secretsprovider;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;
+import com.github.stefanbirkner.systemlambda.SystemLambda;
import java.lang.reflect.Field;
import java.util.Map;
-
import org.testng.annotations.Test;
public class EnvironmentBasedSecretsProviderTest {
@@ -32,38 +32,9 @@ public class EnvironmentBasedSecretsProviderTest {
public void testConfigValidation() throws Exception {
EnvironmentBasedSecretsProvider provider = new EnvironmentBasedSecretsProvider();
assertNull(provider.provideSecret("mySecretName", "Ignored"));
- injectEnvironmentVariable("mySecretName", "SecretValue");
- assertEquals(provider.provideSecret("mySecretName", "Ignored"), "SecretValue");
- }
-
- private static void injectEnvironmentVariable(String key, String value)
- throws Exception {
-
- Class<?> processEnvironment = Class.forName("java.lang.ProcessEnvironment");
-
- Field unmodifiableMapField = getAccessibleField(processEnvironment, "theUnmodifiableEnvironment");
- Object unmodifiableMap = unmodifiableMapField.get(null);
- injectIntoUnmodifiableMap(key, value, unmodifiableMap);
-
- Field mapField = getAccessibleField(processEnvironment, "theEnvironment");
- Map<String, String> map = (Map<String, String>) mapField.get(null);
- map.put(key, value);
+ SystemLambda.withEnvironmentVariable("mySecretName", "SecretValue").execute(() -> {
+ assertEquals(provider.provideSecret("mySecretName", "Ignored"), "SecretValue");
+ });
}
- private static Field getAccessibleField(Class<?> clazz, String fieldName)
- throws NoSuchFieldException {
-
- Field field = clazz.getDeclaredField(fieldName);
- field.setAccessible(true);
- return field;
- }
-
- private static void injectIntoUnmodifiableMap(String key, String value, Object map)
- throws ReflectiveOperationException {
-
- Class unmodifiableMap = Class.forName("java.util.Collections$UnmodifiableMap");
- Field field = getAccessibleField(unmodifiableMap, "m");
- Object obj = field.get(map);
- ((Map<String, String>) obj).put(key, value);
- }
}
diff --git a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestEnvVarResolverProperties.java b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestEnvVarResolverProperties.java
index e4d5c25e0c2..8512793bb6c 100644
--- a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestEnvVarResolverProperties.java
+++ b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestEnvVarResolverProperties.java
@@ -18,6 +18,8 @@
*/
package org.apache.pulsar.io.flume.node;
+import static org.testng.Assert.assertEquals;
+import com.github.stefanbirkner.systemlambda.SystemLambda;
import java.io.File;
import org.junit.Assert;
import org.junit.Before;
@@ -26,7 +28,7 @@ import org.junit.Test;
import org.junit.contrib.java.lang.system.EnvironmentVariables;
public final class TestEnvVarResolverProperties {
- private static final File TESTFILE = new File(
+ private static final File TEST_FILE = new File(
TestEnvVarResolverProperties.class.getClassLoader()
.getResource("flume-conf-with-envvars.properties").getFile());
@@ -36,34 +38,37 @@ public final class TestEnvVarResolverProperties {
@Before
public void setUp() throws Exception {
- provider = new PropertiesFileConfigurationProvider("a1", TESTFILE);
+ provider = new PropertiesFileConfigurationProvider("a1", TEST_FILE);
}
@Test
public void resolveEnvVar() throws Exception {
- environmentVariables.set("VARNAME", "varvalue");
- String resolved = EnvVarResolverProperties.resolveEnvVars("padding ${VARNAME} padding");
- Assert.assertEquals("padding varvalue padding", resolved);
+ SystemLambda.withEnvironmentVariable("VARNAME", "varvalue").execute(() -> {
+ String resolved = EnvVarResolverProperties.resolveEnvVars("padding ${VARNAME} padding");
+ assertEquals(resolved, "padding varvalue padding");
+ });
}
@Test
public void resolveEnvVars() throws Exception {
- environmentVariables.set("VARNAME1", "varvalue1");
- environmentVariables.set("VARNAME2", "varvalue2");
- String resolved = EnvVarResolverProperties
- .resolveEnvVars("padding ${VARNAME1} ${VARNAME2} padding");
- Assert.assertEquals("padding varvalue1 varvalue2 padding", resolved);
+ SystemLambda.withEnvironmentVariable("VARNAME1", "varvalue1")
+ .and("VARNAME2", "varvalue2")
+ .execute(() -> {
+ String resolved = EnvVarResolverProperties.resolveEnvVars(
+ "padding ${VARNAME1} ${VARNAME2} padding");
+ assertEquals(resolved, "padding varvalue1 varvalue2 padding");
+ });
}
@Test
public void getProperty() throws Exception {
- String NC_PORT = "6667";
- environmentVariables.set("NC_PORT", NC_PORT);
- System.setProperty("propertiesImplementation",
- "org.apache.pulsar.io.flume.node.EnvVarResolverProperties");
+ SystemLambda.withEnvironmentVariable("NC_PORT", "6667").execute(() -> {
+ System.setProperty("propertiesImplementation",
+ "org.apache.pulsar.io.flume.node.EnvVarResolverProperties");
- Assert.assertEquals(NC_PORT, provider.getFlumeConfiguration()
- .getConfigurationFor("a1")
- .getSourceContext().get("r1").getParameters().get("port"));
+ assertEquals(provider.getFlumeConfiguration()
+ .getConfigurationFor("a1")
+ .getSourceContext().get("r1").getParameters().get("port"), "6667");
+ });
}
}