[
https://issues.apache.org/jira/browse/NIFI-1225?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15029352#comment-15029352
]
Joe Skora commented on NIFI-1225:
---------------------------------
Starting from new git master checkout, I get several trailing whitespace errors
applying NIFI-1225-000.patch.
Then trying to apply NIFI-1225-001.patch I get "error: ... does not apply" for
the pom and Java files.
What am I doing something wrong?
{code}
jskora@herman ~/nifi/apache-nifi-1225 (master)
$ git rebase origin/master
Current branch master is up to date.
jskora@herman ~/nifi/apache-nifi-1225 (master)
$ git apply NIFI-1225.000.patch
NIFI-1225.000.patch:38: trailing whitespace.
import javax.net.ssl.SSLContext;
NIFI-1225.000.patch:39: trailing whitespace.
NIFI-1225.000.patch:40: trailing whitespace.
import org.apache.commons.lang3.StringUtils;
NIFI-1225.000.patch:48: trailing whitespace.
import org.apache.nifi.ssl.SSLContextService;
NIFI-1225.000.patch:56: trailing whitespace.
import com.amazonaws.http.conn.ssl.SdkTLSSocketFactory;
warning: squelched 73 whitespace errors
warning: 78 lines add whitespace errors.
jskora@herman ~/nifi/apache-nifi-1225 (master *)
$ git apply NIFI-1225.001.patch
NIFI-1225.001.patch:38: trailing whitespace.
import javax.net.ssl.SSLContext;
NIFI-1225.001.patch:39: trailing whitespace.
NIFI-1225.001.patch:40: trailing whitespace.
import org.apache.commons.lang3.StringUtils;
NIFI-1225.001.patch:48: trailing whitespace.
import org.apache.nifi.ssl.SSLContextService;
NIFI-1225.001.patch:56: trailing whitespace.
import com.amazonaws.http.conn.ssl.SdkTLSSocketFactory;
error: patch failed:
nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml:50
error: nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml: patch does
not apply
error: patch failed:
nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSProcessor.java:27
error:
nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSProcessor.java:
patch does not apply
error: patch failed:
nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java:40
error:
nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java:
patch does not apply
error: patch failed:
nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java:46
error:
nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java:
patch does not apply
error: patch failed:
nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java:47
error:
nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java:
patch does not apply
jskora@herman ~/nifi/apache-nifi-1225 (master *)
$
{code}
> Add support for SSL context and alternate endpoints for PutS3
> --------------------------------------------------------------
>
> Key: NIFI-1225
> URL: https://issues.apache.org/jira/browse/NIFI-1225
> Project: Apache NiFi
> Issue Type: Improvement
> Components: Extensions
> Reporter: Tony Kurc
> Assignee: Tony Kurc
> Priority: Minor
> Fix For: 0.4.0
>
> Attachments: NIFI-1225.000.patch, NIFI-1225.001.patch,
> NIFI-1225.002.patch, S3_Put_Fetch_Delete.xml
>
>
> NIFI-1107 added this as well as multipart puts, but is not ready. Going to
> split out the code for SSL context and alternate endpoint.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
