Remove multi-project setup to avoid jdye64#6.

analytically · Oct 15, 2018 · 95dd987 · 95dd987
1 parent 495ede4
commit 95dd987
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 22 deletions.
diff --git a/Processors/nifi-salesforce/nifi-salesforce-api-nar/pom.xml b/Processors/nifi-salesforce/nifi-salesforce-api-nar/pom.xml
@@ -26,12 +26,7 @@
     <packaging>nar</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-standard-services-api-nar</artifactId>
-            <version>${nifi.version}</version>
-            <type>nar</type>
-        </dependency>
+
         <dependency>
             <groupId>com.github.jdye64</groupId>
             <artifactId>nifi-salesforce-api</artifactId>

diff --git a/Processors/nifi-salesforce/nifi-salesforce-processors/pom.xml b/Processors/nifi-salesforce/nifi-salesforce-processors/pom.xml
@@ -32,6 +32,13 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.nifi</groupId>
+            <artifactId>nifi-standard-services-api-nar</artifactId>
+            <version>${nifi.version}</version>
+            <type>nar</type>
+        </dependency>
+
         <dependency>
             <groupId>com.github.jdye64</groupId>
             <artifactId>nifi-salesforce-api</artifactId>

diff --git a/...rce/SalesforceUserPassAuthentication.java → ...rce/SalesforceUserPassAuthentication.java b/...rce/SalesforceUserPassAuthentication.java → ...rce/SalesforceUserPassAuthentication.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jeremydyer.nifi.salesforce;
+package com.jeremydyer.processors.salesforce;
 
 import org.apache.nifi.annotation.documentation.CapabilityDescription;
 import org.apache.nifi.annotation.documentation.Tags;

diff --git a/...esforceUserPassAuthenticationService.java → ...esforceUserPassAuthenticationService.java b/...esforceUserPassAuthenticationService.java → ...esforceUserPassAuthenticationService.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jeremydyer.nifi.salesforce;
+package com.jeremydyer.processors.salesforce;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;

diff --git a/.../main/java/com/jeremydyer/processors/salesforce/base/AbstractSalesforceRESTOperation.java b/.../main/java/com/jeremydyer/processors/salesforce/base/AbstractSalesforceRESTOperation.java
@@ -32,7 +32,7 @@
 import org.apache.nifi.processor.Relationship;
 import org.apache.nifi.processor.exception.ProcessException;
 
