From 7a229ab987b36cf341e0d78b6b92aab79a62ea8f Mon Sep 17 00:00:00 2001 From: Maximilian Michels Date: Thu, 3 Mar 2016 12:52:32 +0100 Subject: [PATCH 1/3] [maven] explicitly disable shading of flink-dist - shading was previously disabled through setting the force-shading dependency to provided --- flink-dist/pom.xml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml index 19d251f48908d..7dd4df8aef68f 100644 --- a/flink-dist/pom.xml +++ b/flink-dist/pom.xml @@ -35,14 +35,6 @@ under the License. - - org.apache.flink - force-shading - 1.0.0 - - provided - - org.apache.flink @@ -186,6 +178,15 @@ under the License. + + + shade-flink + none + From 07ad4044ef1d746a4e8b54721436aedf894d42a3 Mon Sep 17 00:00:00 2001 From: Maximilian Michels Date: Thu, 3 Mar 2016 16:31:49 +0100 Subject: [PATCH 2/3] [FLINK-3569] fix test cases that expect a different working directory - all the it cases executed after shading now have the target directory as working directory --- .../flink/api/avro/AvroExternalJarProgramITCase.java | 2 +- .../flink/storm/wordcount/WordCountRemoteByClient.java | 2 +- .../org/apache/flink/api/scala/ScalaShellITCase.scala | 2 +- .../flink/test/classloading/ClassLoaderITCase.java | 10 +++++----- .../main/java/org/apache/flink/yarn/YarnTestBase.java | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) 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 e2d91af1e81d0..ac1007457fa3b 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 @@ 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"; 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 c7c7f7c8cc579..6b718b9ae564e 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 @@ */ 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 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 6ec0045cdb274..1bf8cfe92e7cb 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) { 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 4003de1d58e3b..9d0d6377fdca5 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 @@ 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(); 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 a0a517c9eaea6..09187a5c123b6 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 static File writeYarnSiteConfigXML(Configuration yarnConf) throws IOExcep * */ 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(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 static void copyOnTravis() { // 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(yarnConfiguration.get(TEST_CLUSTER_NAME_KEY)); if(!target.mkdirs()) { LOG.warn("Error creating dirs to {}", target); } From 9f97aaaab95817f7c1bf77d9c1f7c049c691e00d Mon Sep 17 00:00:00 2001 From: Maximilian Michels Date: Fri, 4 Mar 2016 17:10:02 +0100 Subject: [PATCH 3/3] yarn It cases are actually not shaded because they are in test scope --- .../src/main/java/org/apache/flink/yarn/YarnTestBase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 09187a5c123b6..fc1e5bc01bbd3 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 static File writeYarnSiteConfigXML(Configuration yarnConf) throws IOExcep * */ public static void ensureNoProhibitedStringInLogFiles(final String[] prohibited, final String[] whitelisted) { - File cwd = new File(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 static void copyOnTravis() { // 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(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); }