From 95dd9873623416db994bed96bbfe68df81713e73 Mon Sep 17 00:00:00 2001 From: Mathias Bogaert Date: Mon, 15 Oct 2018 15:24:47 +0200 Subject: [PATCH] Remove multi-project setup to avoid https://github.com/jdye64/nifi-addons/issues/6. --- Processors/nifi-salesforce/nifi-salesforce-api-nar/pom.xml | 7 +------ .../nifi-salesforce/nifi-salesforce-processors/pom.xml | 7 +++++++ .../salesforce/SalesforceUserPassAuthentication.java | 2 +- .../SalesforceUserPassAuthenticationService.java | 2 +- .../salesforce/base/AbstractSalesforceRESTOperation.java | 2 +- .../SalesforceOrganizationLimitsProcessor.java | 2 +- .../salesforce/query/SalesforceQueryProcessor.java | 2 +- .../salesforce/sobject/DescribeGlobalProcessor.java | 2 +- .../salesforce/sobject/SObjectBasicInfoProcessor.java | 2 +- .../salesforce/sobject/SObjectDescribeProcessor.java | 2 +- .../salesforce/sobject/SObjectGetDeletedProcessor.java | 2 +- .../salesforce/sobject/SObjectGetUpdatedProcessor.java | 2 +- .../salesforce/sobject/SObjectRowsProcessor.java | 2 +- .../services/org.apache.nifi.controller.ControllerService | 2 +- Processors/nifi-salesforce/pom.xml | 4 ---- 15 files changed, 20 insertions(+), 22 deletions(-) rename Processors/nifi-salesforce/{nifi-salesforce-api/src/main/java/com/jeremydyer/nifi => nifi-salesforce-processors/src/main/java/com/jeremydyer/processors}/salesforce/SalesforceUserPassAuthentication.java (96%) rename Processors/nifi-salesforce/{nifi-salesforce-controllerservice/src/main/java/com/jeremydyer/nifi => nifi-salesforce-processors/src/main/java/com/jeremydyer/processors}/salesforce/SalesforceUserPassAuthenticationService.java (99%) rename Processors/nifi-salesforce/{nifi-salesforce-controllerservice => nifi-salesforce-processors}/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService (91%) diff --git a/Processors/nifi-salesforce/nifi-salesforce-api-nar/pom.xml b/Processors/nifi-salesforce/nifi-salesforce-api-nar/pom.xml index 4610f4c..a324b8e 100644 --- a/Processors/nifi-salesforce/nifi-salesforce-api-nar/pom.xml +++ b/Processors/nifi-salesforce/nifi-salesforce-api-nar/pom.xml @@ -26,12 +26,7 @@ nar - - org.apache.nifi - nifi-standard-services-api-nar - ${nifi.version} - nar - + com.github.jdye64 nifi-salesforce-api diff --git a/Processors/nifi-salesforce/nifi-salesforce-processors/pom.xml b/Processors/nifi-salesforce/nifi-salesforce-processors/pom.xml index 5a4e787..7707eb4 100644 --- a/Processors/nifi-salesforce/nifi-salesforce-processors/pom.xml +++ b/Processors/nifi-salesforce/nifi-salesforce-processors/pom.xml @@ -32,6 +32,13 @@ + + org.apache.nifi + nifi-standard-services-api-nar + ${nifi.version} + nar + + com.github.jdye64 nifi-salesforce-api diff --git a/Processors/nifi-salesforce/nifi-salesforce-api/src/main/java/com/jeremydyer/nifi/salesforce/SalesforceUserPassAuthentication.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/SalesforceUserPassAuthentication.java similarity index 96% rename from Processors/nifi-salesforce/nifi-salesforce-api/src/main/java/com/jeremydyer/nifi/salesforce/SalesforceUserPassAuthentication.java rename to Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/SalesforceUserPassAuthentication.java index 8e84a3a..73a7b51 100644 --- a/Processors/nifi-salesforce/nifi-salesforce-api/src/main/java/com/jeremydyer/nifi/salesforce/SalesforceUserPassAuthentication.java +++ b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/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/Processors/nifi-salesforce/nifi-salesforce-controllerservice/src/main/java/com/jeremydyer/nifi/salesforce/SalesforceUserPassAuthenticationService.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/SalesforceUserPassAuthenticationService.java similarity index 99% rename from Processors/nifi-salesforce/nifi-salesforce-controllerservice/src/main/java/com/jeremydyer/nifi/salesforce/SalesforceUserPassAuthenticationService.java rename to Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/SalesforceUserPassAuthenticationService.java index f33197a..674531b 100644 --- a/Processors/nifi-salesforce/nifi-salesforce-controllerservice/src/main/java/com/jeremydyer/nifi/salesforce/SalesforceUserPassAuthenticationService.java +++ b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/SalesforceUserPassAuthenticationService.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/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/base/AbstractSalesforceRESTOperation.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/base/AbstractSalesforceRESTOperation.java index 1469c13..3eb5e75 100644 --- a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/base/AbstractSalesforceRESTOperation.java +++ b/Processors/nifi-salesforce/nifi-salesforce-processors/src/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/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/organization/SalesforceOrganizationLimitsProcessor.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/organization/SalesforceOrganizationLimitsProcessor.java index 2ba86a5..d0b4cf0 100644 --- a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/organization/SalesforceOrganizationLimitsProcessor.java +++ b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/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/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/query/SalesforceQueryProcessor.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/query/SalesforceQueryProcessor.java index 100e095..0d19e76 100644 --- a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/query/SalesforceQueryProcessor.java +++ b/Processors/nifi-salesforce/nifi-salesforce-processors/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/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/DescribeGlobalProcessor.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/DescribeGlobalProcessor.java index 369d166..c7b61f5 100644 --- a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/DescribeGlobalProcessor.java +++ b/Processors/nifi-salesforce/nifi-salesforce-processors/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/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectBasicInfoProcessor.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectBasicInfoProcessor.java index 4bb99c6..e526e80 100644 --- a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectBasicInfoProcessor.java +++ b/Processors/nifi-salesforce/nifi-salesforce-processors/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/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectDescribeProcessor.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectDescribeProcessor.java index 8d9123b..ce8ab4b 100644 --- a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectDescribeProcessor.java +++ b/Processors/nifi-salesforce/nifi-salesforce-processors/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/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectGetDeletedProcessor.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectGetDeletedProcessor.java index 7e2e0c9..c6a9507 100644 --- a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectGetDeletedProcessor.java +++ b/Processors/nifi-salesforce/nifi-salesforce-processors/src/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/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectGetUpdatedProcessor.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectGetUpdatedProcessor.java index 017d6ae..1d3f5c1 100644 --- a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectGetUpdatedProcessor.java +++ b/Processors/nifi-salesforce/nifi-salesforce-processors/src/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/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectRowsProcessor.java b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectRowsProcessor.java index 02b0fc4..a02af64 100644 --- a/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/java/com/jeremydyer/processors/salesforce/sobject/SObjectRowsProcessor.java +++ b/Processors/nifi-salesforce/nifi-salesforce-processors/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/Processors/nifi-salesforce/nifi-salesforce-controllerservice/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService similarity index 91% rename from Processors/nifi-salesforce/nifi-salesforce-controllerservice/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService rename to Processors/nifi-salesforce/nifi-salesforce-processors/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService index 9eb458e..fd03abe 100644 --- a/Processors/nifi-salesforce/nifi-salesforce-controllerservice/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService +++ b/Processors/nifi-salesforce/nifi-salesforce-processors/src/main/resources/META-INF/services/org.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 \ No newline at end of file +com.jeremydyer.processors.salesforce.SalesforceUserPassAuthenticationService \ No newline at end of file diff --git a/Processors/nifi-salesforce/pom.xml b/Processors/nifi-salesforce/pom.xml index 26332a9..e8aa99f 100644 --- a/Processors/nifi-salesforce/pom.xml +++ b/Processors/nifi-salesforce/pom.xml @@ -28,10 +28,6 @@ pom - nifi-salesforce-api - nifi-salesforce-api-nar - nifi-salesforce-controllerservice - nifi-salesforce-controllerservice-nar nifi-salesforce-processors nifi-salesforce-nar