-import com.jeremydyer.nifi.salesforce.SalesforceUserPassAuthentication;
+import com.jeremydyer.processors.salesforce.SalesforceUserPassAuthentication;
 
 /**
  * Created by jdyer on 8/4/16.

diff --git a/.../jeremydyer/processors/salesforce/organization/SalesforceOrganizationLimitsProcessor.java b/.../jeremydyer/processors/salesforce/organization/SalesforceOrganizationLimitsProcessor.java
@@ -36,7 +36,7 @@
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.processor.io.OutputStreamCallback;
 
-import com.jeremydyer.nifi.salesforce.SalesforceUserPassAuthentication;
+import com.jeremydyer.processors.salesforce.SalesforceUserPassAuthentication;
 import com.jeremydyer.processors.salesforce.base.AbstractSalesforceRESTOperation;
 
 @Tags({"salesforce", "organization", "limits"})

diff --git a/...rs/src/main/java/com/jeremydyer/processors/salesforce/query/SalesforceQueryProcessor.java b/...rs/src/main/java/com/jeremydyer/processors/salesforce/query/SalesforceQueryProcessor.java
@@ -37,7 +37,7 @@
 import org.apache.nifi.processor.io.OutputStreamCallback;
 import org.apache.nifi.processor.util.StandardValidators;
 
-import com.jeremydyer.nifi.salesforce.SalesforceUserPassAuthentication;
+import com.jeremydyer.processors.salesforce.SalesforceUserPassAuthentication;
 import com.jeremydyer.processors.salesforce.base.AbstractSalesforceRESTOperation;
 
 @Tags({"salesforce", "soql", "sobject", "query"})

diff --git a/...s/src/main/java/com/jeremydyer/processors/salesforce/sobject/DescribeGlobalProcessor.java b/...s/src/main/java/com/jeremydyer/processors/salesforce/sobject/DescribeGlobalProcessor.java
@@ -37,7 +37,7 @@
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.processor.io.OutputStreamCallback;
 
-import com.jeremydyer.nifi.salesforce.SalesforceUserPassAuthentication;
+import com.jeremydyer.processors.salesforce.SalesforceUserPassAuthentication;
 import com.jeremydyer.processors.salesforce.base.AbstractSalesforceRESTOperation;
 
 @Tags({"salesforce", "describe", "sobject"})

diff --git a/...src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectBasicInfoProcessor.java b/...src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectBasicInfoProcessor.java
@@ -37,7 +37,7 @@
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.processor.io.OutputStreamCallback;
 
-import com.jeremydyer.nifi.salesforce.SalesforceUserPassAuthentication;
+import com.jeremydyer.processors.salesforce.SalesforceUserPassAuthentication;
 import com.jeremydyer.processors.salesforce.base.AbstractSalesforceRESTOperation;
 
 @Tags({"salesforce", "describe", "metadata", "basic", "info"})

diff --git a/.../src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectDescribeProcessor.java b/.../src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectDescribeProcessor.java
@@ -37,7 +37,7 @@
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.processor.io.OutputStreamCallback;
 
-import com.jeremydyer.nifi.salesforce.SalesforceUserPassAuthentication;
+import com.jeremydyer.processors.salesforce.SalesforceUserPassAuthentication;
 import com.jeremydyer.processors.salesforce.base.AbstractSalesforceRESTOperation;
 
 @Tags({"salesforce", "describe", "sobject"})

diff --git a/...rc/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectGetDeletedProcessor.java b/...rc/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectGetDeletedProcessor.java
@@ -38,7 +38,7 @@
 import org.apache.nifi.processor.io.OutputStreamCallback;
 import org.apache.nifi.processor.util.StandardValidators;
 
-import com.jeremydyer.nifi.salesforce.SalesforceUserPassAuthentication;
+import com.jeremydyer.processors.salesforce.SalesforceUserPassAuthentication;
 import com.jeremydyer.processors.salesforce.base.AbstractSalesforceRESTOperation;
 
 @Tags({"salesforce", "deleted", "sobject"})

diff --git a/...rc/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectGetUpdatedProcessor.java b/...rc/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectGetUpdatedProcessor.java
@@ -38,7 +38,7 @@
 import org.apache.nifi.processor.io.OutputStreamCallback;
 import org.apache.nifi.processor.util.StandardValidators;
 
-import com.jeremydyer.nifi.salesforce.SalesforceUserPassAuthentication;
+import com.jeremydyer.processors.salesforce.SalesforceUserPassAuthentication;
 import com.jeremydyer.processors.salesforce.base.AbstractSalesforceRESTOperation;
 
 @Tags({"salesforce", "updated", "sobject"})

diff --git a/...sors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectRowsProcessor.java b/...sors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectRowsProcessor.java
@@ -37,7 +37,7 @@
 import org.apache.nifi.processor.io.OutputStreamCallback;
 import org.apache.nifi.processor.util.StandardValidators;
 
-import com.jeremydyer.nifi.salesforce.SalesforceUserPassAuthentication;
+import com.jeremydyer.processors.salesforce.SalesforceUserPassAuthentication;
 import com.jeremydyer.processors.salesforce.base.AbstractSalesforceRESTOperation;
 
 @Tags({"salesforce", "rows", "sobject"})

diff --git a/....apache.nifi.controller.ControllerService → ....apache.nifi.controller.ControllerService b/....apache.nifi.controller.ControllerService → ....apache.nifi.controller.ControllerService
@@ -12,4 +12,4 @@
 # 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.
-com.jeremydyer.nifi.salesforce.SalesforceUserPassAuthenticationService
+com.jeremydyer.processors.salesforce.SalesforceUserPassAuthenticationService
diff --git a/Processors/nifi-salesforce/pom.xml b/Processors/nifi-salesforce/pom.xml
@@ -28,10 +28,6 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>nifi-salesforce-api</module>
-        <module>nifi-salesforce-api-nar</module>
-        <module>nifi-salesforce-controllerservice</module>
-        <module>nifi-salesforce-controllerservice-nar</module>
         <module>nifi-salesforce-processors</module>
         <module>nifi-salesforce-nar</module>
     </modules>