Skip to content

Commit abf3d1c

Browse files
authored
Merge pull request #359 from kit-data-manager/development
PR for v1.2.4
2 parents aceddcc + 5591e51 commit abf3d1c

File tree

7 files changed

+59
-30
lines changed

7 files changed

+59
-30
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
# Initialize minimum JDK version
4444
- name: Setup Java JDK
45-
uses: actions/setup-java@v4.5.0
45+
uses: actions/setup-java@v4.6.0
4646
with:
4747
distribution: zulu
4848
java-version: 17

.github/workflows/gradle.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Checkout repo
2525
uses: actions/checkout@v4
2626
- name: Set up OpenJDK version ...
27-
uses: actions/setup-java@v4.5.0
27+
uses: actions/setup-java@v4.6.0
2828
with:
2929
distribution: 'zulu'
3030
java-version: ${{ matrix.jdk }}
@@ -50,7 +50,7 @@ jobs:
5050
- name: Checkout repo
5151
uses: actions/checkout@v4
5252
- name: Set up OpenJDK version ...
53-
uses: actions/setup-java@v4.5.0
53+
uses: actions/setup-java@v4.6.0
5454
with:
5555
distribution: 'zulu'
5656
java-version: ${{ env.currentBuildVersion }}
@@ -59,6 +59,6 @@ jobs:
5959
- name: Build with Gradle (JDK ${{ env.currentBuildVersion }})
6060
run: ./gradlew clean check jacocoTestReport
6161
- name: Codecov
62-
uses: codecov/codecov-action@v4
62+
uses: codecov/codecov-action@v5
6363
with:
6464
files: ./build/reports/jacoco/test/jacocoTestReport.xml #optional

.github/workflows/publishRelease.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
steps:
99
- uses: actions/checkout@v4
1010
- name: Set up Java
11-
uses: actions/setup-java@v4.5.0
11+
uses: actions/setup-java@v4.6.0
1212
with:
1313
java-version: 17
1414
distribution: zulu

CHANGELOG.md

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1616

1717
### Removed
1818

