Skip to content

Commit f067a56

Browse files
committed
Merge remote-tracking branch 'origin/dependabot/maven/main/test-a9a81722d7' into dependabot/maven/main/test-a9a81722d7
# Conflicts: # dependency-bundles/bom/pom.xml
2 parents 7e76a66 + 6371023 commit f067a56

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.github/dependabot.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ updates:
3030
test:
3131
dependency-type: "development"
3232
ignore:
33+
- dependency-name: "org.springframework.boot:*"
34+
versions: [ ">=4.0.0" ]
35+
- dependency-name: "org.springframework:*"
36+
versions: [ ">=7.0.0" ]
3337
# updating leads to ignoring our formatting rules
3438
- dependency-name: 'net.revelc.code.formatter:formatter-maven-plugin'
3539
# updating leads to unintended formatting of POM files

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@
9191
<jackson.version>2.20.1</jackson.version>
9292
<jackson.annotations.version>2.20</jackson.annotations.version>
9393
<!-- WordUtils used twice in OData generator -->
94-
<json.version>20250517</json.version>
94+
<json.version>20251224</json.version>
9595
<!-- XML used once in SOAP payload deserialisation -->
9696
<!-- End of non-essential dependencies -->
9797
<!-- Fully internal (test) dependencies -->
9898
<!-- Spring dependencies -->
9999
<!-- Keep these versions consistent with the ones from the SAP Java Buildpack (after their 2.0 release) -->
100100
<!-- see https://github.wdf.sap.corp/xs2-java/xs-java-buildpack/blob/master/resources/pom.xml -->
101-
<spring.version>6.2.12</spring.version>
101+
<spring.version>6.2.15</spring.version>
102102
<spring-security.version>6.1.5</spring-security.version>
103103
<slf4j.version>2.0.17</slf4j.version>
104104
<assertj-core.version>3.27.6</assertj-core.version>

0 commit comments

Comments
 (0)