LIBDRUM-892. Update DRUM to DSpace 8.0 #235
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Temporarily change branch which Sandbox watches for deployment updates
…onflict with "-loadsql" build by appending "-prod" on main build id.
…5_pr-8267_Issue-stale-record-cleanup Issue predb status cleanup
COAR Notify Protocol refactor: url to ietf:item
httpd-shibd-foreground.sh needs to be executable
…anup to avoid convergence errors.
…mer when indexing
Fix email dependency issues which were causing Submission failures
… in EntityServiceImpl by calling itemService.getEntityType()
Fix OAI indexing error & AuthorityConsumer error
…e errors with sending mail from DSpace
Exclude old Apache Geronimo dependencies from SWORDv2
Add Space in ePerson's Name in Rejection Emails and Metadata
…ration supports modification to match an exact path
…viceRestRepositoryIT-fix
…by pagination. Added "feature" filter to tests to ensure we search for the one feature we are interested in.
Switch to using `org.dspace:orcid-model-jakarta` in Maven Central
…eRestRepositoryIT-fix COAR NotifyService IT failures
…odifying submission configs no longer needed
Update configuration to always download HTML/JS/XML Bitstreams (no inline display)
…cies where required.
Fix OpenAIRE import from external source
Bump Spring Boot from 3.2.5 to 3.2.6.
[maven-release-plugin] copy for tag dspace-7.6.1
https://umd-dit.atlassian.net/browse/LIBDRUM-892 [maven-release-plugin] copy for tag dspace-8.0
Incorporated stock DSpace 8 changes into the files copied and then modified with UMD customizations in the "modules/additions" directory. https://umd-dit.atlassian.net/browse/LIBDRUM-892
Updated the configuration files in "dspace-api/src/test/dspaceFolder" with the stock DSpace 8.0 (so that they override the modified files in "dspace/config"). This is needed to so for the "dspace-api" unit and integration tests to pass successfully, as they rely on the stock configuration. https://umd-dit.atlassian.net/browse/LIBDRUM-892
Updated the configuration files in "dspace-server-webapp/src/test/dspaceFolder" with the stock DSpace 8.0 (so that they override the modified files in "dspace/config"). This is needed to so for the "dspace-server-webapp" unit and integration tests to pass successfully, as they rely on the stock configuration. https://umd-dit.atlassian.net/browse/LIBDRUM-892
Java 17 no longer includes Java EE as a dependency, having moved them to a "jakarta" dependency. Updated the Java EE imports "javax.servlet.*" and "javax.persistence.*" to "jakarta.servlet.*" and "jakarta.persistence.*" respectively. https://umd-dit.atlassian.net/browse/LIBDRUM-892
Updated UMD-added "DSpaceObjectRest" implementations to provide the required "getTypePlural" method to support pluralized endpoints as detailed in DSpace pull request 9241 Updated "@component" annotations to use plural names in DSpaceRestRepository implementations, following the example of the stock DSpace classes. https://umd-dit.atlassian.net/browse/LIBDRUM-892
Java 17 no longer includes Java EE as a dependency, having moved them to a "jakarta" dependency. Updated the Java EE imports "javax.ws.rs.core.MediaType" to "jakarta.ws.rs.core.MediaType" https://umd-dit.atlassian.net/browse/LIBDRUM-892
Replaced use of "basic types", which were removed in Hibernate 6, with the corresponding Hibernate 6 "StandardBasicType" instances. https://umd-dit.atlassian.net/browse/LIBDRUM-892
As of DSpace 8, The "org.dspace.app.rest.security.StatelessLoginFilter" class now requires an HTTP request method as part of the "super" call from subclasses to its constructor. Modified "CASLoginFilter" to provide the "GET" request method, which is believed to be correct for this use. https://umd-dit.atlassian.net/browse/LIBDRUM-892
Following the example of the stock DSpace classes, replaced "@Cacheable" and "@org.hibernate.annotations.Cache" annotations by extending the "CacheableDSpaceObject" class. https://umd-dit.atlassian.net/browse/LIBDRUM-892
Checkstyle fixes to imports, so that code will pass the Checkstyle task when running the Maven build. https://umd-dit.atlassian.net/browse/LIBDRUM-892
Updated the parent POM version for the "server-boot" module to point to the correct parent (i.e., DRUM, instead of DSpace). This was missed in the initial pass, because the "server-boot" module was not present in DSpace 8. Checkstyle fixes to imports, so that code will pass the Checkstyle task when running the Maven build. https://umd-dit.atlassian.net/browse/LIBDRUM-892
Updated additional UMD-added classes to use pluralized endpoints as detailed in DSpace pull request 9241 Updated "@component" annotations to use plural names in DSpaceRestRepository implementations, following the example of the stock DSpace classes. Updated endpoints where necessary to use plural names. https://umd-dit.atlassian.net/browse/LIBDRUM-892
Updated the Dockerfiles, including those added by UMD to more closely match the stock DSpace 8 files, while preserving UMD customizations for local development builds. https://umd-dit.atlassian.net/browse/LIBDRUM-892
In DSpace 8, the stock DSpace Dockerfiles were modified to use a Spring Boot "embedded Tomcat" runnable jar for running the DSpace back-end. This method of running ignores the UMD customizations in the "dspace/modules/additions" and "dspace/modules/server" directories (see DSpace Issue 9987). In this pull request, updated the Dockerfiles (and POM files) to use the "tomcat" Docker image for running the application, as in DSpace 7.6.2. This ensures that the ensure that UM customizations in the "dspace/modules/additions" and "dspace/modules/server" directory are available. https://umd-dit.atlassian.net/browse/LIBDRUM-892
Modified the Dockerfiles and POMs to be more similar to the stock DSpace 8 Dockerfiles, which use a Spring Boot "embedded Tomcat" runnable jar for running the DSpace back-end. This commit includes customizations to the POM files sent to DSpace in DSpace#10043, so that customizations in the "additions" and "server" modules will be incorporated into the embedded Tomcat build. Updated "DrumConfigurationCustomization" to provide links to the "fix" for the embedded Tomcat server. https://umd-dit.atlassian.net/browse/LIBDRUM-892
Commented out the "codecov" GitHub action that is part of the build process because UMD does not have an appropriate key for uploading the results to codecov.io. Commenting out the action enables the builds to be marked as successful (as long as they pass the unit and integration tests). https://umd-dit.atlassian.net/browse/LIBDRUM-892
This file was removed from stock DSpace in DSpace 7.2 (see <DSpace@618aed6>) and no longer appears to be necessary. https://umd-dit.atlassian.net/browse/LIBDRUM-892
Removed most references to DSpace 7, as the documents also now apply to DSpace 8. Updated the local development setup instructions. https://umd-dit.atlassian.net/browse/LIBDRUM-892
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Initial upgrade of the DRUM DSpace back-end to DSpace 8.0.
Migration procedure outlined in the following Confluence pages:
https://umd-dit.atlassian.net/browse/LIBDRUM-892