19+
## [1.2.4] - 2025-01-16
20+
21+
### Security
22+
* Update plugin io.freefair.maven-publish-java to v8.11 by @renovate in https://github.com/kit-data-manager/repo-core/pull/365
23+
* Update codecov/codecov-action action to v5 by @renovate in https://github.com/kit-data-manager/repo-core/pull/360
24+
* Update plugin io.freefair.lombok to v8.11 by @renovate in https://github.com/kit-data-manager/repo-core/pull/364
25+
* Update dependency commons-io:commons-io to v2.18.0 by @renovate in https://github.com/kit-data-manager/repo-core/pull/369
26+
* Update dependency org.springframework.restdocs:spring-restdocs-mockmvc to v3.0.3 by @renovate in https://github.com/kit-data-manager/repo-core/pull/367
27+
* Update dependency org.javers:javers-spring-boot-starter-sql to v7.7.0 by @renovate in https://github.com/kit-data-manager/repo-core/pull/366
28+
* Update dependency com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider to v2.18.2 by @renovate in https://github.com/kit-data-manager/repo-core/pull/378
29+
* Update dependency com.fasterxml.jackson.datatype:jackson-datatype-jsr310 to v2.18.2 by @renovate in https://github.com/kit-data-manager/repo-core/pull/377
30+
* Update dependency com.fasterxml.jackson.datatype:jackson-datatype-joda to v2.18.2 by @renovate in https://github.com/kit-data-manager/repo-core/pull/376
31+
* Update dependency com.fasterxml.jackson.module:jackson-module-afterburner to v2.18.2 by @renovate in https://github.com/kit-data-manager/repo-core/pull/375
32+
* Update plugin org.asciidoctor.jvm.convert to v4.0.4 by @renovate in https://github.com/kit-data-manager/repo-core/pull/386
33+
* Update dependency org.apache.commons:commons-text to v1.13.0 by @renovate in https://github.com/kit-data-manager/repo-core/pull/382
34+
* Update actions/setup-java action to v4.6.0 by @renovate in https://github.com/kit-data-manager/repo-core/pull/384
35+
* Update dependency gradle to v8.12 by @renovate in https://github.com/kit-data-manager/repo-core/pull/387
36+
* Update plugin io.spring.dependency-management to v1.1.7 by @renovate in https://github.com/kit-data-manager/repo-core/pull/383
37+
* Update dependency org.apache.tika:tika-core to v3 by @renovate in https://github.com/kit-data-manager/repo-core/pull/373
38+
* Update dependency de.codecentric:spring-boot-admin-starter-client to v3.4.1 by @renovate in https://github.com/kit-data-manager/repo-core/pull/374
39+
* Update dependency org.springframework.data:spring-data-elasticsearch to v5.4.1 by @renovate in https://github.com/kit-data-manager/repo-core/pull/381
40+
* Update dependency org.springframework.boot:spring-boot-dependencies to v3.4.1 by @renovate in https://github.com/kit-data-manager/repo-core/pull/385
41+
* Update plugin net.researchgate.release to v3.1.0 by @renovate in https://github.com/kit-data-manager/repo-core/pull/388
42+
* Update dependency org.postgresql:postgresql to v42.7.5 by @renovate in https://github.com/kit-data-manager/repo-core/pull/391
43+
* Update plugin org.owasp.dependencycheck to v12 by @renovate in https://github.com/kit-data-manager/repo-core/pull/390
44+
* Update springDocVersion to v2.8.3 by @renovate in https://github.com/kit-data-manager/repo-core/pull/389
45+
* Update dependency org.springframework:spring-messaging to v6.2.2 by @renovate in https://github.com/kit-data-manager/repo-core/pull/392
46+
* Update dependency edu.kit.datamanager:service-base to v1.3.3
47+
1948
## [1.2.3] - 2024-11-08
2049

2150
### Added
@@ -317,7 +346,8 @@ Extracted from the 'base-repo' project.
317346
### Removed
318347
- none
319348

320-
[Unreleased]: https://github.com/kit-data-manager/repo-core/compare/v1.2.3...HEAD
349+
[Unreleased]: https://github.com/kit-data-manager/repo-core/compare/v1.2.4...HEAD
350+
[1.2.4]: https://github.com/kit-data-manager/repo-core/compare/v1.2.3...1.2.4
321351
[1.2.3]: https://github.com/kit-data-manager/repo-core/compare/v1.2.2...v1.2.3
322352
[1.2.2]: https://github.com/kit-data-manager/repo-core/compare/v1.2.1...v1.2.2
323353
[1.2.1]: https://github.com/kit-data-manager/repo-core/compare/v1.2.0...v1.2.1

build.gradle

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,27 @@
1414
* limitations under the License.
1515
*/
1616
plugins {
17-
id "io.freefair.lombok" version "8.10.2"
18-
id "io.freefair.maven-publish-java" version "8.10.2"
19-
id "io.spring.dependency-management" version "1.1.6"
17+
id "io.freefair.lombok" version "8.11"
18+
id "io.freefair.maven-publish-java" version "8.11"
19+
id "io.spring.dependency-management" version "1.1.7"
2020
//id "com.github.kt3k.coveralls" version "2.8.1"
21-
id "org.owasp.dependencycheck" version "11.1.0"
22-
id "org.asciidoctor.jvm.convert" version "4.0.3"
21+
id "org.owasp.dependencycheck" version "12.0.0"
22+
id "org.asciidoctor.jvm.convert" version "4.0.4"
2323
//id "org.ajoberstar.grgit" version "2.0.1"
2424
id "java"
2525
id "jacoco"
2626
// plugins for release and publishing to maven repo
2727
id "signing"
28-
id "net.researchgate.release" version "3.0.2"
28+
id "net.researchgate.release" version "3.1.0"
2929
id "io.github.gradle-nexus.publish-plugin" version "2.0.0"
3030
id 'maven-publish'
3131
}
3232

