From bb62ab082f7e6157138d509e305e10510badc491 Mon Sep 17 00:00:00 2001 From: Maximilian Michels Date: Thu, 3 Mar 2016 12:52:32 +0100 Subject: [PATCH] [FLINK-3569] [build] Adjust test cases due to shading plugin base directory changes --- .../api/avro/AvroExternalJarProgramITCase.java | 2 +- .../wordcount/WordCountRemoteByClient.java | 2 +- flink-dist/pom.xml | 17 +++++++++-------- .../flink/api/scala/ScalaShellITCase.scala | 2 +- .../test/classloading/ClassLoaderITCase.java | 10 +++++----- .../org/apache/flink/yarn/YarnTestBase.java | 4 ++-- 6 files changed, 19 insertions(+), 18 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 e2d91af1e81..ac1007457fa 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"; 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 c7c7f7c8cc5..6b718b9ae56 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 diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml index 19d251f4890..7dd4df8aef6 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 + 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 6ec0045cdb2..1bf8cfe92e7 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 4003de1d58e..9d0d6377fdc 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(); 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 a0a517c9eae..fc1e5bc01bb 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); } -- GitLab