flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject flink git commit: [FLINK-3569] [build] Adjust test cases due to shading plugin base directory changes
Date Fri, 04 Mar 2016 17:46:03 GMT
Repository: flink
Updated Branches:
  refs/heads/master dbe9e596e -> bb62ab082


[FLINK-3569] [build] Adjust test cases due to shading plugin base directory changes


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

Branch: refs/heads/master
Commit: bb62ab082f7e6157138d509e305e10510badc491
Parents: dbe9e59
Author: Maximilian Michels <mxm@apache.org>
Authored: Thu Mar 3 12:52:32 2016 +0100
Committer: Stephan Ewen <sewen@apache.org>
Committed: Fri Mar 4 17:14:23 2016 +0100

----------------------------------------------------------------------
 .../api/avro/AvroExternalJarProgramITCase.java     |  2 +-
 .../storm/wordcount/WordCountRemoteByClient.java   |  2 +-
 flink-dist/pom.xml                                 | 17 +++++++++--------
 .../apache/flink/api/scala/ScalaShellITCase.scala  |  2 +-
 .../flink/test/classloading/ClassLoaderITCase.java | 10 +++++-----
 .../java/org/apache/flink/yarn/YarnTestBase.java   |  4 ++--
 6 files changed, 19 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/bb62ab08/flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/avro/AvroExternalJarProgramITCase.java