3333
ext {
3434
// versions of dependencies
35-
springBootVersion = '3.3.5'
36-
springDocVersion = '2.6.0'
37-
javersVersion = '7.6.3'
35+
springBootVersion = '3.4.1'
36+
springDocVersion = '2.8.3'
37+
javersVersion = '7.7.0'
3838
}
3939

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

7070
dependencies {
7171
// Spring
72-
implementation 'org.springframework:spring-messaging:6.1.14'
72+
implementation 'org.springframework:spring-messaging:6.2.2'
7373
// Spring Boot
7474
implementation "org.springframework.boot:spring-boot-starter-data-rest"
7575
implementation "org.springframework.boot:spring-boot-starter-amqp"
7676
implementation "org.springframework.boot:spring-boot-starter-web"
7777
implementation "org.springframework.boot:spring-boot-starter-security"
7878
implementation "org.springframework.boot:spring-boot-starter-actuator"
7979
implementation "org.springframework.boot:spring-boot-starter-data-jpa"
80-
implementation 'org.springframework.data:spring-data-elasticsearch:5.3.5'
80+
implementation 'org.springframework.data:spring-data-elasticsearch:5.4.1'
8181

8282

8383
// springdoc
@@ -86,10 +86,10 @@ dependencies {
8686
implementation "org.springdoc:springdoc-openapi-starter-webmvc-api:${springDocVersion}"
8787
// apache
8888
implementation "commons-configuration:commons-configuration:1.10"
89-
implementation "commons-io:commons-io:2.17.0"
89+
implementation "commons-io:commons-io:2.18.0"
9090
implementation "org.apache.commons:commons-collections4:4.4"
9191
// includes commons-lang3
92-
implementation "org.apache.commons:commons-text:1.12.0"
92+
implementation "org.apache.commons:commons-text:1.13.0"
9393
implementation 'org.apache.httpcomponents:httpclient:4.5.14'
9494
implementation "org.apache.tika:tika-core:3.0.0"
9595
// javers
@@ -98,22 +98,22 @@ dependencies {
9898

9999
// Database
100100
implementation "com.h2database:h2:2.3.232"
101-
implementation "org.postgresql:postgresql:42.7.4"
101+
implementation "org.postgresql:postgresql:42.7.5"
102102
// XML
103-
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.18.1"
104-
implementation "com.fasterxml.jackson.module:jackson-module-afterburner:2.18.1"
103+
implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.18.2"
104+
implementation "com.fasterxml.jackson.module:jackson-module-afterburner:2.18.2"
105105

106-
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.1"
107-
implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.18.1"
106+
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2"
107+
implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.18.2"
108108

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

111-
implementation "de.codecentric:spring-boot-admin-starter-client:3.3.5"
111+
implementation "de.codecentric:spring-boot-admin-starter-client:3.4.1"
112112
// log4j core
113113
implementation "org.apache.logging.log4j:log4j-core"
114114
implementation "ch.qos.logback:logback-classic"
115115

116-
implementation "edu.kit.datamanager:service-base:1.3.2"
116+
implementation "edu.kit.datamanager:service-base:1.3.3"
117117

118118
implementation "com.github.java-json-tools:json-patch:1.13"
119119
implementation "com.github.dozermapper:dozer-core:7.0.0"
@@ -123,7 +123,7 @@ dependencies {
123123
// boot starter
124124
testImplementation 'org.springframework.boot:spring-boot-starter-validation'
125125
testImplementation "org.springframework.boot:spring-boot-starter-test"
126-
testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc:3.0.2'
126+
testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc:3.0.3'
127127
testImplementation "org.springframework.security:spring-security-test"
128128

129129
//Java 11 Support

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum

0 commit comments

Comments
 (0)