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

Apply project settings o.e.osgi/supplement #330

Conversation

Torbjorn-Svensson
Copy link
Contributor

  1. Convert to LF and ensure LF at EOF:
find . -type f -print0 | \
  xargs -r0 perl -le 'for (@argv) { print if -f && -T }' | \
  xargs -rd'\n' dos2unix -e
  1. Format java files:
eclipse -consolelog -nosplash -application org.eclipse.jdt.core.JavaCodeFormatter \
  -config .settings/org.eclipse.jdt.core.prefs . -data `mktemp -d`

@github-actions
Copy link

github-actions bot commented Oct 1, 2023

Test Results

   24 files  ±0     24 suites  ±0   11m 14s ⏱️ +30s
2 150 tests ±0  2 105 ✅ ±0  45 💤 ±0  0 ❌ ±0 
2 194 runs  ±0  2 149 ✅ ±0  45 💤 ±0  0 ❌ ±0 

Results for commit bcae829. ± Comparison against base commit 1d9eb47.

♻️ This comment has been updated with latest results.

@Torbjorn-Svensson
Copy link
Contributor Author

I'm not entirely sure how this nested project should be handled.
I created one PR for the sub-project (this one) and another one for the parent (#329). As I see it, there are three options:

  1. Merge Apply project settings o.e.osgi #329 prior to looking at this PR
  2. Bump the bundle version of o.e.osgi in this PR too
  3. Squash the 2 PRs into a single one.

What solution do you prefer?

@Torbjorn-Svensson Torbjorn-Svensson force-pushed the pr/cleanup-o.e.osgi-supplement branch from fcbea47 to d7f479f Compare November 3, 2023 18:07
@Torbjorn-Svensson Torbjorn-Svensson force-pushed the pr/cleanup-o.e.osgi-supplement branch from d7f479f to 88b757f Compare December 17, 2023 21:36
This was achieved by running:
find . -type f -print0 | \
  xargs -r0 perl -le 'for (@argv) { print if -f && -T }' | \
  xargs -rd'\n' dos2unix -e

Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@st.com>
This was achieved by running:
eclipse -consolelog -nosplash -application org.eclipse.jdt.core.JavaCodeFormatter \
  -config .settings/org.eclipse.jdt.core.prefs . -data `mktemp -d`

Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@st.com>
@Torbjorn-Svensson Torbjorn-Svensson force-pushed the pr/cleanup-o.e.osgi-supplement branch from 88b757f to bcae829 Compare January 6, 2024 18:18
@Torbjorn-Svensson
Copy link
Contributor Author

Rebased PR on 1d9eb47.
Anything I need to do prior to getting this merged?

@vogella vogella merged commit b297e05 into eclipse-equinox:master Jan 15, 2024
23 of 24 checks passed
@Torbjorn-Svensson Torbjorn-Svensson deleted the pr/cleanup-o.e.osgi-supplement branch January 15, 2024 08:49
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.

2 participants