From d0e52954b035cd4e8cd25962500b3ebb57561f39 Mon Sep 17 00:00:00 2001
From: zentol <chesnay@apache.org>
Date: Sat, 8 Jul 2017 08:44:05 +0200
Subject: [PATCH] [FLINK-7111] [scala-shell] Disable external jar test

This closes #4288.
---
 flink-scala-shell/pom.xml                     | 55 -------------------
 .../flink/api/scala/ScalaShellITCase.scala    | 14 ++++-
 2 files changed, 11 insertions(+), 58 deletions(-)

diff --git a/flink-scala-shell/pom.xml b/flink-scala-shell/pom.xml
index e3126991235bc..6f490e44eed53 100644
--- a/flink-scala-shell/pom.xml
+++ b/flink-scala-shell/pom.xml
@@ -242,61 +242,6 @@ under the License.
 				</executions>
 			</plugin>
 
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.4</version><!--$NO-MVN-MAN-VER$-->
-				<executions>
-					<execution>
-						<id>create-library-loading-jar</id>
-						<phase>process-test-classes</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<!--<archive>-->
-								<!--<manifest>-->
-									<!--<mainClass>org.apache.flink.test.classloading.jar.KMeansForTest</mainClass>-->
-								<!--</manifest>-->
-							<!--</archive>-->
-							<finalName>customjar</finalName>
-							<attach>false</attach>
-							<descriptors>
-								<descriptor>src/test/assembly/test-scalashell-customjar-assembly.xml</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-
-			<!--Remove the the classes in the jar package from the test-classes directory since they
-			musn't be in the classpath when running ScalaShellITCase to actually test loading
-			of external jars.-->
-			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
-				<version>2.5</version><!--$NO-MVN-MAN-VER$-->
-				<executions>
-					<execution>
-						<id>remove-classloading-test-dependencies</id>
-						<phase>process-test-classes</phase>
-						<goals>
-							<goal>clean</goal>
-						</goals>
-						<configuration>
-							<excludeDefaultDirectories>true</excludeDefaultDirectories>
-							<filesets>
-								<fileset>
-									<directory>${project.build.testOutputDirectory}</directory>
-									<includes>
-										<include>**/jar/*.class</include>
-									</includes>
-								</fileset>
-							</filesets>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
 		</plugins>
 	</build>
 
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 ce08304395c0c..b4ccfaaae7da1 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
@@ -26,7 +26,7 @@ import org.apache.flink.runtime.minicluster.StandaloneMiniCluster
 import org.apache.flink.configuration.{ConfigConstants, Configuration, GlobalConfiguration}
 import org.apache.flink.test.util.TestBaseUtils
 import org.apache.flink.util.TestLogger
-import org.junit.{AfterClass, Assert, BeforeClass, Test}
+import org.junit.{AfterClass, Assert, BeforeClass, Ignore, Test}
 
 import scala.concurrent.{Await, Future}
 import scala.concurrent.duration.FiniteDuration
@@ -164,7 +164,11 @@ class ScalaShellITCase extends TestLogger {
     Assert.assertTrue(output.contains("WC(world,10)"))
   }
 
-  /** Submit external library */
+  /**
+   * Submit external library.
+   * Disabled due to FLINK-7111.
+   */
+  @Ignore
   @Test
   def testSubmissionOfExternalLibraryBatch: Unit = {
     val input =
@@ -184,7 +188,11 @@ class ScalaShellITCase extends TestLogger {
     Assert.assertTrue(output.contains("\nHELLO 42"))
   }
 
-  /** Submit external library */
+  /**
+   * Submit external library.
+   * Disabled due to FLINK-7111.
+   */
+  @Ignore
   @Test
   def testSubmissionOfExternalLibraryStream: Unit = {
     val input =