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.

Sign up for GitHub

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

Jump to bottom

WIP experimental upgrade to Spring6/JakartaEE #7351

Draft
wants to merge 15 commits into
base: main
Choose a base branch
from
Draft

WIP experimental upgrade to Spring6/JakartaEE #7351

wants to merge 15 commits into from

Conversation

groldan
Copy link
Member

@groldan groldan commented Jan 16, 2024 •
edited by pull-request-badge bot

  • Core Platform Module
    • Open Web Service Module
    • Main Module
    • GeoServer Security Modules
      • GeoServer Security Tests Module
      • GeoServer JDBC Security Module
      • GeoServer LDAP Security Module
    • Web Coverage Service Module
    • Web Coverage Service 1.0 Module
    • Web Coverage Service 1.1 Module
    • Web Coverage Service 2.0 Module
    • Web Feature Service Module
    • Web Map Service Module
    • KML support for GeoServer
    • gs-rest
    • GeoWebCache (GWC) Module
    • GeoWebCache (GWC) Rest Module
    • gs-restconfig
    • gs-restconfig-wcs
    • gs-restconfig-wfs
    • gs-restconfig-wms
    • WMTS REST configuration
    • GeoServer Web Modules
    • Core UI Module
    • WMS UI Module
    • GWC UI Module
    • WFS UI Module
    • Demos Module
    • WCS UI Module
    • Security UI Modules
    • Security UI Core Module
    • Security UI JDBC Module
    • Security UI LDAP Module
    • REST UI Module
    • GeoServer Web Application
  • GeoServer Extensions
  • Community Space

Checklist

For core and extension modules:

  • New unit tests have been added covering the changes.
  • Documentation has been updated (if change is visible to end users).
  • The REST API docs have been updated (when changing configuration objects or the REST controllers).
  • There is an issue in the GeoServer Jira (except for changes that do not affect administrators or end users in any way).
  • Commit message(s) must be in the form [GEOS-XYZWV] Title of the Jira ticket.
  • Bug fixes and small new features are presented as a single commit.
  • Each commit has a single objective (if there are multiple commits, each has a separate JIRA ticket describing its goal).

@bradh
Copy link
Contributor

bradh commented Jan 16, 2024

I know we have some custom stuff, but possibly https://docs.openrewrite.org/recipes/java/migrate/jakarta/javaxmigrationtojakarta could do some of the manual work for you.

@groldan
Copy link
Member Author

groldan commented Jan 17, 2024

hi @bradh , that is great, thanks. Applied it at 168fb31
That's only part of the problem though, but got us far ahead. I've also did an experimental run on geotools/geowebcache/geofence.

@groldan
Run Migrate to Jakarta EE 9 receipe
333d837 
See https://docs.openrewrite.org/recipes/java/migrate/jakarta/javaxmigrationtojakarta

* Applied the receipe:
```
mvn -U org.openrewrite.maven:rewrite-maven-plugin:run \
-Drewrite.recipeArtifactCoordinates=org.openrewrite.recipe:rewrite-migrate-java:RELEASE \
-Drewrite.activeRecipes=org.openrewrite.java.migrate.jakarta.JavaxMigrationToJakarta
```

* Followed by `mvn sortpom:sort spotless:apply`
@groldan
Upgrade spring:5.3.27 -> 6.1.2, spring-security:5.7.10 -> 6.2.1
656e8d9
@groldan
Add jakarta.servlet:jakarta.servlet-api:6.0.0 to dependencyManagement
a713435
@groldan
Migrate github actions to Java17 minimum
88cce62
@groldan
Dependency management upgrade commons-fileupload:1.5 -> commons-fileu…
e8a6402 
…pload2-jakarta
@groldan
Upgrade commons-io:2.12.0 -> 2.15.1, required by fileupload2
0640948
@groldan
Update commons-fileupload2 dependency on all poms using commons-fileu…
8fb25b7 
…pload
@groldan
Migrate gs-ows to jakarta.servlet/commons-fileupload2
c851d78
@groldan
Migrate gs-main to jakarta.servlet
6c84f27
@groldan
Remove javax.servlet from root pom
68fe8f8
@groldan
Adapt CoverageDelegateHandler API to jakarta.activation.DelegationHan…
169228b 
…dler
@groldan
Upgrade com.sun.mail:jakarta.mail:1.6.7 -> 2.0.1
b229942 
Required by DispatcherTest.java, breaks otherwise
@groldan
Remove com.sun.activation:jakarta.activation in favor of jakarta.acti…
67f1ae2 
…vation-api
@groldan
Set compiler version to 17 and upgrade maven-surefire-plugin
681053f
@groldan
Add dependency on jakarta.servlet-api to gs-wcs
21ea783
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@groldan @bradh