Skip to content

CAMEL-10540: Grok DataFormat#2948

Closed
bedlaj wants to merge 1 commit intoapache:masterfrom
bedlaj:CAMEL-10540
Closed

CAMEL-10540: Grok DataFormat#2948
bedlaj wants to merge 1 commit intoapache:masterfrom
bedlaj:CAMEL-10540

Conversation

@bedlaj
Copy link
Contributor

@bedlaj bedlaj commented May 27, 2019

Todos:

  • ascii documentation
  • javadocs and metadata
  • cleanup - Fix line endings, checkstyle sourcecheck, revert minor code changes (revert optimized imports,..), remove System.out logs
  • Add test for options: allowMultipleMatchesPerLine, flattened, namedOnly

Copy link
Contributor

@oscerd oscerd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll start the review tomorrow. Thanks

Copy link
Contributor

@onderson onderson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM except minor comments. Thanks for contribution

Copy link
Contributor

@oscerd oscerd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with the review by @onderson

@bedlaj bedlaj marked this pull request as ready for review May 29, 2019 02:14
@bedlaj
Copy link
Contributor Author

bedlaj commented May 29, 2019

I have one small update of javadoc and adoc. I will push it in few minutes.
//EDIT: Done and resolved conflicts with actual master.

@davsclaus
Copy link
Contributor

There is merge conflict now, and also you have some version number changes in parent/pom which goes backwards, please revert these.

@oscerd
Copy link
Contributor

oscerd commented May 31, 2019

@davsclaus do we want to bring this is for M3? I think it makes sense to wait for M3 RC and then merge this new Dataformat

@bedlaj
Copy link
Contributor Author

bedlaj commented May 31, 2019

I have merged actual master and fixed bad merge of parent/pom.xml

@davsclaus
Copy link
Contributor

davsclaus commented May 31, 2019

Okay can we resolve the merge conflict. We want to only merge if we can do it on top of master, eg "This branch cannot be rebased due to conflicts"

@bedlaj
Copy link
Contributor Author

bedlaj commented May 31, 2019

I have squashed the commits, now this should be able to rebase.

@davsclaus
Copy link
Contributor

I think this LGTM and we can get this merged

@oscerd
Copy link
Contributor

oscerd commented Jun 3, 2019

I'll merge this today

@oscerd
Copy link
Contributor

oscerd commented Jun 3, 2019

This has been merged on master, thanks a lot @bedlaj

@oscerd oscerd closed this Jun 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants