Skip to content

PR for v1.2.6 #403

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

Open
wants to merge 107 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
9c782cc
Update springDocVersion to v2.8.4
renovate[bot] Jan 26, 2025
6d7a0d2
Merge pull request #402 from kit-data-manager/renovate/springdocversion
ThomasJejkal Jan 27, 2025
c19848f
Update actions/setup-java action to v4.7.0
renovate[bot] Jan 29, 2025
af2f278
Update plugin org.owasp.dependencycheck to v12.0.2
renovate[bot] Jan 31, 2025
50888e4
Update dependency com.google.code.gson:gson to v2.12.1
renovate[bot] Jan 31, 2025
87d4436
Update dependency org.apache.tika:tika-core to v3.1.0
renovate[bot] Feb 1, 2025
57b3ec7
Update plugin io.freefair.lombok to v8.12.1
renovate[bot] Feb 3, 2025
cf72711
Update dependency de.codecentric:spring-boot-admin-starter-client to …
renovate[bot] Feb 10, 2025
470e386
Merge pull request #410 from kit-data-manager/renovate/de.codecentric…
ThomasJejkal Feb 10, 2025
28a9901
Merge pull request #409 from kit-data-manager/renovate/io.freefair.lo…
ThomasJejkal Feb 10, 2025
e4dfa67
Update plugin io.freefair.maven-publish-java to v8.12.1
renovate[bot] Feb 10, 2025
5cbf89a
Merge pull request #406 from kit-data-manager/renovate/org.owasp.depe…
ThomasJejkal Feb 10, 2025
2d1fdf9
Merge pull request #407 from kit-data-manager/renovate/org.apache.tik…
ThomasJejkal Feb 10, 2025
ed7b021
Merge pull request #405 from kit-data-manager/renovate/com.google.cod…
ThomasJejkal Feb 10, 2025
0ec45e9
Merge pull request #404 from kit-data-manager/renovate/actions-setup-…
ThomasJejkal Feb 10, 2025
e73b22d
Merge pull request #408 from kit-data-manager/renovate/io.freefair.ma…
ThomasJejkal Feb 10, 2025
9eb7b85
Update dependency org.springframework:spring-messaging to v6.2.3
renovate[bot] Feb 13, 2025
09e83cc
Update dependency org.springframework.data:spring-data-elasticsearch …
renovate[bot] Feb 14, 2025
8a01619
Merge pull request #412 from kit-data-manager/renovate/org.springfram…
ThomasJejkal Feb 14, 2025
bc9846a
Merge pull request #411 from kit-data-manager/renovate/org.springfram…
ThomasJejkal Feb 14, 2025
d2650ff
Update dependency org.javers:javers-spring-boot-starter-sql to v7.8.0
renovate[bot] Feb 16, 2025
948dd1e
Update plugin org.owasp.dependencycheck to v12.1.0
renovate[bot] Feb 16, 2025
00f810e
Merge pull request #415 from kit-data-manager/renovate/org.owasp.depe…
ThomasJejkal Feb 17, 2025
124fc32
Merge pull request #414 from kit-data-manager/renovate/javersversion
ThomasJejkal Feb 17, 2025
56768fe
Update springDocVersion to v2.8.5
renovate[bot] Feb 17, 2025
b1a1565
Merge pull request #413 from kit-data-manager/renovate/springdocversion
ThomasJejkal Feb 17, 2025
a83d976
Update dependency org.springframework.boot:spring-boot-dependencies t…
renovate[bot] Feb 20, 2025
b7bf7f8
Update plugin io.freefair.maven-publish-java to v8.12.2
renovate[bot] Feb 23, 2025
9a60770
Update dependency de.codecentric:spring-boot-admin-starter-client to …
renovate[bot] Feb 24, 2025
849bb40
Merge pull request #419 from kit-data-manager/renovate/io.freefair.ma…
ThomasJejkal Feb 25, 2025
4327927
Merge pull request #417 from kit-data-manager/renovate/de.codecentric…
ThomasJejkal Feb 25, 2025
1f11678
Merge pull request #416 from kit-data-manager/renovate/springbootversion
ThomasJejkal Feb 25, 2025
b5d9c32
Update plugin io.freefair.lombok to v8.12.2
renovate[bot] Feb 25, 2025
4bf08d0
Merge pull request #418 from kit-data-manager/renovate/io.freefair.lo…
ThomasJejkal Feb 25, 2025
98c98da
Update dependency gradle to v8.13
renovate[bot] Feb 25, 2025
4d903ad
Merge pull request #420 from kit-data-manager/renovate/gradle-8.x
ThomasJejkal Feb 27, 2025
5288e0c
Update dependency com.fasterxml.jackson.datatype:jackson-datatype-jod…
renovate[bot] Mar 1, 2025
85c726a
Update dependency com.fasterxml.jackson.datatype:jackson-datatype-jsr…
renovate[bot] Mar 1, 2025
3c2aad8
Update dependency com.fasterxml.jackson.module:jackson-module-afterbu…
renovate[bot] Mar 1, 2025
0522af8
Update plugin io.freefair.maven-publish-java to v8.12.2.1
renovate[bot] Mar 3, 2025
7ff1b9b
Update dependency de.codecentric:spring-boot-admin-starter-client to …
renovate[bot] Mar 7, 2025
b343961
Merge pull request #427 from kit-data-manager/renovate/de.codecentric…
ThomasJejkal Mar 10, 2025
01539cb
Merge pull request #426 from kit-data-manager/renovate/io.freefair.ma…
ThomasJejkal Mar 10, 2025
6cea2d6
Merge pull request #424 from kit-data-manager/renovate/com.fasterxml.…
ThomasJejkal Mar 10, 2025
6a60736
Merge pull request #421 from kit-data-manager/renovate/com.fasterxml.…
ThomasJejkal Mar 10, 2025
7b40333
Update dependency com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-prov…
renovate[bot] Mar 10, 2025
4a92ca3
Update plugin io.freefair.lombok to v8.12.2.1
renovate[bot] Mar 10, 2025
34c7168
Merge branch 'development' into renovate/com.fasterxml.jackson.dataty…
ThomasJejkal Mar 10, 2025
ba91c51
Merge pull request #422 from kit-data-manager/renovate/com.fasterxml.…
ThomasJejkal Mar 10, 2025
3d6301a
Merge pull request #425 from kit-data-manager/renovate/io.freefair.lo…
ThomasJejkal Mar 10, 2025
019ff0e
Update dependency com.fasterxml.jackson.datatype:jackson-datatype-jsr…
renovate[bot] Mar 10, 2025
8f036ed
Merge pull request #428 from kit-data-manager/renovate/com.fasterxml.…
ThomasJejkal Mar 10, 2025
625e466
Merge pull request #423 from kit-data-manager/renovate/com.fasterxml.…
ThomasJejkal Mar 10, 2025
42a5c6b
Update plugin io.freefair.maven-publish-java to v8.13
renovate[bot] Mar 12, 2025
dbc0048
Update dependency org.springframework:spring-messaging to v6.2.4
renovate[bot] Mar 14, 2025
708857d
Merge pull request #431 from kit-data-manager/renovate/org.springfram…
ThomasJejkal Mar 14, 2025
b366267
Merge pull request #430 from kit-data-manager/renovate/io.freefair.ma…
ThomasJejkal Mar 14, 2025
afc210a
Update dependency org.springframework.data:spring-data-elasticsearch …
renovate[bot] Mar 14, 2025
92ef8c8
Update plugin io.freefair.lombok to v8.13
renovate[bot] Mar 14, 2025
eee0351
Merge pull request #429 from kit-data-manager/renovate/io.freefair.lo…
ThomasJejkal Mar 14, 2025
8bd98c3
Merge pull request #432 from kit-data-manager/renovate/org.springfram…
ThomasJejkal Mar 14, 2025
f56a5df
Update dependency org.springframework:spring-messaging to v6.2.5
renovate[bot] Mar 19, 2025
1077724
Update springDocVersion to v2.8.6
renovate[bot] Mar 23, 2025
aa3b1ac
Update plugin io.freefair.lombok to v8.13.1
renovate[bot] Mar 25, 2025
c0bd548
Update plugin io.freefair.maven-publish-java to v8.13.1
renovate[bot] Mar 25, 2025
df21ebe
Merge pull request #437 from kit-data-manager/renovate/io.freefair.ma…
ThomasJejkal Mar 25, 2025
eb6d83b
Merge branch 'development' into renovate/io.freefair.lombok-8.x
ThomasJejkal Mar 25, 2025
a8c3b15
Merge pull request #436 from kit-data-manager/renovate/io.freefair.lo…
ThomasJejkal Mar 25, 2025
cfeb02f
Merge pull request #435 from kit-data-manager/renovate/springdocversion
ThomasJejkal Mar 25, 2025
e98db44
Update dependency org.springframework.boot:spring-boot-dependencies t…
renovate[bot] Mar 25, 2025
8f76b5b
Merge pull request #434 from kit-data-manager/renovate/springbootversion
ThomasJejkal Mar 25, 2025
155d1d1
Merge pull request #433 from kit-data-manager/renovate/org.springfram…
ThomasJejkal Mar 25, 2025
ae1f1fb
Update dependency jacoco to v0.8.13
renovate[bot] Apr 2, 2025
d31a581
Update plugin org.owasp.dependencycheck to v12.1.1
renovate[bot] Apr 5, 2025
f3b79dc
Update actions/setup-java action to v4.7.1
renovate[bot] Apr 9, 2025
566667f
Update dependency org.apache.commons:commons-text to v1.13.1
renovate[bot] Apr 11, 2025
855d72c
Update dependency commons-io:commons-io to v2.19.0
renovate[bot] Apr 12, 2025
6a5cb5b
Update dependency org.springframework:spring-messaging to v6.2.6
renovate[bot] Apr 17, 2025
a1a6f3c
Update dependency org.springframework.data:spring-data-elasticsearch …
renovate[bot] Apr 22, 2025
cc1bef9
Update dependency com.google.code.gson:gson to v2.13.1
renovate[bot] Apr 24, 2025
35f216d
Update dependency org.springframework.boot:spring-boot-dependencies t…
renovate[bot] Apr 24, 2025
9ea0661
Merge pull request #438 from kit-data-manager/renovate/jacoco-0.x
VolkerHartmann Apr 30, 2025
3d3aaad
Merge pull request #439 from kit-data-manager/renovate/org.owasp.depe…
VolkerHartmann Apr 30, 2025
1b353ec
Update dependency com.fasterxml.jackson.datatype:jackson-datatype-jod…
renovate[bot] Apr 30, 2025
639f9f2
Merge pull request #440 from kit-data-manager/renovate/actions-setup-…
VolkerHartmann Apr 30, 2025
dbcba03
Merge pull request #441 from kit-data-manager/renovate/com.google.cod…
VolkerHartmann Apr 30, 2025
05e2602
Merge pull request #442 from kit-data-manager/renovate/org.apache.com…
VolkerHartmann Apr 30, 2025
7e0e02e
Update dependency com.fasterxml.jackson.datatype:jackson-datatype-jsr…
renovate[bot] Apr 30, 2025
b34e979
Merge pull request #443 from kit-data-manager/renovate/commons-io-com…
VolkerHartmann Apr 30, 2025
e4a6ffb
Merge pull request #444 from kit-data-manager/renovate/org.springfram…
VolkerHartmann Apr 30, 2025
1c9a77d
Merge pull request #445 from kit-data-manager/renovate/org.springfram…
VolkerHartmann Apr 30, 2025
1021d21
Update dependency org.apache.commons:commons-collections4 to v4.5.0
renovate[bot] Apr 30, 2025
c6149ae
Update dependency com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-prov…
renovate[bot] Apr 30, 2025
e10f0d2
Merge pull request #446 from kit-data-manager/renovate/org.apache.com…
VolkerHartmann Apr 30, 2025
3b8cd0e
Merge pull request #447 from kit-data-manager/renovate/springbootversion
VolkerHartmann Apr 30, 2025
38525c3
Merge pull request #448 from kit-data-manager/renovate/com.fasterxml.…
VolkerHartmann Apr 30, 2025
983c71c
Merge branch 'development' into renovate/com.fasterxml.jackson.dataty…
VolkerHartmann Apr 30, 2025
9e73e13
Merge pull request #450 from kit-data-manager/renovate/com.fasterxml.…
VolkerHartmann Apr 30, 2025
129242c
Update dependency gradle to v8.14
renovate[bot] Apr 30, 2025
4a40236
Merge pull request #449 from kit-data-manager/renovate/com.fasterxml.…
VolkerHartmann Apr 30, 2025
5b6ee57
Merge pull request #452 from kit-data-manager/renovate/gradle-8.x
VolkerHartmann Apr 30, 2025
ba6a95c
Update dependency com.fasterxml.jackson.module:jackson-module-afterbu…
renovate[bot] Apr 30, 2025
9e159c3
Merge pull request #451 from kit-data-manager/renovate/com.fasterxml.…
VolkerHartmann May 2, 2025
47e1160
Update dependency edu.kit.datamanager:service-base to v1.3.4
renovate[bot] May 2, 2025
285a78e
Update springDocVersion to v2.8.8
renovate[bot] May 4, 2025
87c1c31
Merge pull request #454 from kit-data-manager/renovate/springdocversion
ThomasJejkal May 9, 2025
7c6cf22
Merge pull request #453 from kit-data-manager/renovate/edu.kit.datama…
ThomasJejkal May 9, 2025
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
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.6.0
uses: actions/setup-java@v4.7.1
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.6.0
uses: actions/setup-java@v4.7.1
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.6.0
uses: actions/setup-java@v4.7.1
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.6.0
uses: actions/setup-java@v4.7.1
with:
java-version: 17
distribution: zulu
Expand Down
40 changes: 20 additions & 20 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
* limitations under the License.
*/
plugins {
id "io.freefair.lombok" version "8.12"
id "io.freefair.maven-publish-java" version "8.12"
id "io.freefair.lombok" version "8.13.1"
id "io.freefair.maven-publish-java" version "8.13.1"
id "io.spring.dependency-management" version "1.1.7"
//id "com.github.kt3k.coveralls" version "2.8.1"
id "org.owasp.dependencycheck" version "12.0.1"
id "org.owasp.dependencycheck" version "12.1.1"
id "org.asciidoctor.jvm.convert" version "4.0.4"
//id "org.ajoberstar.grgit" version "2.0.1"
id "java"
Expand All @@ -32,9 +32,9 @@ plugins {

ext {
// versions of dependencies
springBootVersion = '3.4.2'
springDocVersion = '2.8.3'
javersVersion = '7.7.0'
springBootVersion = '3.4.5'
springDocVersion = '2.8.8'
javersVersion = '7.8.0'
}

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.2.2'
implementation 'org.springframework:spring-messaging:6.2.6'
// 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.4.2'
implementation 'org.springframework.data:spring-data-elasticsearch:5.4.5'


// springdoc
Expand All @@ -86,34 +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.18.0"
implementation "org.apache.commons:commons-collections4:4.4"
implementation "commons-io:commons-io:2.19.0"
implementation "org.apache.commons:commons-collections4:4.5.0"
// includes commons-lang3
implementation "org.apache.commons:commons-text:1.13.0"
implementation "org.apache.commons:commons-text:1.13.1"
implementation 'org.apache.httpcomponents:httpclient:4.5.14'
implementation "org.apache.tika:tika-core:3.0.0"
implementation "org.apache.tika:tika-core:3.1.0"
// javers
implementation "org.javers:javers-spring-boot-starter-sql:${javersVersion}"
implementation "com.google.code.gson:gson:2.11.0"
implementation "com.google.code.gson:gson:2.13.1"

// Database
implementation "com.h2database:h2:2.3.232"
implementation "org.postgresql:postgresql:42.7.5"
// XML
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.18.2"
implementation "com.fasterxml.jackson.module:jackson-module-afterburner:2.18.2"
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.19.0"
implementation "com.fasterxml.jackson.module:jackson-module-afterburner:2.19.0"

implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.18.2"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.19.0"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.19.0"

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

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

implementation "edu.kit.datamanager:service-base:1.3.3"
implementation "edu.kit.datamanager:service-base:1.3.4"

implementation "com.github.java-json-tools:json-patch:1.13"
implementation "com.github.dozermapper:dozer-core:7.0.0"
Expand Down Expand Up @@ -155,7 +155,7 @@ test {
}

jacoco {
toolVersion = "0.8.12"
toolVersion = "0.8.13"
}

tasks.withType(Test) {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 3 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
CLASSPATH="\\\"\\\""

Comment on lines +117 to 118
Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

CLASSPATH="\\\"\\\"" expands to the literal string "\"", not an empty class-path
That value is harmless because Java will ignore -classpath once -jar is also provided, but it is confusing when someone echoes the variable while troubleshooting.

-CLASSPATH="\\\"\\\""
+# Intentionally empty – Gradle wrapper is started via -jar, so class-path is irrelevant
+CLASSPATH=
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
CLASSPATH="\\\"\\\""
# Intentionally empty – Gradle wrapper is started via -jar, so class-path is irrelevant
CLASSPATH=


# Determine the Java command to use to start the JVM.
Expand Down Expand Up @@ -205,15 +205,15 @@ fi
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,
# * DEFAULT_JVM_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" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"

# Stop when "xargs" is not available.
Expand Down
4 changes: 2 additions & 2 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ goto fail
:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
set CLASSPATH=


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*

:end
@rem End local scope for the variables with windows NT shell
Expand Down