From 3224b1a5dd5d5652c16a85b72487d1179f954cfc Mon Sep 17 00:00:00 2001
From: Matt Burgess <mattyb149@apache.org>
Date: Thu, 25 Aug 2016 14:35:59 -0400
Subject: [PATCH] NIFI-2668: This closes #945. Replaced JSR-107 JCache API JAR
 w Geronimo version, updated notices

---
 nifi-assembly/NOTICE                                  |  8 ++++++++
 .../src/main/resources/META-INF/NOTICE                |  8 ++++++++
 .../nifi-ignite-bundle/nifi-ignite-processors/pom.xml | 11 +++++++++++
 3 files changed, 27 insertions(+)

diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index fa5a91347a..f5d54bae4d 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -837,6 +837,14 @@ The following binary components are provided under the Apache Software License v
         Licensed under Apache License, Version 2.0.
         http://search.maven.org/#artifactdetails%7Corg.jetbrains%7Cannotations%7C13.0%7Cjar
 
+    (ASLv2) Apache Geronimo JSR-107 JCache Spec API
+      The following NOTICE information applies:
+        Apache Geronimo JSR-107 JCache Spec API
+        Copyright 2009-2014 The Apache Software Foundation
+
+        This product includes software developed at
+        The Apache Software Foundation (http://www.apache.org/).
+
 (ASLv2) Carrotsearch HPPC
       The following NOTICE information applies:
       HPPC borrowed code, ideas or both from:
diff --git a/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-nar/src/main/resources/META-INF/NOTICE
index ae2c248c87..77ff340d4e 100644
--- a/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-nar/src/main/resources/META-INF/NOTICE
@@ -25,6 +25,14 @@ The following binary components are provided under the Apache Software License v
       Licensed under Apache License, Version 2.0.
       http://search.maven.org/#artifactdetails%7Corg.jetbrains%7Cannotations%7C13.0%7Cjar
 
+  (ASLv2) Apache Geronimo JSR-107 JCache Spec API
+        The following NOTICE information applies:
+          Apache Geronimo JSR-107 JCache Spec API
+          Copyright 2009-2014 The Apache Software Foundation
+
+          This product includes software developed at
+          The Apache Software Foundation (http://www.apache.org/).
+
   (ASLv2) Apache Commons IO
     The following NOTICE information applies:
       Apache Commons IO
diff --git a/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/pom.xml b/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/pom.xml
index 7f599fffc3..1a4698f4ca 100644
--- a/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/pom.xml
@@ -29,7 +29,18 @@
       <dependency>
            <groupId>org.apache.ignite</groupId>
            <artifactId>ignite-core</artifactId>
+          <exclusions>
+              <exclusion>
+                  <groupId>javax.cache</groupId>
+                  <artifactId>cache-api</artifactId>
+              </exclusion>
+          </exclusions>
        </dependency>
+        <dependency>
+           <groupId>org.apache.geronimo.specs</groupId>
+           <artifactId>geronimo-jcache_1.0_spec</artifactId>
+           <version>1.0-alpha-1</version>
+        </dependency>
        <dependency>
            <groupId>org.apache.ignite</groupId>
            <artifactId>ignite-log4j2</artifactId>