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

Compatibility with Spring Boot 3.x #943

Closed
wants to merge 5 commits into from
Closed

Compatibility with Spring Boot 3.x #943

wants to merge 5 commits into from

Conversation

gedeffe
Copy link

@gedeffe gedeffe commented Apr 7, 2023

In order to use gitlab4j-api with new version of SpringBoot and related dependencies, we had to upgrade several libraries.
It implies also a move from javax.xxx to jakarta.xxx for JEE libraries.

Relates to existing issues:

@jmini
Copy link
Collaborator

jmini commented Apr 11, 2023

This is similar to the work that was done in #841 not?

As I wrote on #926, for me a solution could be to start working on those topic on a separated branch and have a cascade between the 5.x branch and the 6.x branch…

/**
* This class implements the client side API for the GitLab Application Settings API.
* See <a href="https://docs.gitlab.com/ee/api/settings.html">Application Settings API at GitLab</a> for more information.
*/
public class ApplicationSettingsApi extends AbstractApi {

public ApplicationSettingsApi(GitLabApi gitLabApi) {
public ApplicationSettingsApi(final GitLabApi gitLabApi) {
Copy link
Collaborator

@jmini jmini Apr 11, 2023

Choose a reason for hiding this comment

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

Why did you make all the method argument explicitly final?

I think the compiler was already treating those as implicitly final

If we keep the vision to have 2 active branches main and 6.x, this kind of changes will make keeping both branch working in parallel too complicated.

Copy link
Author

Choose a reason for hiding this comment

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

You're right.
Sorry, this is an automatic config of IntelliJ (clean-up tasks)

@@ -297,7 +296,8 @@
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java1${java.level}</artifactId>
<artifactId>java18</artifactId>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Per mojohaus/animal-sniffer#62, keeping animal-sniffer when building with Java 11 does not really make sense.

Copy link
Author

Choose a reason for hiding this comment

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

So, we would be able to remove this configuration ?

Copy link
Collaborator

Choose a reason for hiding this comment

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

This is what I did in #946 (keeping you are co-author of the change)

@gedeffe
Copy link
Author

gedeffe commented Apr 11, 2023

This is similar to the work that was done in #841 not?

As I wrote on #926, for me a solution could be to start working on those topic on a separated branch and have a cascade between the 5.x branch and the 6.x branch…

If I understand correctly, it would be better to target branch 6.x for these evolutions ?

@jmini
Copy link
Collaborator

jmini commented Apr 11, 2023

@gedeffe I am splitting your work in smaller PRs.

I have posted the Git flow I would like to use in this project in #926 (comment)

Compared to your work, I am also removing all the code formatting and other non-necessary changes in order to keep both branches close enough...

@gedeffe
Copy link
Author

gedeffe commented Apr 12, 2023

@jmini , Thank you for integration in branch 6.x, especially as I made noise with automatic format of code (like adding final keyword).

Do I have to keep this PR alive, or should I edit it to target only 6.x branch or close it ?

@ajivemu
Copy link

ajivemu commented Apr 12, 2023

@gedeffe @jmini Do you have any timeline to release this feature? We have critical application with gitlab4j dependent on Springboot3.

@jmini
Copy link
Collaborator

jmini commented Apr 13, 2023

@ajivemu: Please check if the release 6.0.0-rc.1 works for you and give feedback, so that we know if we are on the good path for a 6.0.0 release.

This version is using:

  • minimal version: Java 11
  • Jakarta EE components with the jakarta.* packages instead of javax.*

@jmini jmini mentioned this pull request Apr 13, 2023
@jmini
Copy link
Collaborator

jmini commented Apr 13, 2023

@gedeffe #943 (comment) :

Do I have to keep this PR alive, or should I edit it to target only 6.x branch or close it ?

I have open 3 PRs with all your ideas from this PR.

You can review the last open one #950 and tell if something is missing.

For me this PR can be closed. Thank you very much for your work.

@gedeffe gedeffe closed this Apr 13, 2023
@gedeffe gedeffe deleted the master branch April 13, 2023 08:59
@gedeffe
Copy link
Author

gedeffe commented Apr 13, 2023

And I forgot to mention also here that version 6.0.0-rc.1 works for our use cases.
Thank you guys !

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