From b7e1f48133b721f0da8410fd19a366b3e7b0d6dd Mon Sep 17 00:00:00 2001
From: Bryan Bende <bbende@apache.org>
Date: Mon, 2 Apr 2018 11:11:01 -0400
Subject: [PATCH] NIFI-5035 Moving MongoDB services out of standard services

Signed-off-by: Matthew Burgess <mattyb149@apache.org>

This closes #2599
---
 nifi-assembly/pom.xml                         |  6 +++
 .../pom.xml                                   | 42 +++++++++++++++++++
 .../nifi-mongodb-client-service-api/pom.xml   |  4 +-
 .../nifi/mongodb/MongoDBClientService.java    |  0
 .../nifi-mongodb-nar/pom.xml                  |  2 +-
 .../nifi-mongodb-processors/pom.xml           |  2 +-
 .../nifi-mongodb-services-nar/pom.xml         |  4 +-
 .../src/main/resources/META-INF/NOTICE        |  0
 .../nifi-mongodb-services/pom.xml             | 25 ++++++-----
 .../AbstractMongoDBControllerService.java     |  0
 .../mongodb/MongoDBControllerService.java     |  0
 .../nifi/mongodb/MongoDBLookupService.java    |  0
 .../org/apache/nifi/mongodb/Validation.java   |  0
 ...g.apache.nifi.controller.ControllerService |  0
 .../mongodb/MongoDBControllerServiceIT.java   |  0
 .../nifi/mongodb/MongoDBLookupServiceIT.java  |  0
 .../TestControllerServiceProcessor.java       |  0
 .../mongodb/TestLookupServiceProcessor.java   |  0
 nifi-nar-bundles/nifi-mongodb-bundle/pom.xml  | 10 ++++-
 .../nifi-mongodb-services-bundle/pom.xml      | 28 -------------
 .../nifi-standard-services-api-nar/pom.xml    |  5 ---
 .../nifi-standard-services/pom.xml            |  2 -
 22 files changed, 77 insertions(+), 53 deletions(-)
 create mode 100644 nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-client-service-api-nar/pom.xml
 rename nifi-nar-bundles/{nifi-standard-services => nifi-mongodb-bundle}/nifi-mongodb-client-service-api/pom.xml (94%)
 rename nifi-nar-bundles/{nifi-standard-services => nifi-mongodb-bundle}/nifi-mongodb-client-service-api/src/main/java/org/apache/nifi/mongodb/MongoDBClientService.java (100%)
 rename nifi-nar-bundles/{nifi-standard-services/nifi-mongodb-services-bundle => nifi-mongodb-bundle}/nifi-mongodb-services-nar/pom.xml (92%)
 rename nifi-nar-bundles/{nifi-standard-services/nifi-mongodb-services-bundle => nifi-mongodb-bundle}/nifi-mongodb-services-nar/src/main/resources/META-INF/NOTICE (100%)
 rename nifi-nar-bundles/{nifi-standard-services/nifi-mongodb-services-bundle => nifi-mongodb-bundle}/nifi-mongodb-services/pom.xml (94%)
 rename nifi-nar-bundles/{nifi-standard-services/nifi-mongodb-services-bundle => nifi-mongodb-bundle}/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/AbstractMongoDBControllerService.java (100%)
 rename nifi-nar-bundles/{nifi-standard-services/nifi-mongodb-services-bundle => nifi-mongodb-bundle}/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/MongoDBControllerService.java (100%)
 rename nifi-nar-bundles/{nifi-standard-services/nifi-mongodb-services-bundle => nifi-mongodb-bundle}/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/MongoDBLookupService.java (100%)
 rename nifi-nar-bundles/{nifi-standard-services/nifi-mongodb-services-bundle => nifi-mongodb-bundle}/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/Validation.java (100%)
 rename nifi-nar-bundles/{nifi-standard-services/nifi-mongodb-services-bundle => nifi-mongodb-bundle}/nifi-mongodb-services/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService (100%)
 rename nifi-nar-bundles/{nifi-standard-services/nifi-mongodb-services-bundle => nifi-mongodb-bundle}/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBControllerServiceIT.java (100%)
 rename nifi-nar-bundles/{nifi-standard-services/nifi-mongodb-services-bundle => nifi-mongodb-bundle}/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBLookupServiceIT.java (100%)
 rename nifi-nar-bundles/{nifi-standard-services/nifi-mongodb-services-bundle => nifi-mongodb-bundle}/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/TestControllerServiceProcessor.java (100%)
 rename nifi-nar-bundles/{nifi-standard-services/nifi-mongodb-services-bundle => nifi-mongodb-bundle}/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/TestLookupServiceProcessor.java (100%)
 delete mode 100644 nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/pom.xml

diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 7bf880d903..df380276cb 100755
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -289,6 +289,12 @@ language governing permissions and limitations under the License. -->
             <version>1.6.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
+	<dependency>
+            <groupId>org.apache.nifi</groupId>
+            <artifactId>nifi-mongodb-client-service-api-nar</artifactId>
+            <version>1.6.0-SNAPSHOT</version>
+            <type>nar</type>
+        </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mongodb-nar</artifactId>
diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-client-service-api-nar/pom.xml b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-client-service-api-nar/pom.xml
new file mode 100644
index 0000000000..c2fb2b3ebc
--- /dev/null
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-client-service-api-nar/pom.xml
@@ -0,0 +1,42 @@
+<?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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.nifi</groupId>
+        <artifactId>nifi-mongodb-bundle</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>nifi-mongodb-client-service-api-nar</artifactId>
+    <packaging>nar</packaging>
+
+    <dependencies>
+	    <dependency>
+            <groupId>org.apache.nifi</groupId>
+            <artifactId>nifi-standard-services-api-nar</artifactId>
+            <version>1.6.0-SNAPSHOT</version>
+	        <type>nar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.nifi</groupId>
+            <artifactId>nifi-mongodb-client-service-api</artifactId>
+	        <version>1.6.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-mongodb-client-service-api/pom.xml b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-client-service-api/pom.xml
similarity index 94%
rename from nifi-nar-bundles/nifi-standard-services/nifi-mongodb-client-service-api/pom.xml
rename to nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-client-service-api/pom.xml
index 33a72243df..1b24a4a689 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-mongodb-client-service-api/pom.xml
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-client-service-api/pom.xml
@@ -18,7 +18,7 @@
 
     <parent>
         <groupId>org.apache.nifi</groupId>
