Repository: spark Updated Branches: refs/heads/master 95efc895e -> afd9bc1d8
[SPARK-17807][CORE] split test-tags into test-JAR Remove spark-tag's compile-scope dependency (and, indirectly, spark-core's compile-scope transitive-dependency) on scalatest by splitting test-oriented tags into spark-tags' test JAR. Alternative to #16303. Author: Ryan Williams <ryan.blake.willi...@gmail.com> Closes #16311 from ryan-williams/tt. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/afd9bc1d Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/afd9bc1d Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/afd9bc1d Branch: refs/heads/master Commit: afd9bc1d8a85adf88c412d8bc75e46e7ecb4bcdd Parents: 95efc89 Author: Ryan Williams <ryan.blake.willi...@gmail.com> Authored: Wed Dec 21 16:37:20 2016 -0800 Committer: Marcelo Vanzin <van...@cloudera.com> Committed: Wed Dec 21 16:37:20 2016 -0800 ---------------------------------------------------------------------- common/network-common/pom.xml | 12 +++++++++ common/network-shuffle/pom.xml | 12 +++++++++ common/network-yarn/pom.xml | 11 ++++++++ common/sketch/pom.xml | 12 +++++++++ common/tags/pom.xml | 8 ------ .../java/org/apache/spark/tags/DockerTest.java | 26 ------------------- .../org/apache/spark/tags/ExtendedHiveTest.java | 27 -------------------- .../org/apache/spark/tags/ExtendedYarnTest.java | 27 -------------------- .../java/org/apache/spark/tags/DockerTest.java | 26 +++++++++++++++++++ .../org/apache/spark/tags/ExtendedHiveTest.java | 27 ++++++++++++++++++++ .../org/apache/spark/tags/ExtendedYarnTest.java | 27 ++++++++++++++++++++ common/unsafe/pom.xml | 12 +++++++++ core/pom.xml | 12 +++++++++ external/docker-integration-tests/pom.xml | 2 +- external/flume-sink/pom.xml | 12 +++++++++ external/flume/pom.xml | 12 +++++++++ external/java8-tests/pom.xml | 12 +++++++++ external/kafka-0-10-sql/pom.xml | 12 +++++++++ external/kafka-0-10/pom.xml | 12 +++++++++ external/kafka-0-8/pom.xml | 12 +++++++++ external/kinesis-asl/pom.xml | 12 +++++++++ graphx/pom.xml | 12 +++++++++ launcher/pom.xml | 11 ++++++++ mllib-local/pom.xml | 12 +++++++++ mllib/pom.xml | 12 +++++++++ pom.xml | 6 +++++ repl/pom.xml | 12 +++++++++ resource-managers/yarn/pom.xml | 2 ++ sql/catalyst/pom.xml | 12 +++++++++ sql/core/pom.xml | 12 +++++++++ sql/hive-thriftserver/pom.xml | 12 +++++++++ sql/hive/pom.xml | 2 ++ streaming/pom.xml | 11 ++++++++ 33 files changed, 352 insertions(+), 89 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/common/network-common/pom.xml ---------------------------------------------------------------------- diff --git a/common/network-common/pom.xml b/common/network-common/pom.xml index b63c0ca..8657af7 100644 --- a/common/network-common/pom.xml +++ b/common/network-common/pom.xml @@ -91,6 +91,18 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/common/network-shuffle/pom.xml ---------------------------------------------------------------------- diff --git a/common/network-shuffle/pom.xml b/common/network-shuffle/pom.xml index 5fc92af..24c10fb 100644 --- a/common/network-shuffle/pom.xml +++ b/common/network-shuffle/pom.xml @@ -70,6 +70,18 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/common/network-yarn/pom.xml ---------------------------------------------------------------------- diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml index 9fcd636..5e5a80b 100644 --- a/common/network-yarn/pom.xml +++ b/common/network-yarn/pom.xml @@ -50,6 +50,17 @@ <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <!-- Provided dependencies --> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/common/sketch/pom.xml ---------------------------------------------------------------------- diff --git a/common/sketch/pom.xml b/common/sketch/pom.xml index 7f57108..bcd26d4 100644 --- a/common/sketch/pom.xml +++ b/common/sketch/pom.xml @@ -39,6 +39,18 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + </dependencies> <build> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/common/tags/pom.xml ---------------------------------------------------------------------- diff --git a/common/tags/pom.xml b/common/tags/pom.xml index 81191cb..09f6fa1 100644 --- a/common/tags/pom.xml +++ b/common/tags/pom.xml @@ -34,14 +34,6 @@ <sbt.project.name>tags</sbt.project.name> </properties> - <dependencies> - <dependency> - <groupId>org.scalatest</groupId> - <artifactId>scalatest_${scala.binary.version}</artifactId> - <scope>compile</scope> - </dependency> - </dependencies> - <build> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/common/tags/src/main/java/org/apache/spark/tags/DockerTest.java ---------------------------------------------------------------------- diff --git a/common/tags/src/main/java/org/apache/spark/tags/DockerTest.java b/common/tags/src/main/java/org/apache/spark/tags/DockerTest.java deleted file mode 100644 index 0fecf3b..0000000 --- a/common/tags/src/main/java/org/apache/spark/tags/DockerTest.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.spark.tags; - -import java.lang.annotation.*; -import org.scalatest.TagAnnotation; - -@TagAnnotation -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.METHOD, ElementType.TYPE}) -public @interface DockerTest { } http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/common/tags/src/main/java/org/apache/spark/tags/ExtendedHiveTest.java ---------------------------------------------------------------------- diff --git a/common/tags/src/main/java/org/apache/spark/tags/ExtendedHiveTest.java b/common/tags/src/main/java/org/apache/spark/tags/ExtendedHiveTest.java deleted file mode 100644 index 83279e5..0000000 --- a/common/tags/src/main/java/org/apache/spark/tags/ExtendedHiveTest.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.spark.tags; - -import java.lang.annotation.*; - -import org.scalatest.TagAnnotation; - -@TagAnnotation -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.METHOD, ElementType.TYPE}) -public @interface ExtendedHiveTest { } http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/common/tags/src/main/java/org/apache/spark/tags/ExtendedYarnTest.java ---------------------------------------------------------------------- diff --git a/common/tags/src/main/java/org/apache/spark/tags/ExtendedYarnTest.java b/common/tags/src/main/java/org/apache/spark/tags/ExtendedYarnTest.java deleted file mode 100644 index 1083001..0000000 --- a/common/tags/src/main/java/org/apache/spark/tags/ExtendedYarnTest.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.spark.tags; - -import java.lang.annotation.*; - -import org.scalatest.TagAnnotation; - -@TagAnnotation -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.METHOD, ElementType.TYPE}) -public @interface ExtendedYarnTest { } http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/common/tags/src/test/java/org/apache/spark/tags/DockerTest.java ---------------------------------------------------------------------- diff --git a/common/tags/src/test/java/org/apache/spark/tags/DockerTest.java b/common/tags/src/test/java/org/apache/spark/tags/DockerTest.java new file mode 100644 index 0000000..0fecf3b --- /dev/null +++ b/common/tags/src/test/java/org/apache/spark/tags/DockerTest.java @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.tags; + +import java.lang.annotation.*; +import org.scalatest.TagAnnotation; + +@TagAnnotation +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.METHOD, ElementType.TYPE}) +public @interface DockerTest { } http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/common/tags/src/test/java/org/apache/spark/tags/ExtendedHiveTest.java ---------------------------------------------------------------------- diff --git a/common/tags/src/test/java/org/apache/spark/tags/ExtendedHiveTest.java b/common/tags/src/test/java/org/apache/spark/tags/ExtendedHiveTest.java new file mode 100644 index 0000000..83279e5 --- /dev/null +++ b/common/tags/src/test/java/org/apache/spark/tags/ExtendedHiveTest.java @@ -0,0 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.tags; + +import java.lang.annotation.*; + +import org.scalatest.TagAnnotation; + +@TagAnnotation +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.METHOD, ElementType.TYPE}) +public @interface ExtendedHiveTest { } http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/common/tags/src/test/java/org/apache/spark/tags/ExtendedYarnTest.java ---------------------------------------------------------------------- diff --git a/common/tags/src/test/java/org/apache/spark/tags/ExtendedYarnTest.java b/common/tags/src/test/java/org/apache/spark/tags/ExtendedYarnTest.java new file mode 100644 index 0000000..1083001 --- /dev/null +++ b/common/tags/src/test/java/org/apache/spark/tags/ExtendedYarnTest.java @@ -0,0 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.tags; + +import java.lang.annotation.*; + +import org.scalatest.TagAnnotation; + +@TagAnnotation +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.METHOD, ElementType.TYPE}) +public @interface ExtendedYarnTest { } http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/common/unsafe/pom.xml ---------------------------------------------------------------------- diff --git a/common/unsafe/pom.xml b/common/unsafe/pom.xml index d00bddf..dc19f4a 100644 --- a/common/unsafe/pom.xml +++ b/common/unsafe/pom.xml @@ -39,6 +39,18 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.twitter</groupId> <artifactId>chill_${scala.binary.version}</artifactId> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 8ee88cc..97a463a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -337,6 +337,18 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-crypto</artifactId> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/external/docker-integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/external/docker-integration-tests/pom.xml b/external/docker-integration-tests/pom.xml index 6741932..8948df2 100644 --- a/external/docker-integration-tests/pom.xml +++ b/external/docker-integration-tests/pom.xml @@ -96,7 +96,7 @@ <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> - <version>${project.version}</version> + <type>test-jar</type> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/external/flume-sink/pom.xml ---------------------------------------------------------------------- diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml index 83619cc..6d547c4 100644 --- a/external/flume-sink/pom.xml +++ b/external/flume-sink/pom.xml @@ -93,6 +93,18 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + </dependencies> <build> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/external/flume/pom.xml ---------------------------------------------------------------------- diff --git a/external/flume/pom.xml b/external/flume/pom.xml index 4a40f8b..46901d6 100644 --- a/external/flume/pom.xml +++ b/external/flume/pom.xml @@ -69,6 +69,18 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + </dependencies> <build> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/external/java8-tests/pom.xml ---------------------------------------------------------------------- diff --git a/external/java8-tests/pom.xml b/external/java8-tests/pom.xml index 98467f2..8fc46d7 100644 --- a/external/java8-tests/pom.xml +++ b/external/java8-tests/pom.xml @@ -73,6 +73,18 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + </dependencies> <build> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/external/kafka-0-10-sql/pom.xml ---------------------------------------------------------------------- diff --git a/external/kafka-0-10-sql/pom.xml b/external/kafka-0-10-sql/pom.xml index 29abd88..6cf448e 100644 --- a/external/kafka-0-10-sql/pom.xml +++ b/external/kafka-0-10-sql/pom.xml @@ -88,6 +88,18 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + </dependencies> <build> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/external/kafka-0-10/pom.xml ---------------------------------------------------------------------- diff --git a/external/kafka-0-10/pom.xml b/external/kafka-0-10/pom.xml index b9ab576..8849924 100644 --- a/external/kafka-0-10/pom.xml +++ b/external/kafka-0-10/pom.xml @@ -89,6 +89,18 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + </dependencies> <build> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/external/kafka-0-8/pom.xml ---------------------------------------------------------------------- diff --git a/external/kafka-0-8/pom.xml b/external/kafka-0-8/pom.xml index bdb3b4d..8368a1f 100644 --- a/external/kafka-0-8/pom.xml +++ b/external/kafka-0-8/pom.xml @@ -89,6 +89,18 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + </dependencies> <build> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/external/kinesis-asl/pom.xml ---------------------------------------------------------------------- diff --git a/external/kinesis-asl/pom.xml b/external/kinesis-asl/pom.xml index 32ea114..b2bac7c 100644 --- a/external/kinesis-asl/pom.xml +++ b/external/kinesis-asl/pom.xml @@ -78,6 +78,18 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + </dependencies> <build> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/graphx/pom.xml ---------------------------------------------------------------------- diff --git a/graphx/pom.xml b/graphx/pom.xml index a9f7839..8df3366 100644 --- a/graphx/pom.xml +++ b/graphx/pom.xml @@ -78,6 +78,18 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + </dependencies> <build> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/launcher/pom.xml ---------------------------------------------------------------------- diff --git a/launcher/pom.xml b/launcher/pom.xml index 899957f..025cd84 100644 --- a/launcher/pom.xml +++ b/launcher/pom.xml @@ -67,6 +67,17 @@ <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <!-- Not needed by the test code, but referenced by SparkSubmit which is used by the tests. --> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/mllib-local/pom.xml ---------------------------------------------------------------------- diff --git a/mllib-local/pom.xml b/mllib-local/pom.xml index 201446e..663f7fb 100644 --- a/mllib-local/pom.xml +++ b/mllib-local/pom.xml @@ -56,6 +56,18 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + </dependencies> <profiles> <profile> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/mllib/pom.xml ---------------------------------------------------------------------- diff --git a/mllib/pom.xml b/mllib/pom.xml index aad6974..82f840b 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -113,6 +113,18 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + </dependencies> <profiles> <profile> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 72e5442..a0c44f5 100644 --- a/pom.xml +++ b/pom.xml @@ -294,6 +294,12 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + </dependency> + <dependency> <groupId>com.twitter</groupId> <artifactId>chill_${scala.binary.version}</artifactId> <version>${chill.version}</version> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/repl/pom.xml ---------------------------------------------------------------------- diff --git a/repl/pom.xml b/repl/pom.xml index 1baf134..a256ae3 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -92,6 +92,18 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.xbean</groupId> <artifactId>xbean-asm5-shaded</artifactId> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/resource-managers/yarn/pom.xml ---------------------------------------------------------------------- diff --git a/resource-managers/yarn/pom.xml b/resource-managers/yarn/pom.xml index 04b51dc..f090d24 100644 --- a/resource-managers/yarn/pom.xml +++ b/resource-managers/yarn/pom.xml @@ -54,6 +54,8 @@ <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/sql/catalyst/pom.xml ---------------------------------------------------------------------- diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index ba5b5c9..765c92b 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -56,6 +56,18 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-unsafe_${scala.binary.version}</artifactId> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/sql/core/pom.xml ---------------------------------------------------------------------- diff --git a/sql/core/pom.xml b/sql/core/pom.xml index 4178b0a..b8aa698 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -74,6 +74,18 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.parquet</groupId> <artifactId>parquet-column</artifactId> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/sql/hive-thriftserver/pom.xml ---------------------------------------------------------------------- diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index 7a6e966..9c87921 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -85,6 +85,18 @@ <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>net.sf.jpam</groupId> <artifactId>jpam</artifactId> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/sql/hive/pom.xml ---------------------------------------------------------------------- diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index af02d05..9aedaf2 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -60,6 +60,8 @@ <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <!-- <dependency> http://git-wip-us.apache.org/repos/asf/spark/blob/afd9bc1d/streaming/pom.xml ---------------------------------------------------------------------- diff --git a/streaming/pom.xml b/streaming/pom.xml index 7168999..de1be9c 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -51,6 +51,17 @@ <artifactId>spark-tags_${scala.binary.version}</artifactId> </dependency> + <!-- + This spark-tags test-dep is needed even though it isn't used in this module, otherwise testing-cmds that exclude + them will yield errors. + --> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-tags_${scala.binary.version}</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <!-- Explicit listing of transitive deps that are shaded. Otherwise, odd compiler crashes. --> <dependency> <groupId>com.google.guava</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
