Github user david-streamlio commented on the issue:
https://github.com/apache/nifi/pull/2614
Abandoning this PR in favor of PR #2702
https://github.com/apache/nifi/pull/2702
---
Github user david-streamlio commented on the issue:
https://github.com/apache/nifi/pull/2614
I tend to agree with @joewitt on thisLet's start from a fresh master
and add in the new nifi-nar-bundleIt shouldn't be this hard to add in a
completely fresh bundle, as the files are
Github user joewitt commented on the issue:
https://github.com/apache/nifi/pull/2614
I would rework this thing personally so that it gets back to just the
commit(s) meant to be included. Like start fresh off latest master, apply the
actual changes intended, then end up with a single
Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2614
@joewitt I think if he were to rebase and drop [this
commit](https://github.com/apache/nifi/pull/2614/commits/99a980cc1e6bbb45e64fb3431545023eefb8522c)
it should fix that. What do you think?
Github user joewitt commented on the issue:
https://github.com/apache/nifi/pull/2614
@david-streamlio your PR appears to delete the nifi-grpc directory...You
will want to avoid doing that.
---
Github user david-streamlio commented on the issue:
https://github.com/apache/nifi/pull/2614
Followed all of the steps as you suggested. Performed a mvn -Pcontrib-check
clean install without errors.
Now we are failing CI due to missing content under the
Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2614
@david-streamlio Ok, I think I figured out what happened. At some point, it
looks like you accidentally did a pull on upstream master into your branch. The
fact that you keep having over 200
Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2614
Huh, I just checked out your latest branch and it's clean as a whistle WRT
rebasing and appears 100% up to date w/ the upstream master. So not sure what
the heck is going on here. Try doing a
Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2614
Ok, I'll take a look. Worst comes to worst, we cherry-pick the heck out of
your commits and play a game of hacky sack with Git and commits to get you back
on track.
---
Github user david-streamlio commented on the issue:
https://github.com/apache/nifi/pull/2614
Well, that didn't go as well as we had hoped.
---
Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2614
At that point, this should work now to clear things up hopefully:
`git push origin --force NIFI-4914`
---
Github user david-streamlio commented on the issue:
https://github.com/apache/nifi/pull/2614
Davids-MacBook-Pro:nifi david$ git rebase --continue
Applying: Changed artifact versions to 1.7.0-SNAPSHOT
Applying: Fixed issues identified during code review
Applying: Removed
Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2614
Bingo! That's what you should be seeing now. Fix the merge conflicts, `git
add` the files and continue (and repeat until it's done)
---
Github user david-streamlio commented on the issue:
https://github.com/apache/nifi/pull/2614
Davids-MacBook-Pro:nifi david$ git checkout NIFI-4914
Switched to branch 'NIFI-4914'
Your branch is up to date with 'origin/NIFI-4914'.
Davids-MacBook-Pro:nifi david$ git rebase
Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2614
Pretty sure we found the culprit:
> Davids-MacBook-Pro:nifi david$ git rebase
That should be `git rebase master`. Not sure what git thinks it's doing,
but it's clearly not doing
Github user david-streamlio commented on the issue:
https://github.com/apache/nifi/pull/2614
`Davids-MacBook-Pro:nifi david$ git rebase
First, rewinding head to replay your work on top of it...
Applying: NIFI-4289 - InfluxDB Put processor
Applying: NIFI-4827 Added support
Github user david-streamlio commented on the issue:
https://github.com/apache/nifi/pull/2614
`Davids-MacBook-Pro:nifi david$ git checkout NIFI-4914
Switched to branch 'NIFI-4914'
Your branch is up to date with 'origin/NIFI-4914'.
Davids-MacBook-Pro:nifi david$ git rebase
Github user david-streamlio commented on the issue:
https://github.com/apache/nifi/pull/2614
run the rebase against my 'master' branch or my 'NIFI-4914' branch?
---
Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2614
Also, run `git rebase --continue` on that branch and tell us what happens.
Copy and paste the output as "code" in the combox (code Markdown helper is the
<> button)
---
Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2614
I pulled your branch and got a lot of merge conflicts when I tried rebasing
against master. I am pretty sure that @mattyb149 is right or on the right
track. When you followed those four steps,
Github user david-streamlio commented on the issue:
https://github.com/apache/nifi/pull/2614
My latest commit passed all the tests, and is showing no conflicts with the
base branch. But you are seeing "an explosion of conflicts". So I am
confusedWhat steps do you need me to
Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2614
Yeah, I think @mattyb149 is right about that. I just pulled your branch
again, did a rebase against master and there was an explosion of conflicts.
Once you resolve those, you have to do `git
Github user mattyb149 commented on the issue:
https://github.com/apache/nifi/pull/2614
Probably needed a git rebase --continue instead...
---
Github user david-streamlio commented on the issue:
https://github.com/apache/nifi/pull/2614
Yea, I'm not sure what happened
First I did the following 4 steps you recommended:
As a rule of thumb, this is how you want to do this sort of update:
git checkout
Github user mattyb149 commented on the issue:
https://github.com/apache/nifi/pull/2614
Something is a bit wonky with this latest push, perhaps a bad merge?
---
Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2614
@david-streamlio don't feel rushed, I was just checking in to see if you
were still tracking this.
---
Github user david-streamlio commented on the issue:
https://github.com/apache/nifi/pull/2614
@MikeThomsen I will work on those changes now and have them completed
ASAPThanks for your patience
---
Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2614
@david-streamlio Haven't heard from you in almost 3 weeks. Have you had a
chance to work on any of the code review changes?
---
Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2614
When I added it to nifi-assembly, I got this error on startup:
```
java.util.ServiceConfigurationError: org.apache.nifi.processor.Processor:
Provider
Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2614
@david-streamlio I'm in the processor of working through a code review now.
In the mean time, I found that you did not add the NAR reference to
nifi-assembly/pom.xml. Can you correct that?
---
Github user joewitt commented on the issue:
https://github.com/apache/nifi/pull/2614
@pvillard31 thanks that makes a lot more sense to me now.
---
Github user pvillard31 commented on the issue:
https://github.com/apache/nifi/pull/2614
To provide more details here: after the release of 1.6.0 (with #2205), we
deprecated the use of ``expressionLanguageSupported(boolean)`` in favor of
Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2614
@joewitt something changed with the way expression language support is
declared in the `PropertyDescriptor.Builder`. TL;DR when you use the deprecated
`expressionLanguageSupported(boolean)`
Github user joewitt commented on the issue:
https://github.com/apache/nifi/pull/2614
@MikeThomsen just wanted to clarify the pointers here.. Did we break an
API that existing prior to 1.6 release that we should not have or was this a
newer thing being leveraged that just happened to
Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2614
@david-streamlio you brought in a whole lot of commits from other people
with that merge from upstream/master. I checked out your branch and did a
rebase on it (`git rebase master`) and that
Github user david-streamlio commented on the issue:
https://github.com/apache/nifi/pull/2614
I don't see an upstream branch labeled 1.6.0which upstream branch
should I merge into my local branch?
---
Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2614
I think it made it into "1.6.0-SNAPSHOT" after RC3 was cut. You have a
bunch of errors in there, but they look like this:
> [ERROR]
Github user david-streamlio commented on the issue:
https://github.com/apache/nifi/pull/2614
So, is this a change in the 1.7.x code base or is it already in the 1.6.0
code? I created my fork back on Feb 22nd based on the 1.6.0-SNAPSHOT branch,
which does not have these enums.
Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2614
> Failed to execute goal
org.apache.maven.plugins:maven-surefire-plugin:2.20.1:test (default-test) on
project nifi-pulsar-processors: There are test failures.
Related to how you set up
Github user david-streamlio commented on the issue:
https://github.com/apache/nifi/pull/2614
One single squashed commit, with both NIFI-4908 & NIFI-4914 changes in it.
---
40 matches
Mail list logo
