Skip to content

Commit 76992c2

Browse files
tijsrademakerstijsrademakers
committed
Merge with main branch
2 parents fc0b0fd + 69b6a8a commit 76992c2

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

‎distro/src/notice.txt‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ Quartz
6969
This software includes unchanged copies of the following libraries:
7070

7171
aopalliance aopalliance 1.0 Public Domain
72-
com.fasterxml.jackson.core jackson-annotations 2.15.2 The Apache Software License, Version 2.0
73-
com.fasterxml.jackson.core jackson-core 2.15.2 The Apache Software License, Version 2.0
74-
com.fasterxml.jackson.core jackson-databind 2.15.2 The Apache Software License, Version 2.0
75-
com.fasterxml.jackson.datatype jackson-datatype-joda 2.15.2 The Apache Software License, Version 2.0
72+
com.fasterxml.jackson.core jackson-annotations 2.15.3 The Apache Software License, Version 2.0
73+
com.fasterxml.jackson.core jackson-core 2.15.3 The Apache Software License, Version 2.0
74+
com.fasterxml.jackson.core jackson-databind 2.15.3 The Apache Software License, Version 2.0
75+
com.fasterxml.jackson.datatype jackson-datatype-joda 2.15.3 The Apache Software License, Version 2.0
7676
com.google.guava guava 31.0.1-jre The Apache Software License, Version 2.0
7777
com.h2database h2 2.1.214 The H2 License, Version 1.0
7878
com.fasterxml.uuid java-uuid-generator 3.3.0 The Apache Software License, Version 2.0
@@ -107,22 +107,22 @@ org.mvel mvel2 2.2.6.Final The
107107
org.slf4j jcl-over-slf4j 2.0.9 MIT License
108108
org.slf4j slf4j-api 2.0.9 MIT License
109109
org.slf4j slf4j-log4j12 2.0.9 MIT License
110-
org.springframework spring-beans 6.0.12 The Apache Software License, Version 2.0
111-
org.springframework spring-core 6.0.12 The Apache Software License, Version 2.0
112-
org.springframework spring-context 6.0.12 The Apache Software License, Version 2.0
113-
org.springframework spring-context-support 6.0.12 The Apache Software License, Version 2.0
114-
org.springframework spring-jdbc 6.0.12 The Apache Software License, Version 2.0
115-
org.springframework spring-tx 6.0.12 The Apache Software License, Version 2.0
116-
org.springframework spring-web 6.0.12 The Apache Software License, Version 2.0
117-
org.springframework spring-webmvc 6.0.12 The Apache Software License, Version 2.0
118-
org.springframework spring-aop 6.0.12 The Apache Software License, Version 2.0
119-
org.springframework spring-core 6.0.12 The Apache Software License, Version 2.0
120-
org.springframework spring-expression 6.0.12 The Apache Software License, Version 2.0
121-
org.springframework spring-orm 6.0.12 The Apache Software License, Version 2.0
122-
org.springframework.security spring-security-config 6.1.4 The Apache Software License, Version 2.0
123-
org.springframework.security spring-security-core 6.1.4 The Apache Software License, Version 2.0
124-
org.springframework.security spring-security-crypto 6.1.4 The Apache Software License, Version 2.0
125-
org.springframework.security spring-security-web 6.1.4 The Apache Software License, Version 2.0
110+
org.springframework spring-beans 6.0.13 The Apache Software License, Version 2.0
111+
org.springframework spring-core 6.0.13 The Apache Software License, Version 2.0
112+
org.springframework spring-context 6.0.13 The Apache Software License, Version 2.0
113+
org.springframework spring-context-support 6.0.13 The Apache Software License, Version 2.0
114+
org.springframework spring-jdbc 6.0.13 The Apache Software License, Version 2.0
115+
org.springframework spring-tx 6.0.13 The Apache Software License, Version 2.0
116+
org.springframework spring-web 6.0.13 The Apache Software License, Version 2.0
117+
org.springframework spring-webmvc 6.0.13 The Apache Software License, Version 2.0
118+
org.springframework spring-aop 6.0.13 The Apache Software License, Version 2.0
119+
org.springframework spring-core 6.0.13 The Apache Software License, Version 2.0
120+
org.springframework spring-expression 6.0.13 The Apache Software License, Version 2.0
121+
org.springframework spring-orm 6.0.13 The Apache Software License, Version 2.0
122+
org.springframework.security spring-security-config 6.1.5 The Apache Software License, Version 2.0
123+
org.springframework.security spring-security-core 6.1.5 The Apache Software License, Version 2.0
124+
org.springframework.security spring-security-crypto 6.1.5 The Apache Software License, Version 2.0
125+
org.springframework.security spring-security-web 6.1.5 The Apache Software License, Version 2.0
126126
org.tinyjee.jgraphx jgraphx 1.10.4.1 JGraph Ltd - 3 clause BSD license
127127
org.yaml snakeyaml 1.17 The Apache Software License, Version 2.0
128128
xerces xercesImpl 2.12.1 The Apache Software License, Version 2.0

‎pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
<distributionManagementSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</distributionManagementSnapshotsUrl>
1515
<jdk.version>17</jdk.version>
1616
<!-- When updating one spring version, make sure that all of them are updated to their latest compatible versions -->
17-
<spring.boot.version>3.1.4</spring.boot.version>
18-
<spring.framework.version>6.0.12</spring.framework.version>
19-
<spring.security.version>6.1.4</spring.security.version>
20-
<spring.amqp.version>3.0.9</spring.amqp.version>
21-
<spring.kafka.version>3.0.10</spring.kafka.version>
17+
<spring.boot.version>3.1.5</spring.boot.version>
18+
<spring.framework.version>6.0.13</spring.framework.version>
19+
<spring.security.version>6.1.5</spring.security.version>
20+
<spring.amqp.version>3.0.10</spring.amqp.version>
21+
<spring.kafka.version>3.0.12</spring.kafka.version>
2222
<spring.ldap.version>3.1.1</spring.ldap.version>
2323
<reactor-netty.version>1.1.8</reactor-netty.version>
24-
<jackson.version>2.15.2</jackson.version>
24+
<jackson.version>2.15.3</jackson.version>
2525
<jakarta-jms.version>3.1.0</jakarta-jms.version>
2626
<camel.version>4.0.0</camel.version>
2727
<cxf.version>4.0.2</cxf.version>
@@ -161,7 +161,7 @@
161161
<dependency>
162162
<groupId>jakarta.xml.bind</groupId>
163163
<artifactId>jakarta.xml.bind-api</artifactId>
164-
<version>4.0.0</version>
164+
<version>4.0.1</version>
165165
</dependency>
166166
<dependency>
167167
<groupId>org.glassfish.jaxb</groupId>
@@ -270,7 +270,7 @@
270270
<dependency>
271271
<groupId>org.hibernate.orm</groupId>
272272
<artifactId>hibernate-core</artifactId>
273-
<version>6.2.9.Final</version>
273+
<version>6.2.13.Final</version>
274274
</dependency>
275275
<dependency>
276276
<groupId>org.apache.groovy</groupId>

0 commit comments

Comments
 (0)