Skip to content

Commit 411055f

Browse files
fmbenhassinefmbenhassine
committed
Update dependencies
1 parent f2cfda0 commit 411055f

File tree

3 files changed

+39
-25
lines changed

3 files changed

+39
-25
lines changed

‎pom.xml

+24-24
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<spring-framework.version>6.0.0-SNAPSHOT</spring-framework.version>
5656
<spring-retry.version>1.3.1</spring-retry.version>
5757
<spring-integration.version>6.0.0-SNAPSHOT</spring-integration.version>
58-
<micrometer.version>1.7.4-SNAPSHOT</micrometer.version>
58+
<micrometer.version>1.8.1-SNAPSHOT</micrometer.version>
5959
<jackson.version>2.13.0</jackson.version>
6060

6161
<!-- optional production dependencies -->
@@ -67,7 +67,7 @@
6767
<spring-amqp.version>3.0.0-SNAPSHOT</spring-amqp.version>
6868
<spring-ldap.version>2.3.5.BUILD-SNAPSHOT</spring-ldap.version>
6969
<avro.version>1.9.2</avro.version>
70-
<gson.version>2.8.6</gson.version>
70+
<gson.version>2.8.9</gson.version>
7171
<hibernate-core-jakarta.version>5.6.1.Final</hibernate-core-jakarta.version>
7272
<jakarta.annotation-api.version>2.0.0</jakarta.annotation-api.version>
7373
<jakarta.mail-api.version>2.0.1</jakarta.mail-api.version>
@@ -76,48 +76,48 @@
7676
<jakarta.validation-api.version>3.0.0</jakarta.validation-api.version>
7777
<jakarta.persistence-api.version>3.0.0</jakarta.persistence-api.version>
7878
<neo4j-ogm-core.version>3.2.21</neo4j-ogm-core.version>
79-
<mongodb-driver-sync.version>4.2.3</mongodb-driver-sync.version>
80-
<xstream.version>1.4.16</xstream.version>
81-
<junit-jupiter.version>5.7.1</junit-jupiter.version>
79+
<mongodb-driver-sync.version>4.4.0</mongodb-driver-sync.version>
80+
<xstream.version>1.4.18</xstream.version>
81+
<junit-jupiter.version>5.8.1</junit-jupiter.version>
8282

8383
<!-- test dependencies -->
8484
<junit.version>4.13.2</junit.version>
8585
<hamcrest.version>2.2</hamcrest.version>
86-
<assertj.version>3.19.0</assertj.version>
87-
<mockito.version>3.9.0</mockito.version>
88-
<xmlunit.version>2.8.2</xmlunit.version>
89-
<commons-io.version>2.8.0</commons-io.version>
90-
<commons-dbcp2.version>2.8.0</commons-dbcp2.version>
91-
<slf4j.version>1.7.30</slf4j.version>
92-
<hsqldb.version>2.5.2</hsqldb.version>
86+
<assertj.version>3.21.0</assertj.version>
87+
<mockito.version>4.1.0</mockito.version>
88+
<xmlunit.version>2.8.3</xmlunit.version>
89+
<commons-io.version>2.11.0</commons-io.version>
90+
<commons-dbcp2.version>2.9.0</commons-dbcp2.version>
91+
<slf4j.version>1.7.32</slf4j.version>
92+
<hsqldb.version>2.6.1</hsqldb.version>
9393
<h2.version>1.4.200</h2.version>
94-
<sqlite.version>3.34.0</sqlite.version>
94+
<sqlite.version>3.36.0.3</sqlite.version>
9595
<derby.version>10.14.2.0</derby.version>
9696
<artemis.version>2.19.0</artemis.version>
97-
<jaxb-core.version>3.0.0</jaxb-core.version>
97+
<jaxb-core.version>3.0.2</jaxb-core.version>
9898
<log4j.version>2.14.1</log4j.version>
9999
<hibernate-validator.version>7.0.1.Final</hibernate-validator.version>
100100
<jakarta.el-api.version>4.0.0</jakarta.el-api.version>
101101
<jakarta.el.version>4.0.2</jakarta.el.version>
102102
<jakarta.inject-api.version>2.0.0</jakarta.inject-api.version>
103103
<jakarta.xml.bind-api.version>3.0.1</jakarta.xml.bind-api.version>
104104
<jakarta.mail.version>2.0.1</jakarta.mail.version>
105-
<woodstox-core.version>6.2.5</woodstox-core.version>
106-
<aspectj.version>1.9.6</aspectj.version>
107-
<mysql-connector-java.version>8.0.23</mysql-connector-java.version>
108-
<postgresql.version>42.2.22</postgresql.version>
105+
<woodstox-core.version>6.2.7</woodstox-core.version>
106+
<aspectj.version>1.9.7</aspectj.version>
107+
<mysql-connector-java.version>8.0.27</mysql-connector-java.version>
108+
<postgresql.version>42.3.1</postgresql.version>
109109
<db2.version>11.5.6.0</db2.version>
110110
<oracle.version>21.1.0.0</oracle.version>
111111
<sqlserver.version>9.2.1.jre8</sqlserver.version>
112112
<jtds.version>1.3.1</jtds.version>
113-
<testcontainers.version>1.15.3</testcontainers.version>
113+
<testcontainers.version>1.16.2</testcontainers.version>
114114
<com.ibm.jbatch-tck-spi.version>1.0</com.ibm.jbatch-tck-spi.version>
115115
<jsonassert.version>1.5.0</jsonassert.version>
116116

