You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2018/02/27 16:19:19 UTC

[1/2] flink git commit: [hotfix] [core] Suppress unused warning config options only used in shell scripts and doc generation.

Repository: flink
Updated Branches:
  refs/heads/release-1.5 9f0295aa3 -> a269f8519


[hotfix] [core] Suppress unused warning config options only used in shell scripts and doc generation.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/e9e13dec
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/e9e13dec
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/e9e13dec

Branch: refs/heads/release-1.5
Commit: e9e13dec10f1a1ee57c46719d758885c4f33dcf3
Parents: 9f0295a
Author: Stephan Ewen <se...@apache.org>
Authored: Tue Feb 27 16:53:03 2018 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Tue Feb 27 17:18:31 2018 +0100

----------------------------------------------------------------------
 .../org/apache/flink/configuration/CoreOptions.java  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/e9e13dec/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 ccce0ab..dc544e0 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
@@ -137,17 +137,32 @@ public class CoreOptions {
 		.key("env.java.opts.taskmanager")
 		.defaultValue("");
 
+	/**
+	 * This options is here only for documentation generation, it is only
+	 * evaluated in the shell scripts.
+	 */
+	@SuppressWarnings("unused")
 	public static final ConfigOption<String> FLINK_LOG_DIR = ConfigOptions
 		.key("env.log.dir")
 		.noDefaultValue()
 		.withDescription("Defines the directory where the Flink logs are saved. It has to be an absolute path." +
 			" (Defaults to the log directory under Flink’s home)");
 
+	/**
+	 * This options is here only for documentation generation, it is only
+	 * evaluated in the shell scripts.
+	 */
+	@SuppressWarnings("unused")
 	public static final ConfigOption<Integer> FLINK_LOG_MAX = ConfigOptions
 		.key("env.log.max")
 		.defaultValue(5)
 		.withDescription("The maximum number of old log files to keep.");
 
+	/**
+	 * This options is here only for documentation generation, it is only
+	 * evaluated in the shell scripts.
+	 */
+	@SuppressWarnings("unused")
 	public static final ConfigOption<String> FLINK_SSH_OPTIONS = ConfigOptions
 		.key("env.ssh.opts")
 		.noDefaultValue()


[2/2] flink git commit: [FLINK-8798] [core] Make force 'commons-logging' to be parent-first loaded.

Posted by se...@apache.org.
[FLINK-8798] [core] Make 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/a269f851
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/a269f851
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/a269f851

Branch: refs/heads/release-1.5
Commit: a269f8519305faff153e84d729873b6f9497bd36
Parents: e9e13de
Author: Stephan Ewen <se...@apache.org>
Authored: Tue Feb 27 17:04:29 2018 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Tue Feb 27 17:18:35 2018 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/flink/configuration/CoreOptions.java    | 4 ++--
 .../org/apache/flink/configuration/ParentFirstPatternsTest.java  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/a269f851/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 dc544e0..8ac729d 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
@@ -80,14 +80,14 @@ public class CoreOptions {
 	 *         and formats (flink-avro, etc) are loaded parent-first as well if they are in the
 	 *         core classpath.</li>
 	 *     <li>Java annotations and loggers, defined by the following list:
-	 *         javax.annotation;org.slf4j;org.apache.log4j;org.apache.logging.log4j;ch.qos.logback.
+	 *         javax.annotation;org.slf4j;org.apache.log4j;org.apache.logging;org.apache.commons.logging;ch.qos.logback.
 	 *         This is done for convenience, to avoid duplication of annotations and multiple
 	 *         log bindings.</li>
 	 * </ul>
 	 */
 	public static final ConfigOption<String> ALWAYS_PARENT_FIRST_LOADER_PATTERNS = ConfigOptions
 		.key("classloader.parent-first-patterns.default")
-		.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;org.apache.commons.logging;ch.qos.logback")
 		.withDeprecatedKeys("classloader.parent-first-patterns")
 		.withDescription("A (semicolon-separated) list of patterns that specifies which classes should always be" +
 			" resolved through the parent ClassLoader first. A pattern is a simple prefix that is checked against" +

http://git-wip-us.apache.org/repos/asf/flink/blob/a269f851/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 ca4b511..b373a6d 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
@@ -54,7 +54,8 @@ public class ParentFirstPatternsTest extends TestLogger {
 	public void testLoggersParentFirst() {
 		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.logging"));
+		assertTrue(PARENT_FIRST_PACKAGES.contains("org.apache.commons.logging"));
 		assertTrue(PARENT_FIRST_PACKAGES.contains("ch.qos.logback"));
 	}