-        <artifactId>nifi-standard-services</artifactId>
+        <artifactId>nifi-mongodb-bundle</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
 
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>mongo-java-driver</artifactId>
-            <version>3.2.2</version>
+            <version>${mongo.driver.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-mongodb-client-service-api/src/main/java/org/apache/nifi/mongodb/MongoDBClientService.java b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-client-service-api/src/main/java/org/apache/nifi/mongodb/MongoDBClientService.java
similarity index 100%
rename from nifi-nar-bundles/nifi-standard-services/nifi-mongodb-client-service-api/src/main/java/org/apache/nifi/mongodb/MongoDBClientService.java
rename to nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-client-service-api/src/main/java/org/apache/nifi/mongodb/MongoDBClientService.java
diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-nar/pom.xml b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-nar/pom.xml
index 76f65d6d5c..a2c14f0041 100644
--- a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-nar/pom.xml
@@ -32,7 +32,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-standard-services-api-nar</artifactId>
+            <artifactId>nifi-mongodb-client-service-api-nar</artifactId>
             <version>1.6.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/pom.xml b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/pom.xml
index df0451e5fc..ff5b245f73 100644
--- a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>mongo-java-driver</artifactId>
-            <version>3.2.2</version>
+            <version>${mongo.driver.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services-nar/pom.xml b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services-nar/pom.xml
similarity index 92%
rename from nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services-nar/pom.xml
rename to nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services-nar/pom.xml
index 881b40fbed..a581e1df9c 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services-nar/pom.xml
@@ -16,7 +16,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.nifi</groupId>
-        <artifactId>nifi-mongodb-services-bundle</artifactId>
+        <artifactId>nifi-mongodb-bundle</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-mongodb-services-nar</artifactId>
@@ -24,7 +24,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-standard-services-api-nar</artifactId>
+            <artifactId>nifi-mongodb-client-service-api-nar</artifactId>
             <version>1.6.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services-nar/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services-nar/src/main/resources/META-INF/NOTICE
rename to nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services-nar/src/main/resources/META-INF/NOTICE
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/pom.xml b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/pom.xml
similarity index 94%
rename from nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/pom.xml
rename to nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/pom.xml
index a26e1d799b..6c6de4c1fc 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/pom.xml
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/pom.xml
@@ -12,7 +12,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.nifi</groupId>
-        <artifactId>nifi-mongodb-services-bundle</artifactId>
+        <artifactId>nifi-mongodb-bundle</artifactId>
         <version>1.6.0-SNAPSHOT</version>
     </parent>
     <artifactId>nifi-mongodb-services</artifactId>
@@ -31,6 +31,17 @@
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-lookup-service-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.nifi</groupId>
+            <artifactId>nifi-mongodb-client-service-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.nifi</groupId>
+            <artifactId>nifi-ssl-context-service-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -41,10 +52,6 @@
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-record</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-mongodb-client-service-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -53,7 +60,7 @@
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>mongo-java-driver</artifactId>
-            <version>3.2.2</version>
+            <version>${mongo.driver.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -71,11 +78,7 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-ssl-context-service-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/AbstractMongoDBControllerService.java b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/AbstractMongoDBControllerService.java
similarity index 100%
rename from nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/AbstractMongoDBControllerService.java
rename to nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/AbstractMongoDBControllerService.java
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/MongoDBControllerService.java b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/MongoDBControllerService.java
similarity index 100%
rename from nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/MongoDBControllerService.java
rename to nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/MongoDBControllerService.java
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/MongoDBLookupService.java b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/MongoDBLookupService.java
similarity index 100%
rename from nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/MongoDBLookupService.java
rename to nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/MongoDBLookupService.java
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/Validation.java b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/Validation.java
similarity index 100%
rename from nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/Validation.java
rename to nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/Validation.java
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService
similarity index 100%
rename from nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService
rename to nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBControllerServiceIT.java b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBControllerServiceIT.java
similarity index 100%
rename from nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBControllerServiceIT.java
rename to nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBControllerServiceIT.java
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBLookupServiceIT.java b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBLookupServiceIT.java
similarity index 100%
rename from nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBLookupServiceIT.java
rename to nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBLookupServiceIT.java
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/TestControllerServiceProcessor.java b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/TestControllerServiceProcessor.java
similarity index 100%
rename from nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/TestControllerServiceProcessor.java
rename to nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/TestControllerServiceProcessor.java
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/TestLookupServiceProcessor.java b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/TestLookupServiceProcessor.java
similarity index 100%
rename from nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/TestLookupServiceProcessor.java
rename to nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/TestLookupServiceProcessor.java
diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml b/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml
index 3e3f4c665b..ecc637874f 100644
--- a/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml
@@ -26,10 +26,18 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>nifi-mongodb-processors</module>
+	    <module>nifi-mongodb-client-service-api</module>
+        <module>nifi-mongodb-client-service-api-nar</module>
+        <module>nifi-mongodb-services</module>
+        <module>nifi-mongodb-services-nar</module>
+	    <module>nifi-mongodb-processors</module>
         <module>nifi-mongodb-nar</module>
     </modules>
 
+    <properties>
+        <mongo.driver.version>3.2.2</mongo.driver.version>
+    </properties>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/pom.xml
deleted file mode 100644
index 330bd06a5c..0000000000
--- a/nifi-nar-bundles/nifi-standard-services/nifi-mongodb-services-bundle/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<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">
-    <!--
-      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.
-    -->
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.nifi</groupId>
-        <artifactId>nifi-standard-services</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>nifi-mongodb-services-bundle</artifactId>
-    <packaging>pom</packaging>
-    <modules>
-        <module>nifi-mongodb-services</module>
-        <module>nifi-mongodb-services-nar</module>
-    </modules>
-</project>
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
index ab5714de49..00f3d46028 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
@@ -52,11 +52,6 @@
             <version>1.6.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-mongodb-client-service-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hbase-client-service-api</artifactId>
diff --git a/nifi-nar-bundles/nifi-standard-services/pom.xml b/nifi-nar-bundles/nifi-standard-services/pom.xml
index fb6c4d5238..2c50df3889 100644
--- a/nifi-nar-bundles/nifi-standard-services/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-services/pom.xml
@@ -41,8 +41,6 @@
         <module>nifi-record-serialization-service-api</module>
         <module>nifi-record-serialization-services-bundle</module>
         <module>nifi-hwx-schema-registry-bundle</module>
-        <module>nifi-mongodb-client-service-api</module>
-        <module>nifi-mongodb-services-bundle</module>
         <module>nifi-kerberos-credentials-service-api</module>
         <module>nifi-kerberos-credentials-service-bundle</module>
     </modules>