Skip to content
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

PR for v1.2.6 #403

Open
wants to merge 36 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 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
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.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.6.0
uses: actions/setup-java@v4.7.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.6.0
uses: actions/setup-java@v4.7.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.6.0
uses: actions/setup-java@v4.7.0
with:
java-version: 17
distribution: zulu
Expand Down
22 changes: 11 additions & 11 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.12.2"
id "io.freefair.maven-publish-java" version "8.12.2"
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.0"
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.3'
springDocVersion = '2.8.5'
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.3'
// 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.3'


// springdoc
Expand All @@ -91,10 +91,10 @@ dependencies {
// includes commons-lang3
implementation "org.apache.commons:commons-text:1.13.0"
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.12.1"

// Database
implementation "com.h2database:h2:2.3.232"
Expand All @@ -108,7 +108,7 @@ dependencies {

//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.4"
// log4j core
implementation "org.apache.logging.log4j:log4j-core"
implementation "ch.qos.logback:logback-classic"
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.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ 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.
Expand Down