Skip to content

PR for v1.2.3 #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 139 commits into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
3737f39
Fixed typo that may cause returning REVOKED resource to unprivileged …
ThomasJejkal Apr 23, 2024
af91c2b
Merge pull request #286 from kit-data-manager/issue-285-Search_for_st…
ThomasJejkal Apr 23, 2024
d08805e
Bump com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider
dependabot[bot] May 6, 2024
6e991e6
Bump io.spring.dependency-management from 1.1.4 to 1.1.5
dependabot[bot] May 6, 2024
6015b31
Bump com.fasterxml.jackson.module:jackson-module-afterburner
dependabot[bot] May 6, 2024
dcca529
Merge pull request #292 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] May 8, 2024
08c83c6
Merge pull request #290 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] May 8, 2024
e794f92
Merge branch 'development' into dependabot/gradle/development/com.fas…
ThomasJejkal May 8, 2024
f8eaadc
Bump com.fasterxml.jackson.datatype:jackson-datatype-jsr310
dependabot[bot] May 8, 2024
dad8d34
Merge pull request #289 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] May 8, 2024
bbbdc9e
Merge pull request #291 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] May 8, 2024
951e592
Bump com.fasterxml.jackson.datatype:jackson-datatype-joda
dependabot[bot] May 8, 2024
86ecf23
Merge pull request #288 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] May 8, 2024
f90ae48
Bump org.owasp.dependencycheck from 9.1.0 to 9.2.0
dependabot[bot] May 20, 2024
914fa39
Merge pull request #294 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] May 20, 2024
f17a46f
Bump org.javers:javers-spring-boot-starter-sql from 7.4.2 to 7.4.3
dependabot[bot] May 27, 2024
7b56f0e
Merge pull request #296 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] May 28, 2024
6ffe5af
Bump org.javers:javers-spring-boot-starter-sql from 7.4.3 to 7.4.6
dependabot[bot] Jun 17, 2024
71a3aa4
Merge pull request #298 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Jun 20, 2024
3ebea93
Bump org.javers:javers-spring-boot-starter-sql from 7.4.6 to 7.5.0
dependabot[bot] Jun 24, 2024
84ab27b
Bump com.fasterxml.jackson.datatype:jackson-datatype-jsr310
dependabot[bot] Jul 8, 2024
36125fa
Create PR for #304
github-actions[bot] Jul 16, 2024
a5a9995
Fix wrong error message while updating with missing publisher.
VolkerHartmann Jul 16, 2024
b08662b
Merge pull request #299 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Jul 17, 2024
335c33e
Added alternative maven repository for jfrog plugin
ThomasJejkal Jul 17, 2024
75ad8fb
Removed jfrog.bintray plugin to get rid of broken
ThomasJejkal Jul 17, 2024
4236075
Merge pull request #305 from kit-data-manager/issue-304-Error_message…
VolkerHartmann Jul 17, 2024
610388a
Bump org.owasp.dependencycheck from 9.2.0 to 10.0.3
dependabot[bot] Jul 17, 2024
240d00e
Bump springDocVersion from 2.5.0 to 2.6.0
dependabot[bot] Jul 17, 2024
857b6c7
Merge pull request #300 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Jul 17, 2024
25dbdb8
Merge pull request #301 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Jul 17, 2024
fb086bf
Bump com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider
dependabot[bot] Jul 17, 2024
774a826
Merge pull request #303 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Jul 17, 2024
07400ac
Merge pull request #306 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Jul 17, 2024
80d8831
Bump com.h2database:h2 from 2.2.224 to 2.3.230
dependabot[bot] Jul 22, 2024
4eace62
Bump com.fasterxml.jackson.module:jackson-module-afterburner
dependabot[bot] Jul 22, 2024
5cbad5b
Bump org.asciidoctor.jvm.convert from 4.0.2 to 4.0.3
dependabot[bot] Jul 22, 2024
e456554
Merge pull request #311 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Jul 28, 2024
c041d76
Merge pull request #310 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Jul 28, 2024
95a40bd
Merge pull request #307 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Jul 28, 2024
ffb0454
Bump com.fasterxml.jackson.datatype:jackson-datatype-joda
dependabot[bot] Jul 28, 2024
69e5d39
Bump io.spring.dependency-management from 1.1.5 to 1.1.6
dependabot[bot] Jul 28, 2024
ca8e8b6
Merge pull request #309 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Jul 28, 2024
1d03052
Merge pull request #308 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Jul 28, 2024
96bf845
Bump org.javers:javers-spring-boot-starter-sql from 7.5.0 to 7.6.1
dependabot[bot] Aug 5, 2024
677cd10
Bump actions/setup-java from 4.2.1 to 4.2.2
dependabot[bot] Aug 12, 2024
e26402a
Bump com.h2database:h2 from 2.3.230 to 2.3.232
dependabot[bot] Aug 19, 2024
f8bcf51
Bump io.freefair.maven-publish-java from 8.6 to 8.10
dependabot[bot] Aug 26, 2024
01973ec
Bump io.freefair.lombok from 8.6 to 8.10
dependabot[bot] Aug 26, 2024
9176b48
Merge pull request #313 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Aug 26, 2024
6a445f0
Merge pull request #314 from kit-data-manager/dependabot/github_actio…
dependabot[bot] Aug 26, 2024
a60eb49
Merge pull request #317 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Aug 26, 2024
717b86f
Merge pull request #318 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Aug 26, 2024
388afd8
Merge branch 'development' into dependabot/gradle/development/io.free…
VolkerHartmann Aug 26, 2024
908f555
Bump org.postgresql:postgresql from 42.7.3 to 42.7.4
dependabot[bot] Aug 26, 2024
eec9450
Merge pull request #319 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Aug 26, 2024
aa1cf4a
Merge pull request #320 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Aug 26, 2024
214a505
Bump org.owasp.dependencycheck from 10.0.3 to 10.0.4
dependabot[bot] Sep 2, 2024
4a93c28
Merge pull request #321 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Sep 5, 2024
4eec030
Bump actions/setup-java from 4.2.2 to 4.3.0
dependabot[bot] Sep 16, 2024
7acadea
Merge pull request #322 from kit-data-manager/dependabot/github_actio…
dependabot[bot] Sep 19, 2024
e2d3cbb
Bump org.javers:javers-spring-boot-starter-sql from 7.6.1 to 7.6.2
dependabot[bot] Sep 23, 2024
20d9937
Bump commons-io:commons-io from 2.16.1 to 2.17.0
dependabot[bot] Sep 23, 2024
f4009b9
Merge pull request #324 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Sep 24, 2024
369fc02
Merge pull request #323 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Sep 24, 2024
55a68de
Bump actions/setup-java from 4.3.0 to 4.4.0
dependabot[bot] Sep 30, 2024
b23f437
Bump com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider
dependabot[bot] Sep 30, 2024
bee1f03
Bump com.fasterxml.jackson.datatype:jackson-datatype-joda
dependabot[bot] Sep 30, 2024
2289395
Bump com.fasterxml.jackson.module:jackson-module-afterburner
dependabot[bot] Sep 30, 2024
ab25aa0
Bump com.fasterxml.jackson.datatype:jackson-datatype-jsr310
dependabot[bot] Sep 30, 2024
e0ae1c0
Merge pull request #329 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Oct 6, 2024
280ff77
Merge pull request #328 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Oct 6, 2024
6515edc
Merge branch 'development' into dependabot/gradle/development/com.fas…
ThomasJejkal Oct 6, 2024
48d80e6
Merge branch 'development' into dependabot/gradle/development/com.fas…
ThomasJejkal Oct 6, 2024
b5f53ae
Merge pull request #325 from kit-data-manager/dependabot/github_actio…
dependabot[bot] Oct 6, 2024
94589e4
Merge pull request #327 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Oct 6, 2024
ec6473c
Merge pull request #326 from kit-data-manager/dependabot/gradle/devel…
dependabot[bot] Oct 6, 2024
0495d54
Update dependency jacoco to v0.8.12
renovate[bot] Oct 6, 2024
1eafd7d
Update dependency org.springframework.restdocs:spring-restdocs-mockmv…
renovate[bot] Oct 6, 2024
dbd392a
Merge pull request #330 from kit-data-manager/renovate/jacoco-0.x
ThomasJejkal Oct 6, 2024
9619207
Merge pull request #331 from kit-data-manager/renovate/org.springfram…
ThomasJejkal Oct 6, 2024
b9c0d62
Update plugin io.freefair.lombok to v8.10.2
renovate[bot] Oct 6, 2024
048b2f1
Merge pull request #332 from kit-data-manager/renovate/io.freefair.lo…
ThomasJejkal Oct 6, 2024
6fe3ee0
Update plugin io.freefair.maven-publish-java to v8.10.2
renovate[bot] Oct 6, 2024
3a87ca0
Merge pull request #333 from kit-data-manager/renovate/io.freefair.ma…
ThomasJejkal Oct 6, 2024
1a49a35
Update dependency com.google.code.gson:gson to v2.11.0
renovate[bot] Oct 6, 2024
4d310fd
Update dependency de.codecentric:spring-boot-admin-starter-client to …
renovate[bot] Oct 6, 2024
205eb2b
Update dependency gradle to v8.10.2
renovate[bot] Oct 6, 2024
87d3f1b
Update dependency org.springframework.boot:spring-boot-dependencies t…
renovate[bot] Oct 6, 2024
24cac55
Update dependency org.springframework:spring-messaging to v6.1.13
renovate[bot] Oct 6, 2024
9e0fc9f
Merge pull request #334 from kit-data-manager/renovate/com.google.cod…
ThomasJejkal Oct 6, 2024
aa41b74
Merge pull request #335 from kit-data-manager/renovate/de.codecentric…
ThomasJejkal Oct 6, 2024
e4a650f
Merge pull request #336 from kit-data-manager/renovate/gradle-8.x
ThomasJejkal Oct 6, 2024
233db13
Merge pull request #337 from kit-data-manager/renovate/springbootversion
ThomasJejkal Oct 6, 2024
06ae71d
Merge pull request #339 from kit-data-manager/renovate/org.springfram…
ThomasJejkal Oct 6, 2024
a5ffaae
Update dependency org.javers:javers-spring-boot-starter-sql to v7.6.3
renovate[bot] Oct 13, 2024
416ceaa
Bump org.javers:javers-spring-boot-starter-sql from 7.6.2 to 7.6.3
dependabot[bot] Oct 14, 2024
e244bcf
Merge pull request #340 from kit-data-manager/renovate/javersversion
ThomasJejkal Oct 14, 2024
59b0eb3
Merge pull request #341 from kit-data-manager/dependabot/gradle/devel…
ThomasJejkal Oct 14, 2024
2a0d2c3
Update dependency org.springframework:spring-messaging to v6.1.14
renovate[bot] Oct 17, 2024
d3ef9aa
Update dependency org.springframework.data:spring-data-elasticsearch …
renovate[bot] Oct 18, 2024
85b9678
Bump org.apache.tika:tika-core from 2.9.2 to 3.0.0
dependabot[bot] Oct 21, 2024
1802e79
Update dependency org.springframework.restdocs:spring-restdocs-mockmv…
renovate[bot] Oct 21, 2024
5f846ef
Merge pull request #345 from kit-data-manager/renovate/org.springfram…
ThomasJejkal Oct 23, 2024
2a6a70e
Merge pull request #344 from kit-data-manager/dependabot/gradle/devel…
ThomasJejkal Oct 23, 2024
204cbd9
Merge pull request #338 from kit-data-manager/renovate/org.springfram…
ThomasJejkal Oct 23, 2024
e2c931b
Merge pull request #342 from kit-data-manager/renovate/org.springfram…
ThomasJejkal Oct 23, 2024
2e84d10
Update dependabot.yml
ThomasJejkal Oct 23, 2024
3577472
Merge branch 'main' into development
ThomasJejkal Oct 23, 2024
8bdd511
Update dependency org.springframework.boot:spring-boot-dependencies t…
renovate[bot] Oct 24, 2024
4e077bf
Update actions/setup-java action to v4.5.0
renovate[bot] Oct 24, 2024
7143eb2
Update dependency com.fasterxml.jackson.datatype:jackson-datatype-jsr…
renovate[bot] Oct 29, 2024
d8884ca
Update dependency com.fasterxml.jackson.module:jackson-module-afterbu…
renovate[bot] Oct 29, 2024
c59562e
Update plugin org.owasp.dependencycheck to v11
renovate[bot] Oct 30, 2024
f9864b7
Merge pull request #352 from kit-data-manager/renovate/com.fasterxml.…
ThomasJejkal Nov 1, 2024
5517e62
Merge pull request #350 from kit-data-manager/renovate/com.fasterxml.…
ThomasJejkal Nov 1, 2024
88c166f
Update dependency com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-prov…
renovate[bot] Nov 1, 2024
b86f07e
Update dependency com.fasterxml.jackson.datatype:jackson-datatype-jod…
renovate[bot] Nov 1, 2024
07f7092
Merge pull request #348 from kit-data-manager/renovate/actions-setup-…
ThomasJejkal Nov 1, 2024
f076935
Merge pull request #347 from kit-data-manager/renovate/springbootversion
ThomasJejkal Nov 1, 2024
bf653a1
Merge pull request #346 from kit-data-manager/renovate/org.owasp.depe…
ThomasJejkal Nov 1, 2024
b29bd63
Update dependency de.codecentric:spring-boot-admin-starter-client to …
renovate[bot] Nov 2, 2024
2a8191c
Merge pull request #353 from kit-data-manager/renovate/de.codecentric…
ThomasJejkal Nov 4, 2024
2e26ce7
Merge pull request #351 from kit-data-manager/renovate/com.fasterxml.…
ThomasJejkal Nov 4, 2024
6b3ddec
Merge pull request #349 from kit-data-manager/renovate/com.fasterxml.…
ThomasJejkal Nov 4, 2024
54d873e
Overload method for RelatedIdentifierSpec and add tests.
VolkerHartmann Nov 8, 2024
dfac63e
Remove unused imports.
VolkerHartmann Nov 8, 2024
c74608b
Refactor code.
VolkerHartmann Nov 8, 2024
f474809
Merge pull request #354 from VolkerHartmann/OverloadMethod4RelatedIde…
VolkerHartmann Nov 8, 2024
e84127c
Update dependency edu.kit.datamanager:service-base to v1.3.2
renovate[bot] Nov 8, 2024
32e832e
Merge pull request #356 from kit-data-manager/renovate/edu.kit.datama…
VolkerHartmann Nov 8, 2024
6143510
Update src/test/java/edu/kit/datamanager/repo/test/integration/Relate…
VolkerHartmann Nov 8, 2024
b13a8f1
Update src/main/java/edu/kit/datamanager/repo/dao/spec/dataresource/R…
VolkerHartmann Nov 8, 2024
053dd8d
Refactor test for RelatedIdentifierSpec and add javadoc.
VolkerHartmann Nov 8, 2024
6ddd0b2
Update CHANGELOG.md
ThomasJejkal Nov 8, 2024
ce6992a
Update CHANGELOG.md.
VolkerHartmann Nov 8, 2024
32ae907
Merge branch 'development' into development
VolkerHartmann Nov 8, 2024
388dbb8
Merge pull request #357 from VolkerHartmann/development
VolkerHartmann Nov 8, 2024
121e798
Update CHANGELOG.md
VolkerHartmann Nov 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ updates:
interval: "weekly"
open-pull-requests-limit: 0


