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

Move product to common #712

Open
wants to merge 29 commits into
base: master
Choose a base branch
from

Conversation

laeubi
Copy link
Member

@laeubi laeubi commented Dec 4, 2024

Currently we have a split-package between equinox-common and eclipse-platform.

This moves the interface

  • IProductProvider
  • IProduct

from platform to commons to reduce the amount of split-api, I tried to recover the history as much as possible for these files even though there is not much changed in the last years. If anyone wants to verify this it would be appreciated.

When this PR is merged the classes can be deleted from the platform bundle making it only 5 classes left to migrate before the split is resolved.

Jeff McAffer and others added 28 commits January 21, 2004 22:15
Change-Id: I776107680b86a43d201b760be935914fa352315f
Signed-off-by: Simon Scholz <[email protected]>
Change-Id: I776107680b86a43d201b760be935914fa352315f
Signed-off-by: Simon Scholz <[email protected]>
This affects all files except the .exsd , the "org.eclipse.jdt.ui.prefs"
and the pom.xml files.

Regular expression used:

find . -type f ! -name "*.exsd" ! -name "org.eclipse.jdt.ui.prefs" -exec
sed -i  's/Eclipse Public License v1.0/Eclipse Public License 2.0/g' {}
+

find . -type f  ! -name "*.exsd" ! -name "org.eclipse.jdt.ui.prefs"
-exec sed -i -E
's/([[:blank:]]*[^[:blank:]])*([[:blank:]]*)http:\/\/www.eclipse.org\/legal\/epl-v10.html/\1\2https:\/\/www.eclipse.org\/legal\/epl-2.0\/\
\1\
\1\2SPDX-License-Identifier: EPL-2.0/' {} +

# Get rid of the All rights reserved
find . -type f ! -name "*.exsd" ! -name "org.eclipse.jdt.ui.prefs" !
-name "pom.xml" -exec sed -i -E
's/([[:blank:]]*[^[:blank:]])*([[:blank:]]*)(All rights reserved.
)/\1\n\1\2/' {} +

Change-Id: I9ca35a0f032a75a181f7dc6268989d848a210963
Signed-off-by: Lars Vogel <[email protected]>
This affects all files except the .exsd , the "org.eclipse.jdt.ui.prefs"
and the pom.xml files.

Regular expression used:

find . -type f ! -name "*.exsd" ! -name "org.eclipse.jdt.ui.prefs" -exec
sed -i  's/Eclipse Public License v1.0/Eclipse Public License 2.0/g' {}
+

find . -type f  ! -name "*.exsd" ! -name "org.eclipse.jdt.ui.prefs"
-exec sed -i -E
's/([[:blank:]]*[^[:blank:]])*([[:blank:]]*)http:\/\/www.eclipse.org\/legal\/epl-v10.html/\1\2https:\/\/www.eclipse.org\/legal\/epl-2.0\/\
\1\
\1\2SPDX-License-Identifier: EPL-2.0/' {} +

# Get rid of the All rights reserved
find . -type f ! -name "*.exsd" ! -name "org.eclipse.jdt.ui.prefs" !
-name "pom.xml" -exec sed -i -E
's/([[:blank:]]*[^[:blank:]])*([[:blank:]]*)(All rights reserved.
)/\1\n\1\2/' {} +

Change-Id: I9ca35a0f032a75a181f7dc6268989d848a210963
Signed-off-by: Lars Vogel <[email protected]>
@laeubi laeubi requested a review from tjwatson December 4, 2024 10:16
@laeubi
Copy link
Member Author

laeubi commented Dec 4, 2024

The ECA check fails as this seem to contain some verrrryyyy old commits that don't have a suitable author to be identified by the check.

@laeubi laeubi force-pushed the move_product_to_common branch from 9e040eb to 2d3f1e1 Compare December 4, 2024 10:19
Copy link

github-actions bot commented Dec 4, 2024

Test Results

  663 files  ±0    663 suites  ±0   1h 17m 14s ⏱️ -9s
2 209 tests ±0  2 162 ✅ +1   47 💤 ±0  0 ❌  - 1 
6 771 runs  ±0  6 628 ✅ +1  143 💤 ±0  0 ❌  - 1 

Results for commit 2d3f1e1. ± Comparison against base commit caf78f7.

@laeubi
Copy link
Member Author

laeubi commented Dec 4, 2024

Only the usual TCK fail, @tjwatson what did you think?

@tjwatson
Copy link
Contributor

tjwatson commented Dec 4, 2024

Only the usual TCK fail, @tjwatson what did you think?

I'm concerned that we are not solving the real problem. In the long run it may be best to move all the split "parts" of org.eclipse.core.runtime back to org.eclipse.core.runtime bundle in platform.

@laeubi
Copy link
Member Author

laeubi commented Dec 4, 2024

In the long run it may be best to move all the split "parts" of org.eclipse.core.runtime back to org.eclipse.core.runtime bundle in platform.

I don't think that's really possible as org.eclipse.core.runtime requires equinox common so there is not really a backward compatible path in my opinion. So my goal would be more to get rid of most things in org.eclipse.core.runtime and then simply stop using it.

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