bndtools / bnd

Bnd/Bndtools. Tooling to build OSGi bundles including Eclipse, Maven, and Gradle plugins.
https://bndtools.org
Other
526 stars 304 forks source link

Implement new JDK21 SortedSet and List methods for SortedList #6134

Closed neeshy closed 1 month ago

neeshy commented 1 month ago

As per #6131

neeshy commented 1 month ago

I've removed the @Override lines and it seem to build fine without the version update in package-info.java.

chrisrueger commented 1 month ago

it seem to build fine without the version update in package-info.java.

Unfortunately not. See failing build https://github.com/bndtools/bnd/actions/runs/9265278739/job/25492215091?pr=6134

aQute/lib/collections/package-info.java:0: error: Baseline mismatch for package aQute.lib.collections, MINOR change. Current is 4.2.0, repo is 4.2.0, suggest 4.3.0 or -

MINOR                PACKAGE    aQute.lib.collections
  MINOR              CLASS      aQute.lib.collections.SortedList
    ADDED            METHOD     addFirst(java.lang.Object)
      ADDED          RETURN     void
    ADDED            METHOD     addLast(java.lang.Object)
      ADDED          RETURN     void
    ADDED            METHOD     getFirst()
      ADDED          RETURN     java.lang.Object
    ADDED            METHOD     getLast()
      ADDED          RETURN     java.lang.Object
    ADDED            METHOD     removeFirst()
      ADDED          RETURN     java.lang.Object
    ADDED            METHOD     removeLast()
> Task :aQute.libg:jar FAILED
      ADDED          RETURN     java.lang.Object
    ADDED            METHOD     reversed()
      ADDED          RETURN     aQute.lib.collections.SortedList

65 actionable tasks: 65 executed
FAILURE: Build failed with an exception.
kriegfrj commented 1 month ago

I've removed the @Override lines and it seem to build fine without the version update in package-info.java.

Thanks for the update!

It will compile ok, but the baselines check (which happens later in the build) will fail - as it has done with the last push you submitted. I think if you update the version to 4.3.0 in package-info, this will fix the build error.

kriegfrj commented 1 month ago

Also, when you re-submit this fix, can you please massage your commit message to include "Fixes #6131" on the bottom line, so that the full message looks something like this:

[libg] Implement new JDK21 SortedSet and List methods for SortedList

Fixes #6131

That way we can use the commit history to refer back to all of this discussion for historical context if necessary, and as an added bonus when we merge it it will automatically close the associated issue. Adding the [libg] at the front, while not as important or enforced, is something that I have personally done in the past as it also allows us to see at a glance which part of the workspace the commit is for.

neeshy commented 1 month ago

Ah, I was building it through my package manager which evidently doesn't run that check. Pushed with the suggested changes.

kriegfrj commented 1 month ago

Thank you so much, @neeshy ! Congratulations on earning your honorary "first contribution" badge!