----------------------------------------------------------------------
diff --git a/flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/avro/AvroExternalJarProgramITCase.java
b/flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/avro/AvroExternalJarProgramITCase.java
index e2d91af..ac10074 100644
--- a/flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/avro/AvroExternalJarProgramITCase.java
+++ b/flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/avro/AvroExternalJarProgramITCase.java
@@ -40,7 +40,7 @@ import org.junit.Test;
 
 public class AvroExternalJarProgramITCase {
 
-	private static final String JAR_FILE = "target/maven-test-jar.jar";
+	private static final String JAR_FILE = "maven-test-jar.jar";
 
 	private static final String TEST_DATA_FILE = "/testdata.avro";
 

http://git-wip-us.apache.org/repos/asf/flink/blob/bb62ab08/flink-contrib/flink-storm-examples/src/main/java/org/apache/flink/storm/wordcount/WordCountRemoteByClient.java
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-storm-examples/src/main/java/org/apache/flink/storm/wordcount/WordCountRemoteByClient.java
b/flink-contrib/flink-storm-examples/src/main/java/org/apache/flink/storm/wordcount/WordCountRemoteByClient.java
index c7c7f7c..6b718b9 100644
--- a/flink-contrib/flink-storm-examples/src/main/java/org/apache/flink/storm/wordcount/WordCountRemoteByClient.java
+++ b/flink-contrib/flink-storm-examples/src/main/java/org/apache/flink/storm/wordcount/WordCountRemoteByClient.java
@@ -50,7 +50,7 @@ import org.apache.flink.storm.api.FlinkTopology;
  */
 public class WordCountRemoteByClient {
 	public final static String topologyId = "Storm WordCount";
-	private final static String uploadedJarLocation = "target/WordCount-StormTopology.jar";
+	private final static String uploadedJarLocation = "WordCount-StormTopology.jar";
 
 	// *************************************************************************
 	// PROGRAM

http://git-wip-us.apache.org/repos/asf/flink/blob/bb62ab08/flink-dist/pom.xml
----------------------------------------------------------------------
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 19d251f..7dd4df8 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -35,14 +35,6 @@ under the License.
 
 	<dependencies>
 
-		<dependency>
-			<groupId>org.apache.flink</groupId>
-			<artifactId>force-shading</artifactId>
-			<version>1.0.0</version>
-			<!-- This is necessary to prevent shading of this module -->
-			<scope>provided</scope>
-		</dependency>
-
 		<!-- BINARIES -->
 		<dependency>
 			<groupId>org.apache.flink</groupId>
@@ -186,6 +178,15 @@ under the License.
 							</transformers>
 						</configuration>
 					</execution>
+					<execution>
+						<!--
+						Disable inherited shade-flink to prevent the Shade plugin from changing the project.basedir.
The basedir
+						is changed by the Shade plugin when dependencyReducedPomLocation is set to a different
location than the
+						original basedir. We do that in the root pom.xml.
+						-->
+						<id>shade-flink</id>
+						<phase>none</phase>
+					</execution>
 				</executions>
 			</plugin>
 

http://git-wip-us.apache.org/repos/asf/flink/blob/bb62ab08/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellITCase.scala
----------------------------------------------------------------------
diff --git a/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellITCase.scala
b/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellITCase.scala
index 6ec0045..1bf8cfe 100644
--- a/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellITCase.scala
+++ b/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellITCase.scala
@@ -155,7 +155,7 @@ class ScalaShellITCase extends TestLogger {
 
     // find jar file that contains the ml code
     var externalJar = ""
-    val folder = new File("../flink-libraries/flink-ml/target/")
+    val folder = new File("../../flink-libraries/flink-ml/target/")
     val listOfFiles = folder.listFiles()
 
     for (i <- listOfFiles.indices) {

http://git-wip-us.apache.org/repos/asf/flink/blob/bb62ab08/flink-tests/src/test/java/org/apache/flink/test/classloading/ClassLoaderITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/classloading/ClassLoaderITCase.java
b/flink-tests/src/test/java/org/apache/flink/test/classloading/ClassLoaderITCase.java
index 4003de1..9d0d637 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/classloading/ClassLoaderITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/classloading/ClassLoaderITCase.java
@@ -35,15 +35,15 @@ import static org.junit.Assert.fail;
 
 public class ClassLoaderITCase {
 
-	private static final String INPUT_SPLITS_PROG_JAR_FILE = "target/customsplit-test-jar.jar";
+	private static final String INPUT_SPLITS_PROG_JAR_FILE = "customsplit-test-jar.jar";
 
-	private static final String STREAMING_INPUT_SPLITS_PROG_JAR_FILE = "target/streaming-customsplit-test-jar.jar";
+	private static final String STREAMING_INPUT_SPLITS_PROG_JAR_FILE = "streaming-customsplit-test-jar.jar";
 
-	private static final String STREAMING_PROG_JAR_FILE = "target/streamingclassloader-test-jar.jar";
+	private static final String STREAMING_PROG_JAR_FILE = "streamingclassloader-test-jar.jar";
 
-	private static final String STREAMING_CHECKPOINTED_PROG_JAR_FILE = "target/streaming-checkpointed-classloader-test-jar.jar";
+	private static final String STREAMING_CHECKPOINTED_PROG_JAR_FILE = "streaming-checkpointed-classloader-test-jar.jar";
 
-	private static final String KMEANS_JAR_PATH = "target/kmeans-test-jar.jar";
+	private static final String KMEANS_JAR_PATH = "kmeans-test-jar.jar";
 
 	@Rule
 	public TemporaryFolder folder = new TemporaryFolder();

http://git-wip-us.apache.org/repos/asf/flink/blob/bb62ab08/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YarnTestBase.java
----------------------------------------------------------------------
diff --git a/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YarnTestBase.java b/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YarnTestBase.java
index a0a517c..fc1e5bc 100644
--- a/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YarnTestBase.java
+++ b/flink-yarn-tests/src/main/java/org/apache/flink/yarn/YarnTestBase.java
@@ -252,7 +252,7 @@ public abstract class YarnTestBase extends TestLogger {
 	 *
 	 */
 	public static void ensureNoProhibitedStringInLogFiles(final String[] prohibited, final String[]
whitelisted) {
-		File cwd = new File("target/"+yarnConfiguration.get(TEST_CLUSTER_NAME_KEY));
+		File cwd = new File("target/" + yarnConfiguration.get(TEST_CLUSTER_NAME_KEY));
 		Assert.assertTrue("Expecting directory " + cwd.getAbsolutePath() + " to exist", cwd.exists());
 		Assert.assertTrue("Expecting directory " + cwd.getAbsolutePath() + " to be a directory",
cwd.isDirectory());
 		
@@ -598,7 +598,7 @@ public abstract class YarnTestBase extends TestLogger {
 		// The files from there are picked up by the ./tools/travis_watchdog.sh script
 		// to upload them to Amazon S3.
 		if(isOnTravis()) {
-			File target = new File("../target/"+yarnConfiguration.get(TEST_CLUSTER_NAME_KEY));
+			File target = new File("../target" + yarnConfiguration.get(TEST_CLUSTER_NAME_KEY));
 			if(!target.mkdirs()) {
 				LOG.warn("Error creating dirs to {}", target);
 			}


Mime
View raw message