hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 23:13:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,355 Commits 32 Branches 125 Tags
36c042bc98fc932f21bdd938e205f99fa30e4dc9
Commit Graph

17355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Donohue
68e80b92f0 Merge pull request #9137 from DSpace/backport-9135-to-dspace-7_x 
[Port dspace-7_x] Bump org.json:json from 20230227 to 20231013 in /dspace-api
 2023-10-20 15:55:16 -05:00
dependabot[bot]
ad7f506b2b Bump org.json:json from 20230227 to 20231013 in /dspace-api 
Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20230227 to 20231013.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 11a08f1ac0)
 2023-10-20 20:16:32 +00:00
Tim Donohue
1e28df7998 Merge pull request #9134 from tdonohue/port_9117 
[Port dspace-7_x] Bump org.eclipse.jetty:jetty-http
 2023-10-20 09:56:39 -05:00
dependabot[bot]
8028304513 Bump org.eclipse.jetty:jetty-http 
Bumps [org.eclipse.jetty:jetty-http](https://github.com/eclipse/jetty.project) from 9.4.52.v20230823 to 9.4.53.v20231009.
- [Release notes](https://github.com/eclipse/jetty.project/releases)
- [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.52.v20230823...jetty-9.4.53.v20231009)

---
updated-dependencies:
- dependency-name: org.eclipse.jetty:jetty-http
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-19 16:48:08 -05:00
Tim Donohue
fb2162b6a0 Merge pull request #9133 from DSpace/backport-9121-to-dspace-7_x 
[Port dspace-7_x] oai_openaire.xsl : change resourceTypeGeneral for thesis
 2023-10-19 13:51:55 -05:00
Marie-Hélène Vézina
dd976b693a oai_openaire.xsl : change resourceTypeGeneral for thesis 
Thesis are "Literature" resource type (resourceTypeGeneral), not "other research product"

ref:
https://github.com/openaire/guidelines-literature-repositories/issues/43#issuecomment-1318262914
and
https://api.openaire.eu/vocabularies/dnet:result_typologies/publication

(cherry picked from commit 669ff34350)
 2023-10-19 17:34:06 +00:00
Koen Pauwels
252941046a Merge remote-tracking branch 'dspace/dspace-7_x' into backport-9019-to-dspace-7_x 2023-10-18 15:44:45 +02:00
Alan Orth
807168b77c Merge pull request #9128 from DSpace/backport-9110-to-dspace-7_x 
[Port dspace-7_x] #8585 Add submitter information to provenance metadata
 2023-10-17 12:52:11 +03:00
Alan Orth
c032f3a041 dspace-api: fix misaligned comment 
(cherry picked from commit 4fba787322)
 2023-10-17 09:00:26 +00:00
Adán Román Ruiz
0ddebd926f 8585 - added provenance to metadata-import and itemImport 
(cherry picked from commit ea6307dcc6)
 2023-10-17 09:00:26 +00:00
Adán Román Ruiz
668b5b24df #8585 Add submitter information to provenance metadata 
(cherry picked from commit c15ac0eb4a)
 2023-10-17 09:00:26 +00:00
Mark H. Wood
c8e4a0fd90 Define _version_ 2023-10-12 16:45:48 -04:00
kshepherd
4a3b9c1e47 Merge pull request #9111 from DSpace/backport-9101-to-dspace-7_x 
[Port dspace-7_x] 8968 - request-a-copy email: non ASCII characters are encoded as HTML…
 2023-10-10 13:47:06 +13:00
Adán Román Ruiz
d957dc2007 checkstiye 
(cherry picked from commit d12fbe2c34)
 2023-10-09 23:50:52 +00:00
Adán Román Ruiz
11dc69ac34 8968 - implementated using HtmlUtils scaping 
(cherry picked from commit 090beedb6f)
 2023-10-09 23:50:52 +00:00
Adán Román Ruiz
36ad3de11f checkstyle 
(cherry picked from commit 2c2b3b18dc)
 2023-10-09 23:50:52 +00:00
Adán Román Ruiz
8d4fd1ce6c 8968 - added custom StringEscapper 
(cherry picked from commit 103c8ee757)
 2023-10-09 23:50:52 +00:00
aroman-arvo
e4d54bba27 unused import 
(cherry picked from commit bf6e042085)
 2023-10-09 23:50:52 +00:00
aroman-arvo
2b25321362 8968 - request-a-copy email: non ASCII characters are encoded as HTML character entity references 
(cherry picked from commit db36d5eeae)
 2023-10-09 23:50:52 +00:00
Alan Orth
851123b956 Merge pull request #9098 from kshepherd/bugfix/handleprovider_class_cast_7x 
Additional Item class cast fixes in handle providers
 2023-10-03 13:08:04 +03:00
Tim Donohue
8160f7ccd6 Merge pull request #9102 from DSpace/backport-9100-to-dspace-7_x 
[Port dspace-7_x] Remove Oracle script that accidentally made it in via #8800
 2023-10-02 12:40:30 -05:00
Tim Donohue
1c1266b855 Remove Oracle script that accidentally made it in via #8800 
(cherry picked from commit 5e04edf41e)
 2023-10-02 16:56:27 +00:00
Kim Shepherd
33d2ee961d Additional Item class cast fixes in handle providers 
DSOs were not properly checked if they were instanceof Item before
attempting the cast in HandleIdentifierProvider and
VersionedHandleIdentifierProviderWithCanonicalHandles
 2023-10-02 17:57:08 +13:00
Tim Donohue
d6e5074c5b Merge pull request #9090 from DSpace/backport-8926-to-dspace-7_x 
[Port dspace-7_x] OAI: add support to extract embargo from bitstreams
 2023-09-22 12:37:32 -05:00
Agustina Martinez
572ebb5b27 DefaultAccessStatusHelper: getEmbargoFromItem return null embargo if status than embargo 
(cherry picked from commit e05e73a112)
 2023-09-22 16:01:17 +00:00
Agustina Martinez
a211edaeb2 Remove currently unused customisation of ItemUtils 
(cherry picked from commit 490a982e80)
 2023-09-22 16:01:17 +00:00
Agustina Martinez
db733101b6 DefaultAccessStatusHelper: fix logic to take shortest embargo 
(cherry picked from commit d17ef09082)
 2023-09-22 16:01:17 +00:00
Agustina Martinez
9a51fb8768 uketd_dc.xsl: also expose access-status if embargo or restricted 
(cherry picked from commit 4b40872a6d)
 2023-09-22 16:01:17 +00:00
Agustina Martinez
08e82ebf28 ItemUtils.java: refactored addEmbargoField 
(cherry picked from commit 291afa765d)
 2023-09-22 16:01:17 +00:00
Agustina Martinez
d154936a3d Add null check 
(cherry picked from commit 0de4c3945e)
 2023-09-22 16:01:17 +00:00
Agustina Martinez
31251183f3 Fix style issues 
(cherry picked from commit 6e2c8a4ae0)
 2023-09-22 16:01:17 +00:00
Agustina Martinez
beaf40dd9b Fix style issues 
(cherry picked from commit 724a4ffb0e)
 2023-09-22 16:01:17 +00:00
Agustina Martinez
f330e36528 Remove unused imports 
(cherry picked from commit 4bd2cfdf0f)
 2023-09-22 16:01:17 +00:00
Agustina Martinez
f88207792a Refactored access-status to include embargo date based on the DefaultAccessStatusHelper logic (look at primary or first bitstream) 
(cherry picked from commit 895926f021)
 2023-09-22 16:01:17 +00:00
Agustina Martinez
3f5bfe4aa4 ItemUtils.java: improved method to account for multiple embargo policies and select the longest embargo 
(cherry picked from commit 538be7f09b)
 2023-09-22 16:01:17 +00:00
Agustina Martinez
c5ca59f2e5 ItemUtils.java: added method doc 
(cherry picked from commit 51e60fbcf9)
 2023-09-22 16:01:17 +00:00
Agustina Martinez
c711d2d944 OAI: add support to extract embargo from bitstreams and expose it in OAI metadata 
(cherry picked from commit db81d758a9)
 2023-09-22 16:01:17 +00:00
Tim Donohue
dd09fd7a7d Merge pull request #9079 from TexasDigitalLibrary/DS-3994-7_x 
[Port dspace-7_x] DS-3994: fix logical bug when checking if field is controlled authority
 2023-09-21 10:51:38 -05:00
Alan Orth
57fa641105 Merge pull request #9082 from TexasDigitalLibrary/DS-7936-7_x 
[Port dspace-7_x] DS-7936: remove optimize option (-o) from oai import
 2023-09-20 08:13:15 +03:00
nwoodward
8027d3b305 added authorization check for license bitstream in OAI import 2023-09-19 16:03:22 -05:00
nwoodward
2667b8d187 remove optimize option from oai import 2023-09-19 15:43:29 -05:00
nwoodward
8271c4d07b fix logical bug when checking if field is controlled authority 2023-09-18 15:34:23 -05:00
Tim Donohue
88f4cdafcf Merge pull request #9077 from DSpace/backport-9067-to-dspace-7_x 
[Port dspace-7_x] Remove 'cross join' from count query in `update-handle-prefix` script
 2023-09-15 09:56:33 -05:00
Tim Donohue
f23fd92928 Merge pull request #9072 from DSpace/backport-9068-to-dspace-7_x 
[Port dspace-7_x] Fix ClassCastException (Collection cannot be cast to Item) in some Handle classes which cause random IT failures
 2023-09-15 09:55:01 -05:00
Tim Donohue
e757b9d9f4 Remove 'cross join' from count query. Updates "countHandlesByPrefix" to use a query similar to existing "findByPrefix" 
(cherry picked from commit 14223bd712)
 2023-09-15 14:38:12 +00:00
Hrafn Malmquist
4dedb3cf41 Merge pull request #9073 from DSpace/backport-9041-to-dspace-7_x 
[Port dspace-7_x] Avoid double slashes in sitemap paths.
 2023-09-15 12:52:59 +01:00
Mark H. Wood
7b2b8db512 Avoid double slashes in sitemap paths. 
(cherry picked from commit eae4463eaa)
 2023-09-15 09:22:37 +00:00
Tim Donohue
42e2e4b0c8 Fix checkstyle. Correct grammar of comment while doing so. 
(cherry picked from commit ffa2683c63)
 2023-09-14 18:01:23 +00:00
Tim Donohue
d965057854 Fix ClassCastException (Collection cannot be cast to Item) in Handle identifier classes 
(cherry picked from commit 1271374d37)
 2023-09-14 18:01:23 +00:00
Tim Donohue
5a91da6f0e Merge pull request #9065 from DSpace/backport-8828-to-dspace-7_x 
[Port dspace-7_x] Add a "container friendly" log4j2 cfg and output compose dspace log to console
 2023-09-13 09:34:23 -05:00