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.

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

Rename master > main #1919

Merged
merged 1 commit into from
Feb 6, 2025
Merged

Rename master > main #1919

merged 1 commit into from
Feb 6, 2025

Conversation

laeubi
Copy link
Member

@laeubi laeubi commented Jan 29, 2025

No description provided.

@laeubi
Copy link
Member Author

laeubi commented Jan 29, 2025

@HannesWell @merks can you probabbly look at the setup files if I did adjusted them correctly?

Copy link

github-actions bot commented Jan 29, 2025

Test Results

  321 files    321 suites   52m 41s ⏱️
  680 tests   659 ✅ 20 💤 0 ❌ 1 🔥
2 040 runs  1 979 ✅ 60 💤 0 ❌ 1 🔥

For more details on these errors, see this check.

Results for commit 4050a39.

♻️ This comment has been updated with latest results.

@merks
Copy link
Contributor

merks commented Jan 29, 2025

Looks ok. It will effectively disable the project setup reference in existing workspace.setup, i.e., existing installations will no longer see or use the project setup.

@laeubi laeubi force-pushed the master_to_main branch 2 times, most recently from d9e4cca to 70d4883 Compare January 29, 2025 08:52
@merks
Copy link
Contributor

merks commented Jan 29, 2025

If you want to fix and existing installation after this is committed, you can use Navigate -> Open Setup -> Workspace, use Open in Text Editor on the context menu, change master to main, and save:

image

@laeubi laeubi force-pushed the master_to_main branch 4 times, most recently from 581f192 to ac10392 Compare February 1, 2025 07:15
@laeubi
Copy link
Member Author

laeubi commented Feb 1, 2025

@HannesWell it seems that changing the markdown file generates a version bump, I tried to fix that for the future but the configuration looks odd, it tells it wants pom.xml changes (but why?!?) and disables all jgit ignores... confusing.

Another way would maybe to just move the markdown to the root...

Copy link
Contributor

@HannesWell HannesWell left a comment

Choose a reason for hiding this comment

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

@HannesWell it seems that changing the markdown file generates a version bump, I tried to fix that for the future but the configuration looks odd, it tells it wants pom.xml changes (but why?!?) and disables all jgit ignores... confusing.

In case of the lemminx-bundle the inclusion is of the embedded lemminx jar is driven by the pom.xml file. And in case the lemminx version is changed in this pom we want to have a an updated qualifier.
However I don't see in the parent (anymore) that pom.xml files are generally excluded. Maybe that's from the past.

org.eclipse.m2e.feature/feature.xml Show resolved Hide resolved
org.eclipse.m2e.editor.lemminx/pom.xml Outdated Show resolved Hide resolved
@laeubi
Copy link
Member Author

laeubi commented Feb 1, 2025

In case of the lemminx-bundle the inclusion is of the embedded lemminx jar is driven by the pom.xml file.

But should not the embedded jar itself already make a difference?

Signed-off-by: Christoph Läubrich <[email protected]>
@laeubi laeubi merged commit 334d2ae into eclipse-m2e:main Feb 6, 2025
7 of 8 checks passed
@laeubi
Copy link
Member Author

laeubi commented Feb 6, 2025

Further refinements can better be made in separate PRs.

merks added a commit to eclipse-oomph/oomph that referenced this pull request Feb 6, 2025
@HannesWell
Copy link
Contributor

In case of the lemminx-bundle the inclusion is of the embedded lemminx jar is driven by the pom.xml file.

But should not the embedded jar itself already make a difference?

The jar is not committed into the repository, it's just copied into the project by the build. Therefore a change in the jar itself doesn't change the git-timestamp.

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.

3 participants