LIBDRUM-1026. Upgrade to DSpace 8.4#273
Merged
Merged
Conversation
…nload has a tendency to fail randomly in automated Docker builds. (cherry picked from commit d2abf0f)
[Port dspace-8_x] [Docker] Install Apache Ant via `apt-get` instead of manual download.
…_x/org.checkerframework-checker-qual-3.53.1 build(deps): bump org.checkerframework:checker-qual from 3.53.0 to 3.53.1
…_x/jakarta-67cb3e7486 build(deps): bump jakarta.xml.bind:jakarta.xml.bind-api from 4.0.4 to 4.0.5 in the jakarta group
Bumps the spring group with 13 updates: | Package | From | To | | --- | --- | --- | | [org.springframework:spring-orm](https://github.com/spring-projects/spring-framework) | `6.2.15` | `6.2.16` | | [org.springframework:spring-core](https://github.com/spring-projects/spring-framework) | `6.2.15` | `6.2.16` | | [org.springframework:spring-beans](https://github.com/spring-projects/spring-framework) | `6.2.15` | `6.2.16` | | [org.springframework:spring-aop](https://github.com/spring-projects/spring-framework) | `6.2.15` | `6.2.16` | | [org.springframework:spring-context](https://github.com/spring-projects/spring-framework) | `6.2.15` | `6.2.16` | | [org.springframework:spring-context-support](https://github.com/spring-projects/spring-framework) | `6.2.15` | `6.2.16` | | [org.springframework:spring-tx](https://github.com/spring-projects/spring-framework) | `6.2.15` | `6.2.16` | | [org.springframework:spring-jdbc](https://github.com/spring-projects/spring-framework) | `6.2.15` | `6.2.16` | | [org.springframework:spring-web](https://github.com/spring-projects/spring-framework) | `6.2.15` | `6.2.16` | | [org.springframework:spring-webmvc](https://github.com/spring-projects/spring-framework) | `6.2.15` | `6.2.16` | | [org.springframework:spring-expression](https://github.com/spring-projects/spring-framework) | `6.2.15` | `6.2.16` | | [org.springframework:spring-test](https://github.com/spring-projects/spring-framework) | `6.2.15` | `6.2.16` | | [org.springframework.ldap:spring-ldap-core](https://github.com/spring-projects/spring-ldap) | `3.3.5` | `3.3.6` | Updates `org.springframework:spring-orm` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-core` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-beans` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-aop` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-context` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-context-support` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-tx` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-jdbc` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-web` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-webmvc` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-expression` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-test` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-core` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-beans` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-aop` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-context` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-context-support` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework.ldap:spring-ldap-core` from 3.3.5 to 3.3.6 - [Release notes](https://github.com/spring-projects/spring-ldap/releases) - [Changelog](https://github.com/spring-projects/spring-ldap/blob/main/changelog.txt) - [Commits](spring-projects/spring-ldap@3.3.5...3.3.6) Updates `org.springframework:spring-tx` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-jdbc` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-web` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-webmvc` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-expression` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) Updates `org.springframework:spring-test` from 6.2.15 to 6.2.16 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v6.2.15...v6.2.16) --- updated-dependencies: - dependency-name: org.springframework:spring-orm dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-core dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-beans dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-aop dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-context dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-context-support dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-tx dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-jdbc dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-web dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-webmvc dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-expression dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-test dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-core dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-beans dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-aop dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-context dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-context-support dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.ldap:spring-ldap-core dependency-version: 3.3.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-tx dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-jdbc dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-web dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-webmvc dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-expression dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-test dependency-version: 6.2.16 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.9 to 42.7.10. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](pgjdbc/pgjdbc@REL42.7.9...REL42.7.10) --- updated-dependencies: - dependency-name: org.postgresql:postgresql dependency-version: 42.7.10 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps the amazon-s3 group with 2 updates: software.amazon.awssdk:s3 and [software.amazon.awssdk.crt:aws-crt](https://github.com/awslabs/aws-crt-java). Updates `software.amazon.awssdk:s3` from 2.41.14 to 2.41.24 Updates `software.amazon.awssdk.crt:aws-crt` from 0.42.2 to 0.43.1 - [Release notes](https://github.com/awslabs/aws-crt-java/releases) - [Commits](awslabs/aws-crt-java@v0.42.2...v0.43.1) --- updated-dependencies: - dependency-name: software.amazon.awssdk:s3 dependency-version: 2.41.24 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: amazon-s3 - dependency-name: software.amazon.awssdk.crt:aws-crt dependency-version: 0.43.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: amazon-s3 ... Signed-off-by: dependabot[bot] <support@github.com>
jboss-logging is a transitive dependency and it causes dependency convergence errors because various hibernate components pull in different versions. We should be pinning this to the same version used by the hibernate parent and disabling dependabot updates for it. See: https://github.com/hibernate/hibernate-orm/blob/6.4/settings.gradle#L74 (cherry picked from commit 5168e81)
[Port dspace-8_x] Pin jboss-logging version
…_x/org.postgresql-postgresql-42.7.10 build(deps): bump org.postgresql:postgresql from 42.7.9 to 42.7.10
…_x/spring-f74a7fb233 build(deps): bump the spring group with 13 updates
…_x/amazon-s3-2ed27dae15 build(deps): bump the amazon-s3 group with 2 updates
…core. Older spring-jcl exclusions can now be removed as they all inherit via spring-core (cherry picked from commit 5a7d4a9)
[Port dspace-8_x] [Docker] Fix `docker-deploy` issues with running Handle Server by excluding `spring-jcl` from classpath
Co-authored-by: abhinav <abhinav.sidharthan@atmire.com>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3 to 4. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@v3...v4) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v4...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…12034) Bumps [actions/add-to-project](https://github.com/actions/add-to-project) from 1.0.0 to 1.0.2. - [Release notes](https://github.com/actions/add-to-project/releases) - [Commits](actions/add-to-project@v1.0.0...v1.0.2) --- updated-dependencies: - dependency-name: actions/add-to-project dependency-version: 1.0.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps the amazon-s3 group with 2 updates: software.amazon.awssdk:s3 and [software.amazon.awssdk.crt:aws-crt](https://github.com/awslabs/aws-crt-java). Updates `software.amazon.awssdk:s3` from 2.41.28 to 2.41.33 Updates `software.amazon.awssdk.crt:aws-crt` from 0.43.1 to 0.43.4 - [Release notes](https://github.com/awslabs/aws-crt-java/releases) - [Commits](awslabs/aws-crt-java@v0.43.1...v0.43.4) --- updated-dependencies: - dependency-name: software.amazon.awssdk:s3 dependency-version: 2.41.33 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: amazon-s3 - dependency-name: software.amazon.awssdk.crt:aws-crt dependency-version: 0.43.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: amazon-s3 ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps the spring group with 13 updates: | Package | From | To | | --- | --- | --- | | [org.springframework.boot:spring-boot-starter-test](https://github.com/spring-projects/spring-boot) | `3.5.10` | `3.5.11` | | [org.springframework.boot:spring-boot-starter-tomcat](https://github.com/spring-projects/spring-boot) | `3.5.10` | `3.5.11` | | [org.springframework.boot:spring-boot-maven-plugin](https://github.com/spring-projects/spring-boot) | `3.5.10` | `3.5.11` | | [org.springframework.boot:spring-boot-starter-cache](https://github.com/spring-projects/spring-boot) | `3.5.10` | `3.5.11` | | [org.springframework.boot:spring-boot-starter](https://github.com/spring-projects/spring-boot) | `3.5.10` | `3.5.11` | | [org.springframework.boot:spring-boot-starter-thymeleaf](https://github.com/spring-projects/spring-boot) | `3.5.10` | `3.5.11` | | [org.springframework.boot:spring-boot-starter-web](https://github.com/spring-projects/spring-boot) | `3.5.10` | `3.5.11` | | [org.springframework.boot:spring-boot-starter-data-rest](https://github.com/spring-projects/spring-boot) | `3.5.10` | `3.5.11` | | [org.springframework.boot:spring-boot-starter-security](https://github.com/spring-projects/spring-boot) | `3.5.10` | `3.5.11` | | [org.springframework.boot:spring-boot-starter-aop](https://github.com/spring-projects/spring-boot) | `3.5.10` | `3.5.11` | | [org.springframework.boot:spring-boot-starter-actuator](https://github.com/spring-projects/spring-boot) | `3.5.10` | `3.5.11` | | [org.springframework.boot:spring-boot-starter-log4j2](https://github.com/spring-projects/spring-boot) | `3.5.10` | `3.5.11` | | [org.springframework.security:spring-security-test](https://github.com/spring-projects/spring-security) | `6.5.7` | `6.5.8` | Updates `org.springframework.boot:spring-boot-starter-test` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-starter-tomcat` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-starter-cache` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-starter` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-starter-thymeleaf` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-starter-web` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-starter-data-rest` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-starter-security` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-starter-aop` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-starter-actuator` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-starter-log4j2` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-starter-tomcat` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.security:spring-security-test` from 6.5.7 to 6.5.8 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](spring-projects/spring-security@6.5.7...6.5.8) Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-starter-cache` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-starter` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-starter-thymeleaf` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-starter-web` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-starter-data-rest` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-starter-security` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-starter-aop` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-starter-actuator` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) Updates `org.springframework.boot:spring-boot-starter-log4j2` from 3.5.10 to 3.5.11 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.5.10...v3.5.11) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-test dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-tomcat dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-maven-plugin dependency-version: 3.5.11 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-cache dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-thymeleaf dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-web dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-data-rest dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-security dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-aop dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-actuator dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-log4j2 dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-tomcat dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.security:spring-security-test dependency-version: 6.5.8 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-maven-plugin dependency-version: 3.5.11 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-cache dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-thymeleaf dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-web dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-data-rest dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-security dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-aop dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-actuator dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-log4j2 dependency-version: 3.5.11 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4 to 5. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](actions/setup-java@v4...v5) --- updated-dependencies: - dependency-name: actions/setup-java dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [korthout/backport-action](https://github.com/korthout/backport-action) from 2 to 4. - [Release notes](https://github.com/korthout/backport-action/releases) - [Commits](korthout/backport-action@v2...v4) --- updated-dependencies: - dependency-name: korthout/backport-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps the build-tools group with 4 updates: [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin), [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire), [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) and [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin). Updates `org.apache.maven.plugins:maven-compiler-plugin` from 3.14.1 to 3.15.0 - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](apache/maven-compiler-plugin@maven-compiler-plugin-3.14.1...maven-compiler-plugin-3.15.0) Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.5.4 to 3.5.5 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.5.4...surefire-3.5.5) Updates `org.apache.maven.plugins:maven-failsafe-plugin` from 3.5.4 to 3.5.5 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.5.4...surefire-3.5.5) Updates `org.apache.maven.plugins:maven-dependency-plugin` from 3.9.0 to 3.10.0 - [Release notes](https://github.com/apache/maven-dependency-plugin/releases) - [Commits](apache/maven-dependency-plugin@maven-dependency-plugin-3.9.0...maven-dependency-plugin-3.10.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-version: 3.15.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: build-tools - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-version: 3.5.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: build-tools - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-version: 3.5.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: build-tools - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-version: 3.10.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: build-tools ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps the fasterxml group with 3 updates: [com.fasterxml.jackson.core:jackson-core](https://github.com/FasterXML/jackson-core), [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) and com.fasterxml.jackson.datatype:jackson-datatype-jsr310. Updates `com.fasterxml.jackson.core:jackson-core` from 2.21.0 to 2.21.1 - [Commits](FasterXML/jackson-core@jackson-core-2.21.0...jackson-core-2.21.1) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.21.0 to 2.21.1 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.21.0 to 2.21.1 Updates `com.fasterxml.jackson.core:jackson-databind` from 2.21.0 to 2.21.1 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.21.0 to 2.21.1 --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-core dependency-version: 2.21.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: fasterxml - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-version: 2.21.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: fasterxml - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 dependency-version: 2.21.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: fasterxml - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-version: 2.21.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: fasterxml - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 dependency-version: 2.21.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: fasterxml ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v5...v6) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [Wandalen/wretry.action](https://github.com/wandalen/wretry.action) from 1.3.0 to 3.8.0. - [Release notes](https://github.com/wandalen/wretry.action/releases) - [Commits](Wandalen/wretry.action@v1.3.0...v3.8.0) --- updated-dependencies: - dependency-name: Wandalen/wretry.action dependency-version: 3.8.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…am-metadata DSpace#12039 (cherry picked from commit c301804)
[Port dspace-8_x] Fix bitstream dc.description to be non-repeatable in submission forms DSpace#12039
…/dspace-8_x/github/codeql-action-4 build(deps): bump github/codeql-action from 3 to 4
(cherry picked from commit 95dc453)
…_validation-8_x [Port dspace-8_x] ORE aggregated resource URI validation
[Port dspace-8_x] Application hardening: filter requests for JSPs and other unwanted patterns
…_config-8_x [Port dspace-8_x] Velocity template engine configuration improvements
Includes some central validation that other classes can make use of. However, it may be overly restrictive. And we may need to allow multiple separate absolute base paths for each config?
# Conflicts: # dspace-api/src/main/java/org/dspace/core/LDN.java
(cherry picked from commit 6437472)
(cherry picked from commit 00e4979)
…ent-8_x [Port dspace-8_x] LDN and Curation I/O improvements
[maven-release-plugin] copy for tag dspace-8.4
dsteelma-umd
changed the title
Updated files copied or derived from stock DSpace files to reflect any changes in their stock DSpace 8.4 counterparts. https://umd-dit.atlassian.net/browse/LIBDRUM-1026
Updated the timezone from "IST" to "UTC" in EtdLoaderTest, in order for the test to pass. This change is likely necessary because of the addition of the “setDefaultTimeZone” method in dspace-server-webapp/src/main/java/org/dspace/app/rest/WebApplication.java, which defaults the timezone to UTC. See DSpace@c8ee72c https://umd-dit.atlassian.net/browse/LIBDRUM-1026
Fixed test failure in UmdExtendedJsonAccessLogValveTest.java: ``` [ERROR] org.dspace.app.UmdExtendedJsonAccessLogValveTest.testCommonLogFileFormat -- Time elapsed: 0.013 s <<< ERROR! java.lang.NullPointerException: temporal at java.base/java.util.Objects.requireNonNull(Objects.java:235) at java.base/java.time.Instant.from(Instant.java:373) at org.apache.catalina.valves.AbstractAccessLogValve$DateAndTimeElement.addElement(AbstractAccessLogValve.java:1107) at org.apache.catalina.valves.JsonAccessLogValve$JsonWrappedElement.addElement(JsonAccessLogValve.java:264) at org.apache.catalina.valves.AbstractAccessLogValve.log(AbstractAccessLogValve.java:672) at org.dspace.app.UmdExtendedJsonAccessLogValveTest.simulateRequest(UmdExtendedJsonAccessLogValveTest.java:269) at org.dspace.app.UmdExtendedJsonAccessLogValveTest.simulateRequest(UmdExtendedJsonAccessLogValveTest.java:219) ... ``` by mocking the `getStartInstant()` method in the request object to return the epoch start. Also in the `log` method call, changed "bytes" the "requestDuration", set to an arbitrary value, because the method signature indicates that it is expecting the time spent on the request, not the number of bytes (it is unclear why this was initially thought to be bytes). https://umd-dit.atlassian.net/browse/LIBDRUM-1026
The org.dspace.storage.bitstore.S3BitStoreServiceIT test consistently fails in Jenkins with: ``` java.lang.IllegalStateException: Could not find a valid Docker environment. Please see logs and check configuration at org.testcontainers.dockerclient.DockerClientProviderStrategy.lambda$getFirstValidStrategy$7(DockerClientProviderStrategy.java:274) at java.base/java.util.Optional.orElseThrow(Optional.java:403) at org.testcontainers.dockerclient.DockerClientProviderStrategy.getFirstValidStrategy(DockerClientProviderStrategy.java:265) at org.testcontainers.DockerClientFactory.getOrInitializeStrategy(DockerClientFactory.java:154) at org.testcontainers.DockerClientFactory.client(DockerClientFactory.java:196) at org.testcontainers.DockerClientFactory$1.getDockerClient(DockerClientFactory.java:108) at com.github.dockerjava.api.DockerClientDelegate.authConfig(DockerClientDelegate.java:111) at org.testcontainers.containers.GenericContainer.start(GenericContainer.java:316) at org.dspace.storage.bitstore.S3BitStoreServiceIT.setupS3(S3BitStoreServiceIT.java:85) ... ``` See DSpace PR 11900 for discussion. While there is a fix in DSpace 8.4 (see DSpace PR 11901), this does not seem to work in Jenkins. From a comment in DSpace PR 11900: > It seems like this testcontainers dependency is just not fully > "stable" in all developer environments. I wish there was something > else we could switch to, but I don't have another option. Attempted a workaround by adding a `DOCKER_API_VERSION=1.44` into Jenkins, but it did not seem to work. https://umd-dit.atlassian.net/browse/LIBDRUM-1026
dsteelma-umd
force-pushed
the
feature/LIBDRUM-1026
branch
from
37f2a03 to
2d33381
Compare
Removed creation of the "/var/spool/postfix/public/pickup" directory used by Postfix in sending emails, because: * It was causing the "Dockerfile.dev" Docker image build to fail * The directory should be automatically created by the `apt-get install` of postfix Also updated the instructions in "DockerDevelopmentEnvironment.md" that included the directory creation when adding email handling to the "Dockerfile.dev-additons" Docker image. Testing with Docker images created without the creation command confirmed the command was not needed. https://umd-dit.atlassian.net/browse/LIBDRUM-1026
dsteelma-umd
force-pushed
the
feature/LIBDRUM-1026
branch
from
3514ee5 to
e0e98d1
Compare
Updated "Dockerfile.dev-additions" to use the "dspace__P__dir" environment variable, instead of "DSPACE_INSTALL", following the example in "Dockerfile" and "Dockerfile.dev". https://umd-dit.atlassian.net/browse/LIBDRUM-1026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
Merge changes from DSpace 8.4 ("dspace-8.4" tag) into DRUM.
https://umd-dit.atlassian.net/browse/LIBDRUM-1026