diff options
| author | zsxwing <zsxwing@gmail.com> | 2015-05-28 09:04:12 -0700 |
|---|---|---|
| committer | Patrick Wendell <patrick@databricks.com> | 2015-05-28 09:04:12 -0700 |
| commit | 000df2f0d6af068bb188e81bbb207f0c2f43bf16 (patch) | |
| tree | d9843f0570102ea4d6263ac716f7bdfd59a8d6e4 /examples/pom.xml | |
| parent | e838a25bdb5603ef05e779225704c972ce436145 (diff) | |
| download | spark-000df2f0d6af068bb188e81bbb207f0c2f43bf16.tar.gz spark-000df2f0d6af068bb188e81bbb207f0c2f43bf16.tar.bz2 spark-000df2f0d6af068bb188e81bbb207f0c2f43bf16.zip | |
[SPARK-7895] [STREAMING] [EXAMPLES] Move Kafka examples from scala-2.10/src to src
Since `spark-streaming-kafka` now is published for both Scala 2.10 and 2.11, we can move `KafkaWordCount` and `DirectKafkaWordCount` from `examples/scala-2.10/src/` to `examples/src/` so that they will appear in `spark-examples-***-jar` for Scala 2.11.
Author: zsxwing <zsxwing@gmail.com>
Closes #6436 from zsxwing/SPARK-7895 and squashes the following commits:
c6052f1 [zsxwing] Update examples/pom.xml
0bcfa87 [zsxwing] Fix the sleep time
b9d1256 [zsxwing] Move Kafka examples from scala-2.10/src to src
Diffstat (limited to 'examples/pom.xml')
| -rw-r--r-- | examples/pom.xml | 44 |
1 files changed, 5 insertions, 39 deletions
diff --git a/examples/pom.xml b/examples/pom.xml index 5b04b4f8d6..e4efee7b5e 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -98,6 +98,11 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-streaming-kafka_${scala.binary.version}</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-testing-util</artifactId> <version>${hbase.version}</version> @@ -392,45 +397,6 @@ </dependency> </dependencies> </profile> - <profile> - <!-- We add a source directory specific to Scala 2.10 since Kafka - only works with it --> - <id>scala-2.10</id> - <activation> - <property><name>!scala-2.11</name></property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.spark</groupId> - <artifactId>spark-streaming-kafka_${scala.binary.version}</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-scala-sources</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>src/main/scala</source> - <source>scala-2.10/src/main/scala</source> - <source>scala-2.10/src/main/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> <!-- Profiles that disable inclusion of certain dependencies. --> <profile> |