Skip to content

Commit 359e445

Browse files
committed
Merge remote-tracking branch 'origin/main' into SRU2024_v10
2 parents 2a9637f + 68e6043 commit 359e445

File tree

3 files changed

+89
-10
lines changed

3 files changed

+89
-10
lines changed

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
2+
3+
version: 2
4+
updates:
5+
- package-ecosystem: "gradle"
6+
directory: "/"
7+
schedule:
8+
interval: "weekly"
9+
ignore:
10+
- dependency-name: "com.diffplug.spotless:spotless-plugin-gradle"
11+
- dependency-name: "pl.allegro.tech.build:axion-release-plugin"
12+
- dependency-name: "org.apache.sshd:sshd-common"

.github/workflows/gradle.yml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
2+
3+
name: Java CI with Gradle
4+
5+
on:
6+
push:
7+
branches: [ "main", "SRU2024_v10" ]
8+
pull_request:
9+
branches: [ "main" ]
10+
11+
jobs:
12+
13+
build:
14+
15+
runs-on: ubuntu-latest
16+
permissions:
17+
contents: read
18+
19+
steps:
20+
- uses: actions/checkout@v4
21+
22+
# Set the JDK 11 for the latest code branch (Prowide Core v10)
23+
- name: Set up JDK 11
24+
if: github.ref == 'refs/heads/SRU2024_v10' || github.head_ref == 'SRU2024_v10'
25+
uses: actions/setup-java@v4
26+
with:
27+
java-version: '11'
28+
distribution: 'temurin'
29+
30+
# Set the JDK 8 for the legacy code branch
31+
- name: Set up JDK 8
32+
if: github.ref != 'refs/heads/SRU2024_v10' && github.head_ref != 'SRU2024_v10'
33+
uses: actions/setup-java@v4
34+
with:
35+
java-version: '8'
36+
distribution: 'temurin'
37+
38+
# Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
39+
# See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
40+
- name: Setup Gradle
41+
uses: gradle/actions/setup-gradle@v4
42+
43+
- name: Build with Gradle Wrapper
44+
run: ./gradlew build
45+
46+
# This job generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies.
47+
# We only do it for the SRU2024_v10 branch to avoid spamming the Dependabot alerts for the legacy Java 8 code.
48+
dependency-submission:
49+
if: github.ref == 'refs/heads/SRU2024_v10' || github.head_ref == 'SRU2024_v10'
50+
runs-on: ubuntu-latest
51+
permissions:
52+
contents: write
53+
54+
steps:
55+
- uses: actions/checkout@v4
56+
- name: Set up JDK 11
57+
uses: actions/setup-java@v4
58+
with:
59+
java-version: '11'
60+
distribution: 'temurin'
61+
62+
# Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies.
63+
# See: https://github.com/gradle/actions/blob/main/dependency-submission/README.md
64+
- name: Generate and submit dependency graph
65+
uses: gradle/actions/dependency-submission@v4
66+
with:
67+
dependency-graph-exclude-projects: ':buildSrc'

build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ subprojects {
100100
version = rootProject.version
101101

102102
dependencies {
103-
implementation 'org.apache.commons:commons-lang3:3.12.0'
104-
implementation 'com.google.code.gson:gson:2.9.0'
103+
implementation 'org.apache.commons:commons-lang3:3.17.0'
104+
implementation 'com.google.code.gson:gson:2.11.0'
105105
implementation 'com.sun.xml.bind:jaxb-impl:4.0.5'
106106
// bind-api is included transitively by jaxb-impl
107107
// implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
@@ -126,8 +126,8 @@ configure(subprojects.findAll {it.name.endsWith('-mx')}) {
126126
api project(':iso20022-core')
127127
implementation project(specificTypesProject)
128128

129-
implementation 'org.apache.commons:commons-lang3:3.12.0'
130-
implementation 'com.google.code.gson:gson:2.9.0'
129+
implementation 'org.apache.commons:commons-lang3:3.17.0'
130+
implementation 'com.google.code.gson:gson:2.11.0'
131131

132132
implementation 'com.sun.xml.bind:jaxb-impl:4.0.5'
133133
// bind-api is included transitively by jaxb-impl
@@ -149,7 +149,7 @@ project(':iso20022-core') {
149149
// included build
150150
api 'com.prowidesoftware:pw-swift-core:SRU2024-10.2.5'
151151

152-
implementation 'org.apache.commons:commons-lang3:3.14.0'
152+
implementation 'org.apache.commons:commons-lang3:3.17.0'
153153
implementation 'com.google.code.gson:gson:2.11.0'
154154

155155
compileOnly 'jakarta.persistence:jakarta.persistence-api:3.1.0'
@@ -158,10 +158,10 @@ project(':iso20022-core') {
158158
testImplementation 'jakarta.persistence:jakarta.persistence-api:3.1.0'
159159
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
160160
testImplementation 'com.google.guava:guava:33.2.0-jre'
161-
testImplementation 'org.assertj:assertj-core:3.25.3'
161+
testImplementation 'org.assertj:assertj-core:3.27.0'
162162
testImplementation 'org.xmlunit:xmlunit-core:2.10.0'
163-
testImplementation 'org.xmlunit:xmlunit-matchers:2.9.0'
164-
testImplementation 'org.xmlunit:xmlunit-assertj:2.9.0'
163+
testImplementation 'org.xmlunit:xmlunit-matchers:2.10.0'
164+
testImplementation 'org.xmlunit:xmlunit-assertj:2.10.0'
165165
testImplementation project(':model-acmt-mx')
166166
testImplementation project(':model-acmt-types')
167167
testImplementation project(':model-camt-mx')
@@ -486,9 +486,9 @@ task('testOn17', type: Test) {
486486
}
487487
}
488488

489-
task('testOn19', type: Test) {
489+
task('testOn21', type: Test) {
490490
javaLauncher = javaToolchains.launcherFor {
491-
languageVersion = JavaLanguageVersion.of(19)
491+
languageVersion = JavaLanguageVersion.of(21)
492492
}
493493
}
494494

0 commit comments

Comments
 (0)