Repository: flink Updated Branches: refs/heads/release-1.4 b74c70515 -> 392cfaaed
[FLINK-8798] [core] Force 'commons-logging' to be parent-first loaded. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/392cfaae Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/392cfaae Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/392cfaae Branch: refs/heads/release-1.4 Commit: 392cfaaed9380c5ea38b8593d23023925638cbe3 Parents: b74c705 Author: Stephan Ewen <[email protected]> Authored: Tue Feb 27 17:09:19 2018 +0100 Committer: Stephan Ewen <[email protected]> Committed: Tue Feb 27 17:09:19 2018 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/flink/configuration/CoreOptions.java | 2 +- .../org/apache/flink/configuration/ParentFirstPatternsTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/392cfaae/flink-core/src/main/java/org/apache/flink/configuration/CoreOptions.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/configuration/CoreOptions.java b/flink-core/src/main/java/org/apache/flink/configuration/CoreOptions.java index 27f39a4..1ac8bdc 100644 --- a/flink-core/src/main/java/org/apache/flink/configuration/CoreOptions.java +++ b/flink-core/src/main/java/org/apache/flink/configuration/CoreOptions.java @@ -36,7 +36,7 @@ public class CoreOptions { public static final ConfigOption<String> ALWAYS_PARENT_FIRST_LOADER = ConfigOptions .key("classloader.parent-first-patterns") - .defaultValue("java.;scala.;org.apache.flink.;com.esotericsoftware.kryo;org.apache.hadoop.;javax.annotation.;org.slf4j;org.apache.log4j;org.apache.logging.log4j;ch.qos.logback"); + .defaultValue("java.;scala.;org.apache.flink.;com.esotericsoftware.kryo;org.apache.hadoop.;javax.annotation.;org.slf4j;org.apache.log4j;org.apache.logging.log4j;org.apache.commons.logging;ch.qos.logback"); // ------------------------------------------------------------------------ http://git-wip-us.apache.org/repos/asf/flink/blob/392cfaae/flink-core/src/test/java/org/apache/flink/configuration/ParentFirstPatternsTest.java ---------------------------------------------------------------------- diff --git a/flink-core/src/test/java/org/apache/flink/configuration/ParentFirstPatternsTest.java b/flink-core/src/test/java/org/apache/flink/configuration/ParentFirstPatternsTest.java index 784d099..2773bd2 100644 --- a/flink-core/src/test/java/org/apache/flink/configuration/ParentFirstPatternsTest.java +++ b/flink-core/src/test/java/org/apache/flink/configuration/ParentFirstPatternsTest.java @@ -55,6 +55,7 @@ public class ParentFirstPatternsTest extends TestLogger { assertTrue(PARENT_FIRST_PACKAGES.contains("org.slf4j")); assertTrue(PARENT_FIRST_PACKAGES.contains("org.apache.log4j")); assertTrue(PARENT_FIRST_PACKAGES.contains("org.apache.logging.log4j")); + assertTrue(PARENT_FIRST_PACKAGES.contains("org.apache.commons.logging")); assertTrue(PARENT_FIRST_PACKAGES.contains("ch.qos.logback")); }
