Skip to content

Conversation

@slachiewicz
Copy link
Member

No description provided.

@dennisl
Copy link
Contributor

dennisl commented Apr 25, 2022

@slachiewicz Would you mind rebasing your branch to master, now that MWAR-444 and MWAR-450 has been merged. I don't trust myself to do that right now.

@dennisl
Copy link
Contributor

dennisl commented May 9, 2022

I have merged master into this branch to make sure that all the checks are green, which they are now. Do we need someone to review this PR?

@bmarwell
Copy link

@dennisl can you drop the commit which merges master into this branch and do a rebase instead please?

Copy link

@bmarwell bmarwell left a comment

Choose a reason for hiding this comment

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

Some open questions, but changes requested mainly due to merge commit.


// Ok now check that there is no more files/directories
final FileFilter filter = new FileFilterImpl( webAppDirectory, new String[] { MANIFEST_PATH } );
final FileFilter filter = new FileFilterImpl( webAppDirectory, new String[] {MANIFEST_PATH} );

Choose a reason for hiding this comment

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

That is not a Java 8 change.

Copy link
Member Author

Choose a reason for hiding this comment

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

To be reverted


// Ok now check that there is no more files/directories
final FileFilter filter = new FileFilterImpl( webAppDirectory, new String[] { MANIFEST_PATH } );
final FileFilter filter = new FileFilterImpl( webAppDirectory, new String[] {MANIFEST_PATH} );

Choose a reason for hiding this comment

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

That is not a Java 8 change.

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure


// Ok now check that there is no more files/directories
final FileFilter filter = new FileFilterImpl( webAppDirectory, new String[] { MANIFEST_PATH } );
final FileFilter filter = new FileFilterImpl( webAppDirectory, new String[] {MANIFEST_PATH} );

Choose a reason for hiding this comment

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

That is not a Java 8 change.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes

@bmarwell
Copy link

@olamy told me the merge commit will go away due to squashing anyway. Forget my previous comment about dropping and rebasing.

Copy link
Member

@michael-o michael-o left a comment

Choose a reason for hiding this comment

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

  • those from Captain Marvel

Copy link
Member

@michael-o michael-o left a comment

Choose a reason for hiding this comment

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

MANIFEST_PATH issue is still there.

@slachiewicz
Copy link
Member Author

Sorry, all changes was done from scratch and looks like Intellij automatically makes this changes

@slachiewicz slachiewicz merged commit c784a39 into master Jun 2, 2022
@slachiewicz slachiewicz deleted the MWAR-453 branch June 2, 2022 11:25
@jira-importer
Copy link

Resolve #525

1 similar comment
@jira-importer
Copy link

Resolve #525

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.

5 participants