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

Upgrade backend to Spring Boot v2.2.6, Spring v5.2.5, Spring HATEOAS v1.0.3 #2720

Merged
merged 18 commits into from
Apr 30, 2020

Conversation

tdonohue
Copy link
Member

@tdonohue tdonohue commented Mar 23, 2020

This PR resolves two GitHub security alerts (on master) by upgrading our dependencies to the following:

This PR also includes some minor refactoring of the Parent POM to reorganize/sort the <properties> section. This is ready for early reviews, but additional testing is still in progress.

@tdonohue tdonohue added code task Code cleanup task high priority interface: REST API v7+ REST API for v7 and later (dspace-server-webapp module) dependencies Pull requests that update a dependency file labels Mar 23, 2020
@tdonohue tdonohue force-pushed the fix_security_alerts_for_spring branch 3 times, most recently from b9f888a to 73e9b58 Compare March 25, 2020 21:40
@crosenbeck
Copy link

I reviewed and agree to perform this pull request with understanding more testing will be needed later. Travis CI status needs updated.

Copy link
Member

@KevinVdV KevinVdV left a comment

Choose a reason for hiding this comment

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

@tdonohue I made a quick review & things are already looking good. Quickly build the code locally & that appears to work as well. I had just one small remark with the code changes.

@tdonohue tdonohue force-pushed the fix_security_alerts_for_spring branch from 73e9b58 to 75d65b0 Compare April 22, 2020 14:46
@tdonohue tdonohue changed the title Upgrade backend to Spring Boot v2.2.5, Spring v5.2.4, Spring HATEOAS v1.0.3 Upgrade backend to Spring Boot v2.2.6, Spring v5.2.5, Spring HATEOAS v1.0.3 Apr 22, 2020
@tdonohue
Copy link
Member Author

tdonohue commented Apr 22, 2020

All, this has been rebased on the latest master (as of today). I've also updated us to the latest Spring Boot & Spring framework (as a new bug fix release was released for both recently), see eb9ae8e

This is ready for a re-review.

Copy link
Member

@KevinVdV KevinVdV left a comment

Choose a reason for hiding this comment

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

Reviewed the latest changes, everything looks good.

@crosenbeck
Copy link

I re-reviewed and changes seem good. Thank you Tim for your work on this pull request.

Copy link
Member

@abollini abollini left a comment

Choose a reason for hiding this comment

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

Hi @tdonohue
thanks for your effort here. I have just few inline questions, around dependencies versions that are enforced in maven modules that I don't understand if really needed (as we have fixed that in the main pom.xml file).
Another comment is about a small change in the way that the link are created via a new private getIdentifierForLink method in the Utils class.

Last but not least, currently I'm not able to run a single test class from the command line. This is not directly related to this PR as I also have the same issue with the current master. The error that I get is

[ERROR] Failed to execute goal on project dspace: Could not resolve dependencies for project org.dspace:dspace:pom:7.0-beta3-SNAPSHOT: Failure to find org.dspace:dspace-rest:jar:classes:7.0-beta3-SNAPSHOT

for example when I run
mvn test -Dtest=org.dspace.app.rest.AuthorityRestRepositoryIT -Dmaven.test.skip=false -DskipITs=false -DfailIfNoTests=false

dspace-server-webapp/pom.xml Show resolved Hide resolved
header (bad signature) during the tomcat startup
force the use of the previous version as the jar file
looks corrupted in the maven repository -->
<version>${spring-hal-browser.version}</version>
Copy link
Member

Choose a reason for hiding this comment

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

can we can drop this line?

Copy link
Member Author

Choose a reason for hiding this comment

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

No we cannot drop this, as this dependency spring-data-rest-hal-browser is only included in the dspace-server-webapp. I just moved it's version # over to the DSpace Parent POM because it was easier to see/manage alongside the other Spring versions (the last two times I've upgraded Spring, I forgot about this separate dependency in dspace-server-webapp)

dspace/modules/server/pom.xml Show resolved Hide resolved
@tdonohue
Copy link
Member Author

tdonohue commented Apr 27, 2020

@abollini : I've answered all your questions about this PR. Unfortunately, there's no changes that I can make to address them, but hopefully the answers will clarify the changes I made here.

With regards to issues running individual tests on commandline, as you noted that will need to be addressed in a separate PR as it seems unrelated to this PR (as it also exists on master). I'm not sure what is going on there, but will see if I can find time to look into it at some point.

If you could give this another quick review, I'd appreciate it! Thanks!

UPDATE: @abollini , I've figured out how to fix the problem running individual tests and created a separate PR to address it (as it is unrelated to this PR): #2751

Copy link
Member

@abollini abollini left a comment

Choose a reason for hiding this comment

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

Hi @tdonohue thanks for the clarification, now with better understanding it looks good to me

@tdonohue
Copy link
Member Author

Merging as this is at +3 now. Thanks all!

@tdonohue tdonohue merged commit 2cff30e into DSpace:master Apr 30, 2020
@tdonohue tdonohue deleted the fix_security_alerts_for_spring branch April 30, 2020 21:23
@tdonohue tdonohue added this to Needs Reviewers Assigned in DSpace 7 Beta 3 via automation Jun 30, 2020
@tdonohue tdonohue moved this from Needs Reviewers Assigned to Reviewer approved in DSpace 7 Beta 3 Jun 30, 2020
@tdonohue tdonohue moved this from Reviewer approved to Done in DSpace 7 Beta 3 Jun 30, 2020
@tdonohue tdonohue added this to the 7.0beta3 milestone Jun 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
code task Code cleanup task dependencies Pull requests that update a dependency file high priority interface: REST API v7+ REST API for v7 and later (dspace-server-webapp module)
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

4 participants