flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trohrm...@apache.org
Subject [3/3] flink git commit: [FLINK-2705] [yarn] Excludes commons-codec:1.3 from aws-java-jdk dependency to resolve dependency ambiguity
Date Wed, 23 Sep 2015 10:13:13 GMT
[FLINK-2705] [yarn] Excludes commons-codec:1.3 from aws-java-jdk dependency to resolve dependency
ambiguity

This closes #1162.


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

Branch: refs/heads/master
Commit: ca542057a068b770c5c6ac8d2f5cec807bc5deed
Parents: 54d8f49
Author: Till Rohrmann <trohrmann@apache.org>
Authored: Mon Sep 21 15:35:32 2015 +0200
Committer: Till Rohrmann <trohrmann@apache.org>
Committed: Wed Sep 23 12:12:38 2015 +0200

----------------------------------------------------------------------
 flink-dist/src/main/flink-bin/LICENSE                          | 2 +-
 flink-runtime/pom.xml                                          | 6 ++++++
 .../java/org/apache/flink/runtime/fs/s3/S3FileSystemTest.java  | 1 -
 .../flink/runtime/jobmanager/JobManagerProcessReapingTest.java | 3 +++
 4 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/ca542057/flink-dist/src/main/flink-bin/LICENSE
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/LICENSE b/flink-dist/src/main/flink-bin/LICENSE
index 9df6da5..88a1cd1 100644
--- a/flink-dist/src/main/flink-bin/LICENSE
+++ b/flink-dist/src/main/flink-bin/LICENSE
@@ -219,7 +219,7 @@ The Apache Flink project bundles the following components
 under the Apache License (v 2.0):
 
  - Apache Commons Logging (commons-logging:commons-logging:1.1.1 - http://commons.apache.org/proper/commons-logging/)
- - Apache Commons Codec (commons-codec:commons-codec:1.3 - http://commons.apache.org/proper/commons-codec/)
+ - Apache Commons Codec (commons-codec:commons-codec:1.4 - http://commons.apache.org/proper/commons-codec/)
  - Apache Commons Collections (commons-collections:commons-collections:3.2.1 - http://commons.apache.org/collections/)
  - Apache Commons CLI (commons-cli:commons-cli:1.2 - http://commons.apache.org/cli/)
  - Apache Commons FileUpload (commons-fileupload:commons-fileupload:1.3.1 - http://commons.apache.org/fileupload/)

http://git-wip-us.apache.org/repos/asf/flink/blob/ca542057/flink-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index 4a7c152..1d98bfd 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -91,6 +91,12 @@ under the License.
 			<groupId>com.amazonaws</groupId>
 			<artifactId>aws-java-sdk</artifactId>
 			<version>1.8.1</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>commons-codec</artifactId>
+					<groupId>commons-codec</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>

http://git-wip-us.apache.org/repos/asf/flink/blob/ca542057/flink-runtime/src/test/java/org/apache/flink/runtime/fs/s3/S3FileSystemTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/fs/s3/S3FileSystemTest.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/fs/s3/S3FileSystemTest.java
index 3f09e49..b8cd99d 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/fs/s3/S3FileSystemTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/fs/s3/S3FileSystemTest.java
@@ -39,7 +39,6 @@ import org.apache.flink.core.fs.FSDataOutputStream;
 import org.apache.flink.core.fs.FileStatus;
 import org.apache.flink.core.fs.FileSystem;
 import org.apache.flink.core.fs.Path;
-import org.apache.flink.runtime.fs.s3.S3FileSystem;
 import org.junit.Before;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/flink/blob/ca542057/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerProcessReapingTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerProcessReapingTest.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerProcessReapingTest.java
index fbb5dce..93f7b9a 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerProcessReapingTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerProcessReapingTest.java
@@ -74,6 +74,7 @@ public class JobManagerProcessReapingTest {
 			CommonTestUtils.printLog4jDebugConfig(tempLogFile);
 
 			// start a JobManger process
+			// the log level must be at least INFO, otherwise the bound port cannot be retrieved
 			String[] command = new String[] {
 					javaCommand,
 					"-Dlog.level=DEBUG",
@@ -98,6 +99,8 @@ public class JobManagerProcessReapingTest {
 			ActorRef jobManagerRef = null;
 			Throwable lastError = null;
 
+			// Log message on JobManager must be: Starting JobManager at ...://flink@...:port/..."
+			// otherwise, the pattern does not match and, thus, cannot retrieve the bound port
 			String pattern = "Starting JobManager at [^:]*://flink@[^:]*:(\\d*)/";
 			Pattern r = Pattern.compile(pattern);
 			int jobManagerPort = -1;


Mime
View raw message