Repository: nifi Updated Branches: refs/heads/master f22db218e -> 54670486b
NIFI-1519 upgraded to the latest version of Spark 1.6.0 Signed-off-by: Matt Burgess <mattyb...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/3f295b13 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/3f295b13 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/3f295b13 Branch: refs/heads/master Commit: 3f295b13c97d77811477f9d19480b02003209529 Parents: f22db21 Author: Oleg Zhurakousky <o...@suitcase.io> Authored: Wed Feb 17 10:29:24 2016 -0500 Committer: Matt Burgess <mattyb...@gmail.com> Committed: Tue Mar 15 10:03:32 2016 -0400 ---------------------------------------------------------------------- nifi-external/nifi-spark-receiver/pom.xml | 73 ++++++++++++++------------ pom.xml | 2 +- 2 files changed, 41 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/3f295b13/nifi-external/nifi-spark-receiver/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-external/nifi-spark-receiver/pom.xml b/nifi-external/nifi-spark-receiver/pom.xml index 265901f..8515446 100644 --- a/nifi-external/nifi-spark-receiver/pom.xml +++ b/nifi-external/nifi-spark-receiver/pom.xml @@ -1,36 +1,43 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-external</artifactId> - <version>0.6.0-SNAPSHOT</version> - </parent> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-spark-receiver</artifactId> +<!-- 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. --> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-external</artifactId> + <version>0.6.0-SNAPSHOT</version> + </parent> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-spark-receiver</artifactId> - <dependencies> - <dependency> - <groupId>org.apache.spark</groupId> - <artifactId>spark-streaming_2.10</artifactId> - </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-site-to-site-client</artifactId> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-streaming_2.10</artifactId> + </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-site-to-site-client</artifactId> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-server</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>2.4.4</version> + </dependency> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/nifi/blob/3f295b13/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7616770..15fe0cb 100644 --- a/pom.xml +++ b/pom.xml @@ -753,7 +753,7 @@ language governing permissions and limitations under the License. --> <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-streaming_2.10</artifactId> - <version>1.3.1</version> + <version>1.6.0</version> </dependency> <dependency> <groupId>org.apache.zookeeper</groupId>
