Skip to content

Simplify jdtls pr#10984

Merged
tsmaeder merged 2 commits intoeclipse-che:5730_java_ls_pocfrom
tsmaeder:10983_simplify_jdtls_pr
Aug 29, 2018
Merged

Simplify jdtls pr#10984
tsmaeder merged 2 commits intoeclipse-che:5730_java_ls_pocfrom
tsmaeder:10983_simplify_jdtls_pr

Conversation

@tsmaeder
Copy link
Copy Markdown
Contributor

What does this PR do?

Removes some changes from the jdt.ls branch (mostly removals) to reduce the number of changes in the jdt.ls branch

What issues does this PR fix or reference?

#10983

Signed-off-by: Thomas Mäder <tmader@redhat.com>
Signed-off-by: Thomas Mäder <tmader@redhat.com>
@tsmaeder tsmaeder added status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. kind/task Internal things, technical debt, and to-do tasks to be performed. target/branch Indicates that a PR will be merged into a branch other than master. team/languages labels Aug 29, 2018
@tsmaeder tsmaeder requested a review from tolusha August 29, 2018 12:16
@@ -1,5 +1,5 @@
--
-- Copyright (c) 2012-2018 Red Hat, Inc.
-- Copyright (c) 2012-2017 Red Hat, Inc.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

it seems that there are some leftover 2017 dates on these sql files that should not have been changed

Copy link
Copy Markdown
Member

@sleshchenko sleshchenko Aug 29, 2018

Choose a reason for hiding this comment

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

@benoitf you're right. These changes must be excluded from this PR since flyway evaluates hash of content and uses it to ensure that the right migration scripts are applied.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

in fact it's ok I read too fast :-) Thomas is putting back the dates to avoid master changes. please ignore my remark

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

=) As well as my comment ) I saw that these sql files are modified and missed that this PR is not targetted to master branch =)
So, please mark this thread as resolved )

<exclude>**/*.txt</exclude>
<exclude>**/*.jpg</exclude>
<exclude>**/*.rsc</exclude>
<exclude>**/*.json</exclude>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

do we need all these excludes ? it seems this module doesn't contain all these kind of files

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This is all dead code!

Copy link
Copy Markdown
Contributor

@benoitf benoitf Aug 29, 2018

Choose a reason for hiding this comment

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

yes pls ignore my comment :-)

@tsmaeder tsmaeder merged commit db79e85 into eclipse-che:5730_java_ls_poc Aug 29, 2018
@benoitf benoitf removed the status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. label Aug 29, 2018
tolusha pushed a commit that referenced this pull request Sep 5, 2018
* Restore jdt ui dependencies
* Undo spurious copyright changes

Signed-off-by: Thomas Mäder <tmader@redhat.com>
tsmaeder added a commit that referenced this pull request Sep 13, 2018
* Restore jdt ui dependencies
* Undo spurious copyright changes

Signed-off-by: Thomas Mäder <tmader@redhat.com>
tsmaeder added a commit that referenced this pull request Sep 20, 2018
* Restore jdt ui dependencies
* Undo spurious copyright changes

Signed-off-by: Thomas Mäder <tmader@redhat.com>
tsmaeder added a commit that referenced this pull request Sep 26, 2018
* Restore jdt ui dependencies
* Undo spurious copyright changes

Signed-off-by: Thomas Mäder <tmader@redhat.com>
tsmaeder added a commit that referenced this pull request Oct 1, 2018
* Restore jdt ui dependencies
* Undo spurious copyright changes

Signed-off-by: Thomas Mäder <tmader@redhat.com>
tsmaeder added a commit that referenced this pull request Oct 5, 2018
* Restore jdt ui dependencies
* Undo spurious copyright changes

Signed-off-by: Thomas Mäder <tmader@redhat.com>
tsmaeder added a commit that referenced this pull request Oct 12, 2018
* Restore jdt ui dependencies
* Undo spurious copyright changes

Signed-off-by: Thomas Mäder <tmader@redhat.com>
tsmaeder added a commit that referenced this pull request Oct 16, 2018
* Restore jdt ui dependencies
* Undo spurious copyright changes

Signed-off-by: Thomas Mäder <tmader@redhat.com>
tsmaeder added a commit that referenced this pull request Oct 17, 2018
* Restore jdt ui dependencies
* Undo spurious copyright changes

Signed-off-by: Thomas Mäder <tmader@redhat.com>
tsmaeder added a commit that referenced this pull request Oct 17, 2018
* Restore jdt ui dependencies
* Undo spurious copyright changes

Signed-off-by: Thomas Mäder <tmader@redhat.com>
tsmaeder added a commit that referenced this pull request Oct 17, 2018
* Restore jdt ui dependencies
* Undo spurious copyright changes

Signed-off-by: Thomas Mäder <tmader@redhat.com>
tsmaeder added a commit that referenced this pull request Oct 17, 2018
* Restore jdt ui dependencies
* Undo spurious copyright changes

Signed-off-by: Thomas Mäder <tmader@redhat.com>
tsmaeder added a commit that referenced this pull request Oct 17, 2018
* Restore jdt ui dependencies
* Undo spurious copyright changes

Signed-off-by: Thomas Mäder <tmader@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/task Internal things, technical debt, and to-do tasks to be performed. target/branch Indicates that a PR will be merged into a branch other than master.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants