Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2539 commits
Select commit Hold shift + click to select a range
37846f6
LIBDRUM-667. Fixed all Checkstyle warnings
dsteelma-umd Mar 15, 2023
a5a2081
LIBDRUM-667. Restored Checkstyle checking in Jenkinfile
dsteelma-umd Mar 15, 2023
becf485
Merge pull request #203 from dsteelma-umd/feature/LIBDRUM-748
mohideen Mar 16, 2023
2ef604b
Merge pull request #205 from dsteelma-umd/feature/LIBDRUM-667
mohideen Mar 16, 2023
6ce78fb
Merge pull request #204 from dsteelma-umd/feature/LIBDRUM-757
mohideen Mar 16, 2023
932e156
LIBDRUM-667. Fixed CheckStyle violation
dsteelma-umd Mar 24, 2023
4e5cde6
LIBDRUM-770. Fixed Subject line for "subscription" email template
dsteelma-umd Mar 24, 2023
61daa54
Merge pull request #206 from dsteelma-umd/feature/LIBDRUM-770
mohideen Mar 28, 2023
f253470
LIBDRUM-720. Added "DrumCronTasks.md" file
dsteelma-umd Mar 29, 2023
73e506a
Merge pull request #207 from dsteelma-umd/feature/LIBDRUM-720
mohideen Apr 3, 2023
7127e2b
LIBDRUM-769. Refactored CASAuthentication centralize LDAP queries
dsteelma-umd Apr 3, 2023
7fc2197
LIBDRUM-769. Refactored LdapServiceImpl to facilitate testing
dsteelma-umd Apr 4, 2023
39428ee
LIBDRUM-769. Added impersonated user "special groups" handling
dsteelma-umd Apr 4, 2023
a7d4d4d
LIBDRUM-769. Added caching for LDAP queries
dsteelma-umd Apr 4, 2023
990cd50
LIBDRUM-769. Update "CASAuthentication.md" with info on impersonation
dsteelma-umd Apr 4, 2023
c3a3e86
LIBDRUM-769. Fixed "errorprone.info" warning about non-static class
dsteelma-umd Apr 4, 2023
7fa308d
LIBDRUM-712. Delete obsolete configuration files, scripts, and docs
mohideen Apr 3, 2023
d768414
Merge pull request #208 from dsteelma-umd/feature/LIBDRUM-769
mohideen Apr 5, 2023
8f4d7f6
Merge pull request #209 from dsteelma-umd/feature/LIBDRUM-712
mohideen Apr 5, 2023
c2ba7bf
LIBDRUM-777. Merge branch 'drum-develop' into drum-main
dsteelma-umd Apr 5, 2023
170ac97
LIBDRUM-777. Updated references to "drum-develop" branch to "drum-main"
dsteelma-umd Apr 5, 2023
567ab5a
LIBDRUM-668. Restored license and CheckStyle checks in CI jobs
dsteelma-umd May 11, 2023
1157d6b
Merge pull request #210 from dsteelma-umd/feature/LIBDRUM-668
dsteelma-umd May 11, 2023
091e5c7
LIBDRUM-790. Updated "README-DRUM.md" for DSpace 7
dsteelma-umd May 11, 2023
4e8cc0a
Merge pull request #211 from dsteelma-umd/feature/LIBDRUM-790
dsteelma-umd May 12, 2023
aab7484
LIBDRUM-791. Updated DRUM Documentation for DSpace 7
dsteelma-umd May 12, 2023
2909ac0
Merge pull request #212 from dsteelma-umd/feature/LIBDRUM-791
dsteelma-umd May 12, 2023
2259f17
LIBDRUM-802. Pin Postgres version to 12.14
dsteelma-umd Aug 9, 2023
b692581
Merge pull request #213 from dsteelma-umd/feature/LIBDRUM-802
dsteelma-umd Aug 10, 2023
b144253
LIBDRUM-812. Added/normalized UMD customization markers
dsteelma-umd Sep 25, 2023
b42c302
LIBDRUM-812. Merge tag 'dspace-7.6' into feature/LIBDRUM-812
dsteelma-umd Sep 27, 2023
ee906f3
LIBDRUM-812. Merged DSpace 7.6 changes into "additions" files
dsteelma-umd Sep 27, 2023
f9bbe8a
LIBDRUM-812. Merged DSpace 7.6 changes into "server" files
dsteelma-umd Sep 27, 2023
3375e28
LIBDRUM-812. Placed stock DSpace 7.6 files into dspace-api test config
dsteelma-umd Sep 27, 2023
9323685
LIBDRUM-812. Placed stock DSpace 7.6 files into dspace-server-webapp
dsteelma-umd Sep 27, 2023
53934b7
LIBDRUM-812. Fixes to "additions" module files
dsteelma-umd Sep 28, 2023
3289563
LIBDRUM-812. CheckStyle fix to "server" module file
dsteelma-umd Sep 28, 2023
288a78b
LIBDRUM-812. Fixed missed POM version update
dsteelma-umd Sep 28, 2023
c10e2bc
LIBDRUM-812. Pin Postgres version to 13.10
dsteelma-umd Sep 29, 2023
92faf03
Merge pull request #215 from dsteelma-umd/feature/LIBDRUM-812
dsteelma-umd Oct 4, 2023
417d0af
LIBDRUM-811. Increase the maximum allowed upload file size
dsteelma-umd Oct 5, 2023
cfd3b64
Merge pull request #216 from dsteelma-umd/feature/LIBDRUM-811
dsteelma-umd Oct 5, 2023
b7c3fc3
Merge pull request #217 from dsteelma-umd/feature/LIBDRUM-811
dsteelma-umd Oct 5, 2023
9de14fc
LIBDRUM-815. Modify local development environment to use HTTPS
dsteelma-umd Oct 9, 2023
52c4c65
Merge pull request #218 from dsteelma-umd/feature/LIBDRUM-815
dsteelma-umd Oct 9, 2023
7134dab
LIBDRUM-819. Added "script-mail-wrapper" script for emailing script logs
dsteelma-umd Oct 12, 2023
dec6067
Merge pull request #219 from dsteelma-umd/feature/LIBDRUM-819
dsteelma-umd Oct 12, 2023
d2972dc
LIBDRUM-822. Merge branch 'drum-main' into feature/LIBDRUM-822
dsteelma-umd Oct 13, 2023
e635371
Merge pull request #220 from dsteelma-umd/feature/LIBDRUM-822
dsteelma-umd Oct 13, 2023
05a7b05
LIBDRUM-824. Fixed "DSpace Scripts and Email Setup" section
dsteelma-umd Nov 15, 2023
7c871b3
LIBDRUM-824. Replaced "dspace.name" with "dspace.shortname" in templates
dsteelma-umd Nov 15, 2023
1ccf651
LIBDRUM-824. Minor spelling and typo fixes for "DrumFeatures.md"
dsteelma-umd Nov 15, 2023
ba521a8
LIBDRUM-824. Added additional documentation on running MailHog
dsteelma-umd Nov 15, 2023
ca41e25
Merge pull request #221 from dsteelma-umd/feature/LIBDRUM-824
dsteelma-umd Nov 16, 2023
6cd7ce6
LIBDRUM-825. Removed UMD customizations in commented-out configuration
dsteelma-umd Jan 3, 2024
705128c
LIBDRUM-825. Marked UMD customizations in .gitignore, and consolidated
dsteelma-umd Jan 3, 2024
22116ce
LIBDRUM-825. Merge tag 'dspace-7.6.1' into feature/LIBDRUM-825
dsteelma-umd Jan 3, 2024
d4529a0
LIBDRUM-825. Merge DSpace 7.6.1 changes into "additions" module
dsteelma-umd Jan 3, 2024
8fdb412
LIBDRUM-825. Ignoring "VocabularyRestRepositoryIT" integration test
dsteelma-umd Jan 3, 2024
2fa9c03
LIBDRUM-825. Added documentation on "UMD Customization markings
dsteelma-umd Jan 3, 2024
f457a6a
LIBDRUM-825. Documentation typo fixes
dsteelma-umd Jan 3, 2024
7e6a0bb
LIBDRUM-825. Align Dockerfile.ant with DSpace Ant build step
dsteelma-umd Jan 5, 2024
05c9578
LIBDRUM-825. Removed "xmlui.google.analytics.key" property
dsteelma-umd Jan 8, 2024
0724ba2
LIBDRUM-825. Updated "DrumCronTasks.md" for DSpace 7.6.1
dsteelma-umd Jan 8, 2024
cfd7409
Merge pull request #222 from dsteelma-umd/feature/LIBDRUM-825
dsteelma-umd Jan 8, 2024
0ee642e
LIBDRUM-828. Update version in pom.xml to "7.6.1-drum-0"
dsteelma-umd Jan 11, 2024
0007d46
LIBDRUM-828. Update version in pom.xml to "7.6.1-drum-1-SNAPSHOT"
dsteelma-umd Jan 11, 2024
ffeaaa0
LIBDRUM-844. Disable "By Subject Category" Browse option
dsteelma-umd Feb 2, 2024
f865678
Merge pull request #223 from dsteelma-umd/feature/LIBDRUM-844
dsteelma-umd Feb 2, 2024
f9250c1
LIBDRUM-828. Update version in pom.xml to "7.6.1-drum-1"
dsteelma-umd Feb 5, 2024
9e98c22
LIBDRUM-828. Update version in pom.xml to "7.6.1-drum-2-SNAPSHOT"
dsteelma-umd Feb 5, 2024
7a1fd44
LIBDRUM-848. Disable doi-filter.
mohideen Feb 27, 2024
609af63
Merge pull request #224 from mohideen/feature/LIBDRUM-848
mohideen Feb 27, 2024
4a573df
Bumped version to 7.6.1-drum-2
mohideen Feb 27, 2024
8033c73
Updated version to 7.6.1-drum-3-SNAPSHOT
mohideen Feb 27, 2024
7f18703
LIBDRUM-848. Updated documentation.
mohideen Feb 27, 2024
d64bbf0
Updated documentation.
mohideen Feb 28, 2024
44202a5
LIBITD-2487. Fix Jenkinsfile for Jenkins v2.440.2
dsteelma-umd Mar 27, 2024
b39b353
Merge pull request #225 from dsteelma-umd/feature/LIBITD-2487
dsteelma-umd Mar 27, 2024
7f4499b
LIBDRUM-859. Fix OpenSearch NullPointerException for unknown valid UUIDs
dsteelma-umd Apr 24, 2024
44ebb13
Merge pull request #226 from dsteelma-umd/feature/LIBDRUM-859
dsteelma-umd Apr 24, 2024
237f1cc
LIBDRUM-860. Update version in pom.xml to "7.6.1-drum-3"
dsteelma-umd Apr 24, 2024
d43bf28
LIBDRUM-860. Update version in pom.xml to "7.6.1-drum-4-SNAPSHOT"
dsteelma-umd Apr 24, 2024
523ed36
LIBDRUM-814. Remove need to "pin" Postgres to 13.10
dsteelma-umd Sep 27, 2024
b7c0405
Merge pull request #228 from dsteelma-umd/feature/LIBDRUM-814
dsteelma-umd Sep 27, 2024
9505eef
LIBDRUM-867. Merge tag 'dspace-7.6.2' into drum-main
dsteelma-umd Sep 30, 2024
8b9b8c0
LIBDRUM-867. Update POM versions to 7.6.2-drum-0-SNAPSHOT
dsteelma-umd Sep 30, 2024
f37a19c
LIBDRUM-867. Updated to UMD-added files to fix Java compiler errors
dsteelma-umd Sep 24, 2024
31a1103
LIBDRUM-867. Update test DSpace configuration in "dspace-api"
dsteelma-umd Sep 27, 2024
4a31646
LIBDRUM-867. Incorporate DSpace 7.6.2 config changes into test data
dsteelma-umd Sep 30, 2024
2f53eb7
Merge pull request #227 from dsteelma-umd/feature/LIBDRUM-867
dsteelma-umd Sep 30, 2024
349d7b7
LIBDRUM-866. Updated DIM2UmdDataCite.xsl for DataCite Schema 4.5
dsteelma-umd Oct 2, 2024
296de97
LIBDRUM-866. Added documentation about DOI DataCite schema
dsteelma-umd Oct 2, 2024
58b3ded
Merge pull request #229 from dsteelma-umd/feature/LIBDRUM-866
dsteelma-umd Oct 2, 2024
7f131ca
LIBDRUM-876. Make "Equitable Access" field dynamic based on "Type"
dsteelma-umd Oct 3, 2024
005232d
LIBDRUM-876. Added "DrumSubmissionForms.md" Markdown document
dsteelma-umd Oct 3, 2024
bbf702f
LIBDRUM-876. Modified Author/Advisor label for desired placeholder text
dsteelma-umd Oct 3, 2024
9f91b41
LIBDRUM-876. Adjust "Subject" field hint
dsteelma-umd Oct 3, 2024
bc3b5d9
LIBDRUM-876. Replaced "Equitable Access" label with explanatory text
dsteelma-umd Oct 3, 2024
0c258a9
Merge pull request #230 from dsteelma-umd/feature/LIBDRUM-876
dsteelma-umd Oct 4, 2024
a38d65b
LIBDRUM-882. Renamed "drum_pg_restore.sh" script to "pg_restore_drum.sh"
dsteelma-umd Oct 24, 2024
6fd2927
Merge pull request #231 from dsteelma-umd/feature/LIBDRUM-882
dsteelma-umd Oct 24, 2024
8319683
LIBDRUM-875. Update version in pom.xml to "7.6.2-drum-0"
dsteelma-umd Oct 25, 2024
a77cfc9
LIBDRUM-875. Update version in pom.xml to "7.6.2-drum-1-SNAPSHOT"
dsteelma-umd Oct 25, 2024
dde576e
LIBDRUM-889. Make DRUM local dev setup more consistent with MD-SOAR
dsteelma-umd Nov 1, 2024
ebe42a5
LIBDRUM-889. Remove CC license customization from local.cfg.EXAMPLE
dsteelma-umd Nov 1, 2024
f926975
Merge pull request #234 from dsteelma-umd/feature/LIBDRUM-889
dsteelma-umd Nov 5, 2024
8737d94
LIBDRUM-875. Update version in pom.xml to "7.6.2-drum-1"
dsteelma-umd Nov 8, 2024
8004b27
LIBDRUM-875. Update version in pom.xml to "7.6.2-drum-2-SNAPSHOT"
dsteelma-umd Nov 8, 2024
cc1df37
LIBDRUM-741. Basic unit tests for "Ldap.isFaculty" method
dsteelma-umd Feb 20, 2023
23c5b25
LIBDRUM-741. Extracted code for determining faculty into separate method
dsteelma-umd Feb 20, 2023
690aa3a
LIBDRUM-741. Updated code for Elevate OLDAP/Workday changes
dsteelma-umd Feb 20, 2023
d070f66
Merge pull request #233 from dsteelma-umd/feature/LIBDRUM-750-dspace-…
dsteelma-umd Nov 14, 2024
c46324f
LIBDRUM-878. Update version in pom.xml to "7.6.2-drum-2"
dsteelma-umd Nov 14, 2024
3732115
LIBDRUM-878. Update version in pom.xml to "7.6.2-drum-3-SNAPSHOT"
dsteelma-umd Nov 14, 2024
0527a3c
LIBDRUM-892. Merge tag 'dspace-8.0' into drum-main
dsteelma-umd Nov 15, 2024
d77f1ca
LIBDRUM-892. Incorporated stock DSpace 8 into "additions" files
dsteelma-umd Nov 15, 2024
3e8a8f6
LIBDRUM-892. Updated dspace-api test config files with stock files
dsteelma-umd Nov 15, 2024
758be25
LIBDRUM-892. Updated dspace-server-webapp test config files with stock
dsteelma-umd Nov 15, 2024
95d5949
LIBDRUM-892. Java EE "javax.*" to "jakarta.*" package updates
dsteelma-umd Nov 18, 2024
6aa3063
LIBDRUM-892. Update UMD-added classes to provide plural type names
dsteelma-umd Nov 18, 2024
75f5e86
LIBDRUM-892. Java EE "javax.ws.rs.core.MediaType" to "jakarta"
dsteelma-umd Nov 18, 2024
f70bcf7
LIBDRUM-892. Updates for Hibernate 6
dsteelma-umd Nov 18, 2024
a42ae12
LIBDRUM-892. Added HTTP request method to CASLoginFilter
dsteelma-umd Nov 18, 2024
07d240e
LIBDRUM-892. Updated UMD DSpaceObjects to use CacheableDSpaceObject
dsteelma-umd Nov 18, 2024
3e4180b
LIBDRUM-892. Checkstyle Fixes
dsteelma-umd Nov 19, 2024
832461f
LIBDRUM-892. Update parent POM version for "server-boot" module
dsteelma-umd Nov 19, 2024
b532291
LIBDRUM-892. More updates to UMD-added classes for plural type names
dsteelma-umd Nov 20, 2024
db73890
LIBDRUM-892. Updated Dockerfiles for DSpace 8
dsteelma-umd Nov 20, 2024
b2b37af
LIBDRUM-892. Refactored Dockerfiles for external Tomcat
dsteelma-umd Nov 21, 2024
46819db
LIBDRUM-892. Refactored Dockerfiles and POMs for embedded Tomcat
dsteelma-umd Nov 25, 2024
a79336a
LIBDRUM-892. Comment out "codecov" GitHub Action
dsteelma-umd Nov 25, 2024
dde409d
LIBDRUM-892. Removed "dspace/src/main/docker/local.cfg"
dsteelma-umd Nov 25, 2024
fe01f19
LIBDRUM-892. Documentation updates for DSpace 8.0
dsteelma-umd Dec 17, 2024
38bed53
Merge pull request #235 from dsteelma-umd/feature/LIBDRUM-892
dsteelma-umd Dec 17, 2024
b5c30c9
LIBDRUM-897. Initial DRUM Test Plan document
dsteelma-umd Dec 17, 2024
2d30f3c
Merge pull request #236 from dsteelma-umd/feature/LIBDRUM-897
dsteelma-umd Jan 10, 2025
bf2ac8c
LIBDRUM-901. Provide JSON logging configuration for Kubernetes
dsteelma-umd Jan 13, 2025
a4f0ea6
Merge pull request #237 from dsteelma-umd/feature/LIBDRUM-901
dsteelma-umd Jan 15, 2025
c7e4387
LIBDRUM-900. Added information about Solr logging to "DrumLogging.md"
dsteelma-umd Jan 15, 2025
21fa16a
Merge pull request #238 from dsteelma-umd/feature/LIBDRUM-900
dsteelma-umd Jan 15, 2025
c322008
LIBDRUM-898. Update version in pom.xml to "8.0-drum-0"
dsteelma-umd Jan 15, 2025
90f7aff
LIBDRUM-898. Update version in pom.xml to "8.0-drum-1-SNAPSHOT"
dsteelma-umd Jan 15, 2025
9de515f
LIBDRUM-908. xml:lang underscore fix
dsteelma-umd Feb 4, 2025
3bc45fe
Merge pull request #239 from dsteelma-umd/feature/LIBDRUM-908
dsteelma-umd Feb 4, 2025
377a9ea
LIBDRUM-907. Fix ETD loader resource policy for embargoed bitstreams
dsteelma-umd Feb 4, 2025
d91c6ba
Merge pull request #240 from dsteelma-umd/feature/LIBDRUM-907
dsteelma-umd Feb 4, 2025
c7ab390
LIBDRUM-898. Update version in pom.xml to "8.0-drum-1"
dsteelma-umd Feb 4, 2025
c9ac866
LIBDRUM-898. Update version in pom.xml to "8.0-drum-2-SNAPSHOT"
dsteelma-umd Feb 4, 2025
cce88da
LIBDRUM-915. Updated docker-compose.yml to support VS Code debugging
dsteelma-umd Feb 7, 2025
01677dc
Merge pull request #241 from dsteelma-umd/feature/LIBDRUM-915
dsteelma-umd Feb 7, 2025
a631f74
LIBDRUM-916. Purge DOIs with no associated bitstream before registration
dsteelma-umd Feb 13, 2025
64f6cc0
LIBDRUM-916. JavaDoc updates to fix "errorprone.info" warnings
dsteelma-umd Feb 13, 2025
60fffe6
LIBDRUM-916. Updates to "DrumDOI.md"
dsteelma-umd Feb 13, 2025
ed1d47a
Merge pull request #242 from dsteelma-umd/feature/LIBDRUM-916
dsteelma-umd Feb 13, 2025
204292a
LIBDRUM-937. Modify bitstore migration to skip missing files
dsteelma-umd Feb 18, 2025
279e0f1
Merge pull request #244 from dsteelma-umd/feature/LIBDRUM-937
dsteelma-umd Feb 18, 2025
828ebff
LIBDEVOPS-1754. Configure AWS S3 assetstore
dsteelma-umd Feb 14, 2025
37f4d9d
Merge pull request #243 from dsteelma-umd/feature/LIBDEVOPS-1754
dsteelma-umd Feb 18, 2025
130e8ce
LIBDRUM-940. Added "openssh-client" to DRUM Docker image
dsteelma-umd Feb 20, 2025
ad16b08
Merge pull request #245 from dsteelma-umd/feature/LIBDRUM-940
dsteelma-umd Feb 20, 2025
f5fefca
LIBDRUM-939. Update version in pom.xml to "8.0-drum-2"
dsteelma-umd Feb 24, 2025
f11a312
LIBDRUM-939. Update version in pom.xml to "8.0-drum-3-SNAPSHOT"
dsteelma-umd Feb 24, 2025
5f34a15
LIBDRUM-943. Back-port merge of dspace-8_x pull request 10374
dsteelma-umd Feb 26, 2025
87f144d
LIBDRUM-943. Minor tweak to merged code to get it to compile
dsteelma-umd Feb 26, 2025
873dc11
Merge pull request #246 from dsteelma-umd/feature/LIBDRUM-943
dsteelma-umd Feb 27, 2025
b33c365
LIBDRUM-939. Update version in pom.xml to "8.0-drum-3"
dsteelma-umd Feb 28, 2025
9ddd2ba
LIBDRUM-939. Update version in pom.xml to "8.0-drum-4-SNAPSHOT"
dsteelma-umd Feb 28, 2025
89e3d1d
LIBDRUM-946. Fix checkpointing for bitstore migration
dsteelma-umd Mar 14, 2025
44d3864
LIBDRUM-947. Updated Spring Boot embedded Tomcat for CVE-2025-24813
dsteelma-umd Mar 20, 2025
57c718b
Merge pull request #248 from dsteelma-umd/feature/LIBDRUM-947
dsteelma-umd Mar 20, 2025
83153f1
LIBDRUM-948. Update version in pom.xml to "8.0-drum-4"
dsteelma-umd Mar 20, 2025
b036678
LIBDRUM-948. Update version in pom.xml to "8.0-drum-5-SNAPSHOT"
dsteelma-umd Mar 20, 2025
130b7f5
Merge pull request #247 from dsteelma-umd/feature/LIBDRUM-946
dsteelma-umd Mar 20, 2025
eb06e7d
LIBDRUM-949. Fix checkpointing for "dspace checker" command
dsteelma-umd Mar 20, 2025
902b2b2
Merge pull request #249 from dsteelma-umd/feature/LIBDRUM-949
dsteelma-umd Mar 20, 2025
0985e60
LIBDRUM-950. Update version in pom.xml to "8.0-drum-5"
dsteelma-umd Mar 21, 2025
4e50fdb
LIBDRUM-950. Update version in pom.xml to "8.0-drum-6-SNAPSHOT"
dsteelma-umd Mar 21, 2025
257f338
[CST-18963] Adds Matomo HTTP API integration
vins01-4science Feb 5, 2025
49f2587
[CST-18963] Fixes configuration and adds async client for matomo REST…
vins01-4science Feb 7, 2025
02b1612
[CST-18963] Minor fixes after PR review.
vins01-4science Feb 10, 2025
047ca0c
[CST-18963] Adds JavaDocs.
vins01-4science Feb 10, 2025
51bc084
[CST-18963] Adds missing header inside MatomoSyncEventHandlerTest
vins01-4science Feb 11, 2025
5c53223
[CST-18963] Adds matomo enricher related to the cookie that identifie…
vins01-4science Feb 21, 2025
fb2f619
[CST-18963] Refactors matomo event handler to track bitstream view
vins01-4science Feb 21, 2025
617a9a8
[CST-18963] Fixes checksyle issue
vins01-4science Feb 21, 2025
141bb9f
[CST-18963][#10435] Adds custom cookie tracking and enrichers for Mat…
vins01-4science Mar 12, 2025
337d313
[CST-18963][#10435] Fix test failures due to missing cookie on request
vins01-4science Mar 12, 2025
07854f2
[CST-18963] Adds docker-compose-matomo details
vins01-4science Mar 23, 2025
5506464
[CST-18963] PR Review
vins01-4science Mar 23, 2025
0c3c538
[CST-18963] PR Review
vins01-4science Mar 24, 2025
ded7931
[CST-18963] Fixes Test failure
vins01-4science Mar 24, 2025
9935598
[CST-18963] Adds Tests for MatomoRequestTrackerIdentifierParamEnricher
vins01-4science Mar 24, 2025
94e4df3
[CST-18963] Adds Tests for MatomoAbstractClient
vins01-4science Mar 24, 2025
9216b71
[CST-18963] Fixes checkstyle issue
vins01-4science Mar 24, 2025
0874004
[CST-18963] Fixes checkstyle issue
vins01-4science Mar 24, 2025
a997911
[CST-18963] Fixes issues with matomo on docker compose
vins01-4science Mar 26, 2025
367486c
LIBDRUM-957. Merge tag 'dspace-8.1' into feature/LIBDRUM-957
dsteelma-umd Apr 1, 2025
28a51e5
LIBDRUM-957. DSpace 8.1 updated to copied/derived files
dsteelma-umd Apr 1, 2025
466c029
LIBDRUM-957. Fixed incorrect merge in dspace-api/pom.xml
dsteelma-umd Apr 1, 2025
f63fd61
LIBDRUM-957. Suppress errorprone "BanJNDI" error in LdapServiceImpl
dsteelma-umd Apr 1, 2025
41bee81
LIBDRUM-957. Checkstyle Fixes
dsteelma-umd Apr 1, 2025
017c9c9
LIBDRUM-957. Minor update to comment in LdapServiceImpl.java
dsteelma-umd Apr 2, 2025
3e8c704
LIBDRUM-957. Updates to Dockerfile configuration for DRUM
dsteelma-umd Apr 2, 2025
509928b
LIBDRUM-957. Removed reference to DSpace pull request 10043
dsteelma-umd Apr 2, 2025
b8e60f9
LIBDRUM-957. Update Spring Boot to mitigate CVE-2025-24813
dsteelma-umd Apr 2, 2025
2e17312
LIBDRUM-957. Updated to the "DRUM Test Plan" for the local dev env
dsteelma-umd Apr 2, 2025
7b57ec8
LIBDRUM-957. Minor update to dspace/config/local.cfg.EXAMPLE
dsteelma-umd Apr 3, 2025
e9aa42c
LIBDRUM-957. Rolled back use of "dspace-8_x" Docker tag
dsteelma-umd Apr 3, 2025
a2e96ef
Merge pull request #250 from dsteelma-umd/feature/LIBDRUM-957
dsteelma-umd Apr 8, 2025
419e327
LIBDRUM-954. Merge branch 'task/dspace-8.1/CST-18965' into feature/LI…
dsteelma-umd Apr 8, 2025
5f42ba8
Merge pull request #251 from dsteelma-umd/feature/LIBDRUM-954
dsteelma-umd Apr 14, 2025
72320d7
LIBDRUM-962. UmdExtendedJsonAccessLogValve implementation
dsteelma-umd Apr 15, 2025
773b357
LIBDRUM-962. Update UmdTomcatWebServerFactoryCustomizer to use UMD valve
dsteelma-umd Apr 15, 2025
b6a9b61
LIBDRUM-962. Update DrumLogging.md with UMD custom JSON logging info
dsteelma-umd Apr 15, 2025
b7d86a5
LIBDRUM-962. Documentation updates
dsteelma-umd Apr 15, 2025
0a776f9
LIBDRUM-962. UmdExtendedJsonAccessLogValve implementation
dsteelma-umd Apr 15, 2025
14393bf
LIBDRUM-962. Update UmdTomcatWebServerFactoryCustomizer to use UMD valve
dsteelma-umd Apr 15, 2025
4fd9357
LIBDRUM-962. Update DrumLogging.md with UMD custom JSON logging info
dsteelma-umd Apr 15, 2025
56ea63b
LIBDRUM-962. Documentation updates
dsteelma-umd Apr 15, 2025
b062ac2
LIBDRUM-962. Parameterize timestamp in tests due to timezone differences
dsteelma-umd Apr 15, 2025
b09024c
LIBDRUM-962. Parameterize timestamp in tests due to timezone differences
dsteelma-umd Apr 15, 2025
7eca25b
Merge pull request #252 from dsteelma-umd/feature/LIBDRUM-962
dsteelma-umd Apr 15, 2025
449deb8
Merge pull request #253 from dsteelma-umd/feature/LIBDRUM-962-dspace-8.1
dsteelma-umd Apr 15, 2025
fc95d3e
LIBDRUM-963. Updated "dspace/bin/mail" to use DSpace mail config props
dsteelma-umd Apr 16, 2025
2d0aef5
LIBDRUM-963. Updated "dspace/bin/mail" to use DSpace mail config props
dsteelma-umd Apr 16, 2025
89a904b
Merge pull request #254 from dsteelma-umd/feature/LIBDRUM-963
dsteelma-umd Apr 16, 2025
c49a7d3
Merge pull request #255 from dsteelma-umd/feature/LIBDRUM-963-dspace-8.1
dsteelma-umd Apr 16, 2025
4258a34
LIBDRUM-971. Pin Solr version in "docker-compose" to "dspace-8_x"
dsteelma-umd May 27, 2025
9a115ac
Merge pull request #256 from dsteelma-umd/feature/LIBDRUM-971
dsteelma-umd May 27, 2025
59ecc66
LIBDRUM-964. Update load-etd logging for Log4J2 and DSpace 8.1
dsteelma-umd May 28, 2025
14d4108
LIBDRUM-964. Modified "script-mail-wrapper" to support JSON-based logs
dsteelma-umd May 28, 2025
94ff429
LIBDRUM-964. Add "jq" as a dependency to the DRUM Docker images
dsteelma-umd May 28, 2025
daa2f2d
LIBDRUM-964. Add documentation about ETD logging
dsteelma-umd May 28, 2025
beca54b
LIBDRUM-964. Added "jq" to dev Dockerfile and updated documentation
dsteelma-umd May 29, 2025
a8763fc
Merge pull request #257 from dsteelma-umd/feature/LIBDRUM-964-dspace-8.1
dsteelma-umd May 29, 2025
1549048
LIBDRUM-964. Minor fix to Dockerfile for "jq" dependency
dsteelma-umd May 29, 2025
ae5fb1d
LIBDRUM-972. Remove EtdLoader MARC Bash scripts
dsteelma-umd May 29, 2025
26f1947
LIBDRUM-972. Remove MARC and CSV genereation for EtdLoader
dsteelma-umd May 29, 2025
7a91465
Merge pull request #258 from dsteelma-umd/feature/LIBDRUM-972
dsteelma-umd May 30, 2025
8a20c96
LIBDRUM-975. Delete "start-handle-server-fg" script
dsteelma-umd Jun 2, 2025
183337a
Merge pull request #259 from dsteelma-umd/feature/LIBDRUM-975
dsteelma-umd Jun 2, 2025
35f683c
LIBDRUM-981. Merge branch 'feature/LIBDRUM-956' into drum-main
dsteelma-umd Jun 5, 2025
0166710
LIBDRUM-979. Update version in pom.xml to "8.1-drum-0"
dsteelma-umd Jun 5, 2025
3b49f7f
LIBDRUM-979. Update version in pom.xml to "8.1-drum-1-SNAPSHOT"
dsteelma-umd Jun 5, 2025
df32acf
LIBDRUM-982. Removed docker-compose/local.cfg file and UMD customization
dsteelma-umd Jun 11, 2025
2045db7
LIBDRUM-982. Updated references to “d7” Docker project to “d8”
dsteelma-umd Jun 11, 2025
7eca26b
LIBDRUM-982. Minor typo fixes
dsteelma-umd Jun 11, 2025
5ae43c2
Merge pull request #260 from dsteelma-umd/feature/LIBDRUM-982
dsteelma-umd Jun 11, 2025
422969c
bogus commit to test webhooks
alexkarp-umd Jun 27, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .github/README.md
62 changes: 32 additions & 30 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,35 +78,37 @@ jobs:
path: 'dspace/target/site/jacoco-aggregate/jacoco.xml'
retention-days: 14

# Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test
# job above. This is necessary because Codecov uploads seem to randomly fail at times.
# See https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954
codecov:
# Must run after 'tests' job above
needs: tests
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
# UMD Customization
# # Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test
# # job above. This is necessary because Codecov uploads seem to randomly fail at times.
# # See https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954
# codecov:
# # Must run after 'tests' job above
# needs: tests
# runs-on: ubuntu-latest
# steps:
# - name: Checkout
# uses: actions/checkout@v4

# Download artifacts from previous 'tests' job
- name: Download coverage artifacts
uses: actions/download-artifact@v4
# # Download artifacts from previous 'tests' job
# - name: Download coverage artifacts
# uses: actions/download-artifact@v4

# Now attempt upload to Codecov using its action.
# NOTE: We use a retry action to retry the Codecov upload if it fails the first time.
#
# Retry action: https://github.com/marketplace/actions/retry-action
# Codecov action: https://github.com/codecov/codecov-action
- name: Upload coverage to Codecov.io
uses: Wandalen/wretry.action@v1.3.0
with:
action: codecov/codecov-action@v4
# Ensure codecov-action throws an error when it fails to upload
with: |
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}
# Try re-running action 5 times max
attempt_limit: 5
# Run again in 30 seconds
attempt_delay: 30000
# # Now attempt upload to Codecov using its action.
# # NOTE: We use a retry action to retry the Codecov upload if it fails the first time.
# #
# # Retry action: https://github.com/marketplace/actions/retry-action
# # Codecov action: https://github.com/codecov/codecov-action
# - name: Upload coverage to Codecov.io
# uses: Wandalen/wretry.action@v1.3.0
# with:
# action: codecov/codecov-action@v4
# # Ensure codecov-action throws an error when it fails to upload
# with: |
# fail_ci_if_error: true
# token: ${{ secrets.CODECOV_TOKEN }}
# # Try re-running action 5 times max
# attempt_limit: 5
# # Run again in 30 seconds
# attempt_delay: 30000
# End UMD Customization
15 changes: 15 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
## UMD Customization
## Ignore temporary directories related to helper scripts
scripts/work
scripts/patches

# Ignore HTTPS certificates
dspace/src/main/docker/nginx/certs/*
!dspace/src/main/docker/nginx/certs/.keep

# Ignore database dump directory to be used with docker-compose for initializing
postgres-init/*
!postgres-init/README.md
!postgres-init/pg_restore.sh
## End UMD Customization

## Ignore the MVN compiled output directories from version tracking
target/

Expand Down
16 changes: 16 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "java",
"name": "Debug (Attach to Tomcat)",
"request": "attach",
"hostName": "localhost",
"port": 8000,
"projectName": "server"
}
]
}
9 changes: 9 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"java.configuration.updateBuildConfiguration": "automatic",
"files.exclude": {
"**/.classpath": true,
"**/.project": true,
"**/.settings": true,
"**/.factorypath": true
}
}
201 changes: 201 additions & 0 deletions DRUM-LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright {yyyy} {name of copyright owner}

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
30 changes: 28 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,19 @@
# To build with other versions, use "--build-arg JDK_VERSION=[value]"
ARG JDK_VERSION=17
# The Docker version tag to build from
ARG DSPACE_VERSION=dspace-8_x
# UMD Customization
# Continuing to use "latest" because this allows a new image to be easily
# created and pushed to the Nexus
ARG DSPACE_VERSION=latest
# End UMD Customization
# The Docker registry to use for DSpace images. Defaults to "docker.io"
# NOTE: non-DSpace images are hardcoded to use "docker.io" and are not impacted by this build argument
ARG DOCKER_REGISTRY=docker.io

# Step 1 - Run Maven Build
FROM ${DOCKER_REGISTRY}/dspace/dspace-dependencies:${DSPACE_VERSION} AS build
# UMD Customization
FROM docker.lib.umd.edu/drum-dependencies-8_x:${DSPACE_VERSION} AS build
# End UMD Customization
ARG TARGET_DIR=dspace-installer
WORKDIR /app
# The dspace-installer directory will be written to /install
Expand Down Expand Up @@ -69,5 +75,25 @@ RUN apt-get update \
EXPOSE 8080 8000
# Give java extra memory (2GB)
ENV JAVA_OPTS=-Xmx2000m

# UMD Customization
ENV TZ=America/New_York

RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
rsync \
openssh-client \
cron \
csh \
postfix \
s-nail \
libgetopt-complete-perl \
libconfig-properties-perl \
vim \
python3-lxml \
jq && \
mkfifo /var/spool/postfix/public/pickup && \
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# End UMD Customization
# On startup, run DSpace Runnable JAR
ENTRYPOINT ["java", "-jar", "webapps/server-boot.jar", "--dspace.dir=$DSPACE_INSTALL"]
16 changes: 16 additions & 0 deletions Dockerfile.ant
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# This Docker image is based on Step 2 in "Dockerfile", with some steps removed
# as they will be performed in the Dockerfiles that use this image
# (Dockerfile.dev, Dockerfile.dev-additions)
ARG JDK_VERSION=17

FROM eclipse-temurin:${JDK_VERSION} AS ant_build
# Create the initial install deployment using ANT
ENV ANT_VERSION=1.10.13
ENV ANT_HOME=/tmp/ant-$ANT_VERSION
ENV PATH=$ANT_HOME/bin:$PATH
# Download and install 'ant'
RUN mkdir $ANT_HOME && \
curl --silent --show-error --location --fail --retry 5 --output /tmp/apache-ant.tar.gz \
https://archive.apache.org/dist/ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz && \
tar -zx --strip-components=1 -f /tmp/apache-ant.tar.gz -C $ANT_HOME && \
rm /tmp/apache-ant.tar.gz
Loading
Loading