- package-ecosystem: "github-actions"
directory: "/"
target-branch: "development"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

# Initialize minimum JDK version
- name: Setup Java JDK
uses: actions/setup-java@v4.2.1
uses: actions/setup-java@v4.5.0
with:
distribution: zulu
java-version: 17
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v4
- name: Set up OpenJDK version ...
uses: actions/setup-java@v4.2.1
uses: actions/setup-java@v4.5.0
with:
distribution: 'zulu'
java-version: ${{ matrix.jdk }}
Expand All @@ -50,7 +50,7 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v4
- name: Set up OpenJDK version ...
uses: actions/setup-java@v4.2.1
uses: actions/setup-java@v4.5.0
with:
distribution: 'zulu'
java-version: ${{ env.currentBuildVersion }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publishRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4.2.1
uses: actions/setup-java@v4.5.0
with:
java-version: 17
distribution: zulu
Expand Down
44 changes: 43 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,47 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Removed

## [1.2.3] - 2024-11-08

### Added
* Enhanced searching capabilities for related identifiers with new methods in the RelatedIdentifierSpec class.
* Comprehensive unit tests added for the RelatedIdentifierSpec class to ensure robust functionality.

### Fixed
* Fixed potential issue with unprivileged find
* Improved error messaging for missing publisher during updates in the DataResourceService.

### Security
* Update actions/setup-java action to v4.5.0
* Update dependency com.fasterxml.jackson.datatype:jackson-datatype-joda to v2.18.1.
* Update dependency com.fasterxml.jackson.datatype:jackson-datatype-jsr310 to v2.18.1
* Update dependency com.fasterxml.jackson.module:jackson-module-afterburner to v2.18.1
* Update dependency com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider to v2.18.1
* Update dependency com.google.code.gson:gson to v2.11.0
* Bump commons-io:commons-io from 2.16.1 to 2.17.0.
* Update dependency de.codecentric:spring-boot-admin-starter-client to v3.3.5
* Update dependency edu.kit.datamanager:service-base to v1.3.2
* Update plugin io.freefair.lombok to v8.10.2
* Update plugin io.freefair.maven-publish-java to v8.10.2
* Update dependency gradle to v8.10.2
* Update dependency jacoco to v0.8.12
* Bump org.apache.tika:tika-core from 2.9.2 to 3.0.0
* Update dependency org.javers:javers-spring-boot-starter-sql to v7.6.3
* Bump org.javers:javers-spring-boot-starter-sql from 7.6.2 to 7.6.3
* Update plugin org.owasp.dependencycheck to v11
* Bump org.postgresql:postgresql from 42.7.3 to 42.7.4.
* Update dependency org.springframework.boot:spring-boot-dependencies to v3.3.5
* Update dependency org.springframework.data:spring-data-elasticsearch to v5.3.5
* Update dependency org.springframework.restdocs:spring-restdocs-mockmvc to v3.0.2
* Update dependency org.springframework:spring-messaging to v6.1.14

### Deprecated

### Removed
* Removed outdated configuration for GitHub Actions in the project setup.

### Security

## [1.2.2] - 2024-04-02

### Fixed
Expand Down Expand Up @@ -276,7 +317,8 @@ Extracted from the 'base-repo' project.
### Removed
- none

[Unreleased]: https://github.com/kit-data-manager/repo-core/compare/v1.2.2...HEAD
[Unreleased]: https://github.com/kit-data-manager/repo-core/compare/v1.2.3...HEAD
[1.2.3]: https://github.com/kit-data-manager/repo-core/compare/v1.2.2...v1.2.3
Comment on lines +320 to +321
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Version comparison links need to be updated

The version v1.2.3 referenced in the changelog links does not exist in the repository. The latest available tag is v1.2.2. The comparison links should be updated to use existing versions.

  • Update the unreleased comparison link to: [Unreleased]: https://github.com/kit-data-manager/repo-core/compare/v1.2.2...HEAD
  • Remove the non-existent v1.2.3 comparison link as this version hasn't been released yet
🔗 Analysis chain

Verify version comparison links

The version comparison links have been updated correctly for v1.2.3. Let's verify these links are accessible.


Let me verify the repository and tag information first to understand if there's a mismatch in the versions.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify that the version comparison links are valid
# Test: Check if the comparison URLs return valid responses

echo "Verifying comparison URLs..."
gh api repos/kit-data-manager/repo-core/compare/v1.2.2...v1.2.3 --jq '.status' || echo "Invalid comparison: v1.2.2...v1.2.3"
gh api repos/kit-data-manager/repo-core/compare/v1.2.3...HEAD --jq '.status' || echo "Invalid comparison: v1.2.3...HEAD"

Length of output: 680


Script:

#!/bin/bash
# Check repository existence and available tags
echo "Checking repository information..."
gh repo view kit-data-manager/repo-core --json name,url 2>/dev/null || echo "Repository not found"

echo -e "\nChecking available tags..."
gh api repos/kit-data-manager/repo-core/tags --jq '.[].name' 2>/dev/null || echo "Unable to fetch tags"

Length of output: 441

[1.2.2]: https://github.com/kit-data-manager/repo-core/compare/v1.2.1...v1.2.2
[1.2.1]: https://github.com/kit-data-manager/repo-core/compare/v1.2.0...v1.2.1
[1.2.0]: https://github.com/kit-data-manager/repo-core/compare/v1.1.2...v1.2.0
Expand Down
45 changes: 23 additions & 22 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
* limitations under the License.
*/
plugins {
id "io.freefair.lombok" version "8.6"
id "io.freefair.maven-publish-java" version "8.6"
id "io.spring.dependency-management" version "1.1.4"
id "io.freefair.lombok" version "8.10.2"
id "io.freefair.maven-publish-java" version "8.10.2"
id "io.spring.dependency-management" version "1.1.6"
//id "com.github.kt3k.coveralls" version "2.8.1"
id "org.owasp.dependencycheck" version "9.1.0"
id "org.asciidoctor.jvm.convert" version "4.0.2"
id "org.owasp.dependencycheck" version "11.1.0"
id "org.asciidoctor.jvm.convert" version "4.0.3"
//id "org.ajoberstar.grgit" version "2.0.1"
id "java"
id "jacoco"
Expand All @@ -32,9 +32,9 @@ plugins {

ext {
// versions of dependencies
springBootVersion = '3.1.0'
springDocVersion = '2.5.0'
javersVersion = '7.4.2'
springBootVersion = '3.3.5'
springDocVersion = '2.6.0'
javersVersion = '7.6.3'
}

description = "Core module for data repositories based on metadata model of datacite."
Expand Down Expand Up @@ -69,15 +69,15 @@ if (project.hasProperty('release')) {

dependencies {
// Spring
implementation 'org.springframework:spring-messaging:6.0.2'
implementation 'org.springframework:spring-messaging:6.1.14'
// Spring Boot
implementation "org.springframework.boot:spring-boot-starter-data-rest"
implementation "org.springframework.boot:spring-boot-starter-amqp"
implementation "org.springframework.boot:spring-boot-starter-web"
implementation "org.springframework.boot:spring-boot-starter-security"
implementation "org.springframework.boot:spring-boot-starter-actuator"
implementation "org.springframework.boot:spring-boot-starter-data-jpa"
implementation 'org.springframework.data:spring-data-elasticsearch:5.1.0'
implementation 'org.springframework.data:spring-data-elasticsearch:5.3.5'


// springdoc
Expand All @@ -86,33 +86,34 @@ dependencies {
implementation "org.springdoc:springdoc-openapi-starter-webmvc-api:${springDocVersion}"
// apache
implementation "commons-configuration:commons-configuration:1.10"
implementation "commons-io:commons-io:2.16.1"
implementation "commons-io:commons-io:2.17.0"
implementation "org.apache.commons:commons-collections4:4.4"
// includes commons-lang3
implementation "org.apache.commons:commons-text:1.12.0"
implementation 'org.apache.httpcomponents:httpclient:4.5.14'
implementation "org.apache.tika:tika-core:2.9.2"
implementation "org.apache.tika:tika-core:3.0.0"
// javers
implementation "org.javers:javers-spring-boot-starter-sql:${javersVersion}"
implementation "com.google.code.gson:gson:2.11.0"

// Database
implementation "com.h2database:h2:2.2.224"
implementation "org.postgresql:postgresql:42.7.3"
implementation "com.h2database:h2:2.3.232"
implementation "org.postgresql:postgresql:42.7.4"
// XML
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.17.0"
implementation "com.fasterxml.jackson.module:jackson-module-afterburner:2.17.0"
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.18.1"
implementation "com.fasterxml.jackson.module:jackson-module-afterburner:2.18.1"

implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.0"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.17.0"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.1"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.18.1"

//implementation "com.monitorjbl:spring-json-view:1.0.1"

implementation "de.codecentric:spring-boot-admin-starter-client:3.0.4"
implementation "de.codecentric:spring-boot-admin-starter-client:3.3.5"
// log4j core
implementation "org.apache.logging.log4j:log4j-core"
implementation "ch.qos.logback:logback-classic"

implementation "edu.kit.datamanager:service-base:1.3.1"
implementation "edu.kit.datamanager:service-base:1.3.2"

implementation "com.github.java-json-tools:json-patch:1.13"
implementation "com.github.dozermapper:dozer-core:7.0.0"
Expand All @@ -122,7 +123,7 @@ dependencies {
// boot starter
testImplementation 'org.springframework.boot:spring-boot-starter-validation'
testImplementation "org.springframework.boot:spring-boot-starter-test"
testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc:3.0.0'
testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc:3.0.2'
testImplementation "org.springframework.security:spring-security-test"

//Java 11 Support
Expand Down Expand Up @@ -154,7 +155,7 @@ test {
}

jacoco {
toolVersion = "0.8.11"
toolVersion = "0.8.12"
}

tasks.withType(Test) {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
34 changes: 21 additions & 13 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down Expand Up @@ -83,10 +85,9 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,26 +134,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -197,11 +201,15 @@ if "$cygwin" || "$msys" ; then
done
fi

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
22 changes: 12 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down Expand Up @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
Loading
Loading