From 6220bcd9a4405299b16e0e30430670e6c52eafee Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Mon, 18 Jul 2022 13:24:00 -0500 Subject: [PATCH 1/9] Update LICENSE and NOTICE based on latest main (resync with main) --- LICENSE | 22 +++++++--------------- NOTICE | 10 ++++++++++ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/LICENSE b/LICENSE index b7cb98fe83..9972d8b086 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ -DSpace source code BSD License: +BSD 3-Clause License -Copyright (c) 2002-2020, LYRASIS. All rights reserved. +Copyright (c) 2002-2022, LYRASIS. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -13,13 +13,12 @@ notice, this list of conditions and the following disclaimer. notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -- Neither the name DuraSpace nor the name of the DSpace Foundation -nor the names of its contributors may be used to endorse or promote -products derived from this software without specific prior written -permission. +- Neither the name of the copyright holder nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, @@ -29,11 +28,4 @@ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -DAMAGE. - - -DSpace uses third-party libraries which may be distributed under -different licenses to the above. Information about these licenses -is detailed in the LICENSES_THIRD_PARTY file at the root of the source -tree. You must agree to the terms of these licenses, in addition to -the above DSpace source code license, in order to use this software. +DAMAGE. \ No newline at end of file diff --git a/NOTICE b/NOTICE index 6743fea511..010c89a4bb 100644 --- a/NOTICE +++ b/NOTICE @@ -1,3 +1,13 @@ +Licenses of Third-Party Libraries +================================= + +DSpace uses third-party libraries which may be distributed under +different licenses than specified in our LICENSE file. Information +about these licenses is detailed in the LICENSES_THIRD_PARTY file at +the root of the source tree. You must agree to the terms of these +licenses, in addition to the DSpace source code license, in order to +use this software. + Licensing Notices ================= From 349773a55c2a390f30b60b70427d586458ecac71 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Wed, 20 Jul 2022 14:19:16 -0500 Subject: [PATCH 2/9] Update DuraSpace text/links to LYRASIS. Minor updates to POM to link to GitHub Issues and Google Groups --- README | 25 ++++----- .../src/main/resources/Messages.properties | 2 +- .../rdbms/sqlmigration/oracle/README.md | 4 +- .../rdbms/sqlmigration/postgres/README.md | 2 +- .../main/webapp/xsl/core/page-structure.xsl | 2 +- .../Mirage/lib/xsl/core/page-structure.xsl | 2 +- dspace/etc/oracle/README.md | 4 +- dspace/etc/postgres/README.md | 4 +- pom.xml | 51 +++++++++---------- 9 files changed, 45 insertions(+), 51 deletions(-) diff --git a/README b/README index 5b57b13934..7cfae051ab 100644 --- a/README +++ b/README @@ -1,18 +1,16 @@ DSpace version information can be viewed online at - - https://wiki.duraspace.org/display/DSDOC/ + - https://wiki.lyrasis.org/display/DSDOC/ Documentation for the most recent stable release(s) may be downloaded or viewed online at - http://www.dspace.org/latest-release/ - - https://wiki.duraspace.org/display/DSDOC/ - - http://sourceforge.net/projects/dspace/files/DSpace%20Stable/ - (select a version and read DSpace-Manual.pdf) + - https://wiki.lyrasis.org/display/DSDOC/ Installation instructions are to be found in that documentation. In addition, a listing of all known contributors to DSpace software can be found online at: -https://wiki.duraspace.org/display/DSPACE/DSpaceContributors +https://wiki.lyrasis.org/display/DSPACE/DSpaceContributors Installation instructions for other versions may be different, so you are encouraged to obtain the appropriate version of the Documentation @@ -26,20 +24,20 @@ or just: - git clone git://github.com/DSpace/DSpace.git -Please refer any further problems to the dspace-tech@lists.sourceforge.net +Please refer any further problems to the dspace-tech@googlegroups.com mailing list. - - http://sourceforge.net/mail/?group_id=19984 + - https://groups.google.com/d/forum/dspace-tech -Detailed Issue Tracking for DSpace is done on our JIRA Issue Tracker +Detailed Issue Tracking for DSpace is done in GitHub issues - - https://jira.duraspace.org/browse/DS + - https://github.com/DSpace/DSpace/issues To contribute to DSpace, please see: - - https://wiki.duraspace.org/display/DSPACE/How+to+Contribute+to+DSpace + - https://wiki.lyrasis.org/display/DSPACE/How+to+Contribute+to+DSpace For more details about DSpace, including a list of service providers, @@ -47,8 +45,5 @@ places to seek help, news articles and lists of other users, please see: - http://www.dspace.org/ - -DSpace source code licensing information available online at: - - http://www.dspace.org/license/ - -Copyright (c) 2002-2015, DuraSpace. All rights reserved. +DSpace source code is freely available under a standard [BSD 3-Clause license](https://opensource.org/licenses/BSD-3-Clause). +The full license is available at http://www.dspace.org/license/ diff --git a/dspace-api/src/main/resources/Messages.properties b/dspace-api/src/main/resources/Messages.properties index 20dbf786a7..d23e13f024 100644 --- a/dspace-api/src/main/resources/Messages.properties +++ b/dspace-api/src/main/resources/Messages.properties @@ -599,7 +599,7 @@ jsp.home.search1 = Search jsp.home.search2 = Enter some text in the box below to search DSpace. jsp.home.title = Home jsp.layout.footer-default.feedback = Feedback -jsp.layout.footer-default.text = DSpace Software Copyright © 2002-2013  Duraspace +jsp.layout.footer-default.text = DSpace Software Copyright © 2002-2022  LYRASIS jsp.layout.footer-default.theme-by = Theme by jsp.layout.header-default.about = About DSpace Software jsp.layout.header-default.alt = DSpace diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/README.md b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/README.md index 21c0b231fd..146a0754b5 100644 --- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/README.md +++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/README.md @@ -76,14 +76,14 @@ to upper case. Oracle complains with ORA-01408 if you attempt to create an index on a column which has already had the UNIQUE contraint added (such an index is implicit in maintaining the uniqueness -of the column). See [DS-1370](https://jira.duraspace.org/browse/DS-1370) for details. +of the column). See [DS-1370](https://github.com/DSpace/DSpace/issues/4739) for details. ## Using the update-sequences.sql script The `update-sequences.sql` script in this directory may still be used to update your internal database counts if you feel they have gotten out of "sync". This may sometimes occur after large restores of content (e.g. when using the DSpace -[AIP Backup and Restore](https://wiki.duraspace.org/display/DSDOC5x/AIP+Backup+and+Restore) +[AIP Backup and Restore](https://wiki.lyrasis.org/display/DSDOC5x/AIP+Backup+and+Restore) feature). This `update-sequences.sql` script can be executed by running diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/README.md b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/README.md index 1b87efbd3f..cc8d0ae85e 100644 --- a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/README.md +++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/README.md @@ -22,7 +22,7 @@ Please see the Flyway Documentation for more information: http://flywaydb.org/ The `update-sequences.sql` script in this directory may still be used to update your internal database counts if you feel they have gotten out of "sync". This may sometimes occur after large restores of content (e.g. when using the DSpace -[AIP Backup and Restore](https://wiki.duraspace.org/display/DSDOC5x/AIP+Backup+and+Restore) +[AIP Backup and Restore](https://wiki.lyrasis.org/display/DSDOC5x/AIP+Backup+and+Restore) feature). This `update-sequences.sql` script can be executed by running diff --git a/dspace-xmlui-mirage2/src/main/webapp/xsl/core/page-structure.xsl b/dspace-xmlui-mirage2/src/main/webapp/xsl/core/page-structure.xsl index 85ecd49637..040bac45de 100644 --- a/dspace-xmlui-mirage2/src/main/webapp/xsl/core/page-structure.xsl +++ b/dspace-xmlui-mirage2/src/main/webapp/xsl/core/page-structure.xsl @@ -695,7 +695,7 @@
- DSpace software copyright © 2002-2015  DuraSpace + DSpace software copyright © 2002-2022  LYRASIS
diff --git a/dspace-xmlui/src/main/webapp/themes/Mirage/lib/xsl/core/page-structure.xsl b/dspace-xmlui/src/main/webapp/themes/Mirage/lib/xsl/core/page-structure.xsl index 34bd2e3f46..8fc18b02c3 100644 --- a/dspace-xmlui/src/main/webapp/themes/Mirage/lib/xsl/core/page-structure.xsl +++ b/dspace-xmlui/src/main/webapp/themes/Mirage/lib/xsl/core/page-structure.xsl @@ -584,7 +584,7 @@