117117
<!-- samples dependencies -->
118118
<spring-rabbit.version>3.0.0-SNAPSHOT</spring-rabbit.version>
119119
<quartz.version>2.3.2</quartz.version>
120-
<prometheus_pushgateway.version>0.10.0</prometheus_pushgateway.version>
120+
<prometheus_pushgateway.version>0.11.0</prometheus_pushgateway.version>
121121
<groovy.version>2.5.14</groovy.version>
122122

123123
<!-- documentation dependencies -->
@@ -129,17 +129,17 @@
129129
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
130130
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
131131
<maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
132-
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
132+
<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
133133
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
134134
<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
135135
<flatten-maven-plugin.version>1.2.7</flatten-maven-plugin.version>
136136
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
137137
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
138-
<asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
138+
<asciidoctor-maven-plugin.version>2.2.1</asciidoctor-maven-plugin.version>
139139
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
140-
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
140+
<maven-dependency-plugin.version>3.2.0</maven-dependency-plugin.version>
141141
<maven-site-plugin.version>3.9.1</maven-site-plugin.version>
142-
<maven-project-info-reports-plugin.version>3.1.1</maven-project-info-reports-plugin.version>
142+
<maven-project-info-reports-plugin.version>3.1.2</maven-project-info-reports-plugin.version>
143143
<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
144144
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
145145
</properties>

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/XStreamUnmarshallingTests.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2014 the original author or authors.
2+
* Copyright 2010-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,6 +19,10 @@
1919
import java.util.HashMap;
2020
import java.util.Map;
2121

22+
import com.thoughtworks.xstream.security.ArrayTypePermission;
23+
import com.thoughtworks.xstream.security.ExplicitTypePermission;
24+
import com.thoughtworks.xstream.security.WildcardTypePermission;
25+
2226
import org.springframework.batch.item.xml.domain.Trade;
2327
import org.springframework.oxm.Unmarshaller;
2428
import org.springframework.oxm.xstream.XStreamMarshaller;
@@ -38,6 +42,7 @@ protected Unmarshaller getUnmarshaller() throws Exception {
3842
unmarshaller.addAlias("customer", String.class);
3943
unmarshaller.addAlias("price", BigDecimal.class);*/
4044
unmarshaller.setAliases(aliasesMap);
45+
unmarshaller.setTypePermissions(new ExplicitTypePermission(new String[]{"org.springframework.batch.item.xml.domain.Trade"}));
4146
return unmarshaller;
4247
}
4348

‎spring-batch-samples/src/main/resources/jobs/iosample/xml.xml

+9
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,15 @@
2828
<entry key="name" value="java.lang.String" />
2929
</util:map>
3030
</property>
31+
<property name="typePermissions">
32+
<bean class="com.thoughtworks.xstream.security.ExplicitTypePermission">
33+
<constructor-arg>
34+
<util:list>
35+
<value>org.springframework.batch.sample.domain.trade.CustomerCredit</value>
36+
</util:list>
37+
</constructor-arg>
38+
</bean>
39+
</property>
3140
</bean>
3241

3342
<bean id="outputResource" class="org.springframework.core.io.FileSystemResource">

0 commit comments

Comments
 (0)