Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to Xtext 2.27.0 and Lsp4j 0.14.0 #1234

Merged
merged 14 commits into from
Jun 27, 2022
Merged

Upgrade to Xtext 2.27.0 and Lsp4j 0.14.0 #1234

merged 14 commits into from
Jun 27, 2022

Conversation

lhstrh
Copy link
Member

@lhstrh lhstrh commented Jun 15, 2022 •
edited
Loading

Upgrade xtext from 2.26.0 to 2.27.0, lsp4j to 0.14.0, and eclipse runtime to 3.25.0.

Some other version changed as well, which is the result of running bin/bump-versions --all, which apparently hadn't been done the last time version numbers were changed in gradle.properties.

petervdonovan
petervdonovan reviewed Jun 15, 2022
View reviewed changes
org.lflang.tests/META-INF/MANIFEST.MF Outdated
javax.annotation;bundle-version="1.2.0",
org.eclipse.core.jobs,
org.opentest4j;bundle-version="1.2.0",
org.eclipse.lsp4j;bundle-version="0.10.0"
org.eclipse.lsp4j;bundle-version="0.12.0"
Copy link
Collaborator

Choose a reason for hiding this comment

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

It's a little weird that the LSP4J version was lagging behind in the tests package. It makes me wonder if LSP4J is even needed in there.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, it's a little weird.

petervdonovan
petervdonovan approved these changes Jun 15, 2022
View reviewed changes
Copy link
Collaborator

@petervdonovan petervdonovan left a comment

Choose a reason for hiding this comment

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

I see nothing wrong with this as long as the tests pass.

@lhstrh lhstrh changed the title Bump Xtext, downgrade Eclipse runtime version Downgrade Eclipse runtime version to avert build problems caused by Maven Central Jun 15, 2022
lhstrh
lhstrh commented Jun 15, 2022
View reviewed changes
org.lflang.tests/META-INF/MANIFEST.MF Outdated Show resolved Hide resolved
org.lflang.ui.tests/META-INF/MANIFEST.MF Outdated Show resolved Hide resolved
@lhstrh
Apply suggestions from code review
d694b00 
Reverting changes made to `org.junit.jupiter.api`
@lhstrh lhstrh mentioned this pull request Jun 15, 2022
Closed
@lhstrh
Revert "Apply suggestions from code review " This reverts commit d694b00
284217a 
.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch version-updates
# Your branch is up to date with 'origin/version-updates'.
#
# Changes to be committed:
#	modified:   org.lflang.tests/META-INF/MANIFEST.MF
#	modified:   org.lflang.ui.tests/META-INF/MANIFEST.MF
#
# Untracked files:
#	RELEASE.md
#	build_upload/
#	bump.sh
#	hs_err_pid24495.log
#	hs_err_pid37983.log
#	junk/
#	lfc_0.2.0-SNAPSHOT/
#	lfc_0.2.0/
#	lfc_nightly_20220202-230344/
#	lfc_nightly_20220502-232308/
#	lfc_nightly_20220502-232420/
#	org.lflang/src/org/lflang/federated/ProxyEmitter.java
#	test/C/fed-gen/
#
@lhstrh
Revert "Downgrading Xtext again because 2.27.0 cannot be found on Mav…
0960073 
…en Central"

This reverts commit ec0012f.
@lhstrh lhstrh changed the title Downgrade Eclipse runtime version to avert build problems caused by Maven Central Upgrade to Xtext 2.27.0 Jun 17, 2022
@lhstrh
Copy link
Member Author

lhstrh commented Jun 17, 2022

It's unclear to me why Maven/Tycho cannot find org.eclipse.xtext.xbase.lib. It appears to be published here:

https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0/features/

@lhstrh lhstrh changed the title Upgrade to Xtext 2.27.0 Upgrade to Xtext 2.27.0 and Lsp4j 0.14.0 Jun 17, 2022
@lhstrh
Copy link
Member Author

lhstrh commented Jun 17, 2022 •
edited
Loading

It's unclear to me why Maven/Tycho cannot find org.eclipse.xtext.xbase.lib. It appears to be published here:

https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0/features/

@a-sr: help? 😨

@a-sr
Copy link
Collaborator

a-sr commented Jun 21, 2022

Sorry for my late reply. I must have missed the GH notification.
The problem is that increasing version numbers in the pom is not sufficient for the maven tycho build. You need to adjust the update side in the target platform definition as well, if you switch to a newer Eclipse or Xtext version (same as in #1021). Otherwise the dependencies cannot be resolved in the Epoch build.
I pushed a fix for that and also updated the oomph setup.

@a-sr
Copy link
Collaborator

a-sr commented Jun 21, 2022 •
edited
Loading

I had to downgrade the junit.jupiter dependency to 5.8.1 because 5.8.2 is not available via the eclipse update site. The version of the mwe launcher also needed adjustment because the latest Eclipse release only provides a newer version.

I added a few comments to the pom file that point out that the update sites in the target platform must be adjusted when changing versions.

@lhstrh
Copy link
Member Author

lhstrh commented Jun 24, 2022

Thanks for these changes (and the clarifying comments), @a-sr!

@lhstrh lhstrh merged commit 3a1f550 into master Jun 27, 2022
@lhstrh lhstrh deleted the version-updates branch June 27, 2022 19:23
@petervdonovan petervdonovan mentioned this pull request Jun 29, 2022
Closed
@lhstrh lhstrh added the upgrade label Jul 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petervdonovan petervdonovan petervdonovan approved these changes

Assignees
No one assigned
Labels
upgrade
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lhstrh @a-sr @petervdonovan