You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by trixpan <gi...@git.apache.org> on 2017/04/26 13:50:08 UTC
[GitHub] nifi pull request #1696: NIFI-1655 - Add .gitattributes to specifically defi...
GitHub user trixpan opened a pull request:
https://github.com/apache/nifi/pull/1696
NIFI-1655 - Add .gitattributes to specifically define
the line ending format of particular file type (i.e. .java = LF, .bat=CRLF)
Thank you for submitting a contribution to Apache NiFi.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
### For all changes:
- [X] Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
- [X] Does your PR title start with NIFI-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
- [X] Has your PR been rebased against the latest commit within the target branch (typically master)?
- [X] Is your initial contribution a single, squashed commit?
### For code changes:
- [X] Have you ensured that the full suite of tests is executed via mvn -Pcontrib-check clean install at the root nifi folder?
- [X] ~~~Have you written or updated unit tests to verify your changes?~~~
- [X] ~~~If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?~~~
- [X] ~~~If applicable, have you updated the LICENSE file, including the main LICENSE file under nifi-assembly?~~~
- [X] ~~~If applicable, have you updated the NOTICE file, including the main NOTICE file found under nifi-assembly?~~~
- [X] ~~~If adding new Properties, have you added .displayName in addition to .name (programmatic access) for each of the new properties?~~~
### For documentation related changes:
- [X] ~~~Have you ensured that format looks appropriate for the output in which it is rendered?~~~
### Note:
Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/trixpan/nifi NIFI-1655
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/nifi/pull/1696.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1696
----
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi issue #1696: NIFI-1655 - Add .gitattributes to specifically define
Posted by trixpan <gi...@git.apache.org>.
Github user trixpan commented on the issue:
https://github.com/apache/nifi/pull/1696
@jfrazee I resolved conflict with master (unrelated to the change).
I would agree that the "text" qualifier was indeed missing. Fixed.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi issue #1696: NIFI-1655 - Add .gitattributes to specifically define
Posted by trixpan <gi...@git.apache.org>.
Github user trixpan commented on the issue:
https://github.com/apache/nifi/pull/1696
@joewitt - When doing this change I noticed some changes to HL7 files and looking online it seems like HL7 uses CR as a "segment separator".
Would you mind if I renamed the relevant files with extension .hl7 (which seems to be accepted as a de-facto HL7 file extension) and exclude them accordingly?
Cheers
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi issue #1696: NIFI-1655 - Add .gitattributes to specifically define
Posted by trixpan <gi...@git.apache.org>.
Github user trixpan commented on the issue:
https://github.com/apache/nifi/pull/1696
@jfrazee while we are doing HL7 is there any chance you can look at the EncryptContent tests as well?
Due to the nature of PGP ASCII Armor files they use a mix of DOS and Unix line format as well.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi issue #1696: NIFI-1655 - Add .gitattributes to specifically define
Posted by trixpan <gi...@git.apache.org>.
Github user trixpan commented on the issue:
https://github.com/apache/nifi/pull/1696
@joewitt as suspected HL7 does inded use CR as a segment separator so I renamed the files to hl7 and treated hl7 as binary. Tests passed locally and I am now checking what travis has to say
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi issue #1696: NIFI-1655 - Add .gitattributes to specifically define
Posted by jfrazee <gi...@git.apache.org>.
Github user jfrazee commented on the issue:
https://github.com/apache/nifi/pull/1696
@trixpan I think there's a mistake in the last line of .gitattributes. It is missing the 'text' qualifier and just is the file pattern and then eol. Let me know if I've misunderstood; otherwise I'll +1 and I can fix it during the merge.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi issue #1696: NIFI-1655 - Add .gitattributes to specifically define
Posted by trixpan <gi...@git.apache.org>.
Github user trixpan commented on the issue:
https://github.com/apache/nifi/pull/1696
@jfrazee now that HL7 is out of the way, giving it another try... Will let you know when I am happy with code.
Cheers
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi issue #1696: NIFI-1655 - Add .gitattributes to specifically define
Posted by trixpan <gi...@git.apache.org>.
Github user trixpan commented on the issue:
https://github.com/apache/nifi/pull/1696
@jfrazee this seems to be passing tests now. Let me know what you think
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi issue #1696: NIFI-1655 - Add .gitattributes to specifically define
Posted by jfrazee <gi...@git.apache.org>.
Github user jfrazee commented on the issue:
https://github.com/apache/nifi/pull/1696
@trixpan You're right about the HL7 and it's actually ill-formed if you don't use CR, crazy. For best results, though, we should just move the HL7 content into a String in the test class. Renaming/dealing in git is okayish, but I think sets us up to have pain here and there. I opened [NIFI-3771](https://issues.apache.org/jira/browse/NIFI-3771) to address.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi issue #1696: NIFI-1655 - Add .gitattributes to specifically define
Posted by mattyb149 <gi...@git.apache.org>.
Github user mattyb149 commented on the issue:
https://github.com/apache/nifi/pull/1696
Travis no likey :( Looks like some test files related to decompression were created when the line endings were CRLF, they would have to be recreated as well.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi issue #1696: NIFI-1655 - Add .gitattributes to specifically define
Posted by trixpan <gi...@git.apache.org>.
Github user trixpan commented on the issue:
https://github.com/apache/nifi/pull/1696
@jfrazee?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi issue #1696: NIFI-1655 - Add .gitattributes to specifically define
Posted by jfrazee <gi...@git.apache.org>.
Github user jfrazee commented on the issue:
https://github.com/apache/nifi/pull/1696
@trixpan Do you know which files are problematic? I'm assuming the *.txt; i.e., the content that's being encrypted. I'd figure it wouldn't matter for the *.asc and *.pgp.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---