This is an automated email from the ASF dual-hosted git repository.
anovikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git
The following commit(s) were added to refs/heads/master by this push:
new 0abed4fa IGNITE-27532 Get rid of the use of vulnerable commons-lang,
Spring. (#333)
0abed4fa is described below
commit 0abed4fa269c0bfe70a785a5718b35b6b5150946
Author: Andrey Novikov <[email protected]>
AuthorDate: Tue Jan 20 12:56:25 2026 +0700
IGNITE-27532 Get rid of the use of vulnerable commons-lang, Spring. (#333)
---
DEVNOTES.md | 6 +++---
.../boot/autoconfigure/IgniteClientAutoConfigureTest.java | 12 ++++++------
.../cache/spring/spring-caching-ignite-spring-bean.xml | 2 ++
modules/spring-data-ext/examples/pom.xml | 5 ++---
modules/spring-data-ext/spring-data/pom.xml | 11 +++++------
.../springdata/repository/query/IgniteRepositoryQuery.java | 4 ++--
modules/spring-session-ext/pom.xml | 6 +++---
modules/spring-tx-ext/examples/pom.xml | 6 +++---
modules/spring-tx-ext/spring-tx/pom.xml | 6 +++---
.../java/config/spring-transactions-ignite-spring-bean.xml | 6 ++++++
.../test/java/org/apache/ignite/spring-injection-test.xml | 6 ++++++
parent-internal/pom.xml | 7 ++++---
12 files changed, 45 insertions(+), 32 deletions(-)
diff --git a/DEVNOTES.md b/DEVNOTES.md
index 2bf1bca6..b3d47b49 100644
--- a/DEVNOTES.md
+++ b/DEVNOTES.md
@@ -71,11 +71,11 @@ of the Apache Software Foundation release process for
better understanding the w
git push origin release/ignite-aws-ext-1.0.0
```
-- Update Extension parent reference version and the extension module version
using the `scripts/update-versions.sh`.
+- Update Extension parent reference version and the extension module version
using the `scripts/vote_\[git\]_update_versions.sh`.
```shell
- # Usage: scripts/update-versions.sh [<ignite-parent-version>] <module-path>
<module-release-version>
- scripts/update-versions.sh [2.13.0] modules/asw-ext/ 1.0.0
+ # Usage: scripts/vote_\[git\]_update_versions.sh [<ignite-parent-version>]
<module-path> <module-release-version>
+ scripts/vote_\[git\]_update_versions.sh [2.13.0] modules/asw-ext/ 1.0.0
```
- Run the [Extension Prepare Release Candidate][7] GitHub Action using the
release branch as job source
diff --git
a/modules/spring-boot-thin-client-autoconfigure-ext/spring-boot-thin-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTest.java
b/modules/spring-boot-thin-client-autoconfigure-ext/spring-boot-thin-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTest.java
index 642768b3..97d32112 100644
---
a/modules/spring-boot-thin-client-autoconfigure-ext/spring-boot-thin-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTest.java
+++
b/modules/spring-boot-thin-client-autoconfigure-ext/spring-boot-thin-client-autoconfigure/src/test/java/org/apache/ignite/springframework/boot/autoconfigure/IgniteClientAutoConfigureTest.java
@@ -38,7 +38,6 @@ import
org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
/** Tests {@link IgniteClientAutoConfiguration} feature. */
@ExtendWith(SpringExtension.class)
@@ -81,7 +80,7 @@ public class IgniteClientAutoConfigureTest {
/** Tests that Ignite node start without explicit configuration. */
@Test
- public void testIgniteClientStarts() throws Exception {
+ public void testIgniteClientStarts() {
contextRunner
.withPropertyValues("ignite-client.addresses=" + DEFAULT_ADDR)
.run(this::checkContext);
@@ -89,7 +88,7 @@ public class IgniteClientAutoConfigureTest {
/** Tests that Ignite node will use configuration provided in {@link
BeanFactory}. */
@Test
- public void testIgniteClientUseProvidedConfiguration() throws Exception {
+ public void testIgniteClientUseProvidedConfiguration() {
contextRunner
.withBean(ClientConfiguration.class, () -> new
ClientConfiguration().setAddresses(DEFAULT_ADDR))
.run(this::checkContext);
@@ -97,7 +96,7 @@ public class IgniteClientAutoConfigureTest {
/** Tests that Spring will use {@link IgniteClientConfigurer} to customize
{@link ClientConfiguration}. */
@Test
- public void testIgniteClientConfigurer() throws Exception {
+ public void testIgniteClientConfigurer() {
contextRunner
.withBean(IgniteClientConfigurer.class, () -> cfg ->
cfg.setAddresses(DEFAULT_ADDR))
.run(this::checkContext);
@@ -108,7 +107,7 @@ public class IgniteClientAutoConfigureTest {
* provided by {@link IgniteClientConfigurer}.
*/
@Test
- public void testApplicationPropertiesOverridesConfigurer() throws
Exception {
+ public void testApplicationPropertiesOverridesConfigurer() {
contextRunner
.withPropertyValues("ignite-client.addresses=" + DEFAULT_ADDR)
.withBean(IgniteClientConfigurer.class,
@@ -130,6 +129,7 @@ public class IgniteClientAutoConfigureTest {
IgniteClient cli = context.getBean(IgniteClient.class);
- assertTrue(CACHES.containsAll(cli.cacheNames()));
+ assertThat(cli.cacheNames())
+ .containsExactlyInAnyOrderElementsOf(CACHES);
}
}
diff --git
a/modules/spring-cache-ext/src/test/java/org/apache/ignite/cache/spring/spring-caching-ignite-spring-bean.xml
b/modules/spring-cache-ext/src/test/java/org/apache/ignite/cache/spring/spring-caching-ignite-spring-bean.xml
index 2671a5dd..3331a89a 100644
---
a/modules/spring-cache-ext/src/test/java/org/apache/ignite/cache/spring/spring-caching-ignite-spring-bean.xml
+++
b/modules/spring-cache-ext/src/test/java/org/apache/ignite/cache/spring/spring-caching-ignite-spring-bean.xml
@@ -27,6 +27,8 @@
<bean id="mySpringBean" class="org.apache.ignite.IgniteSpringBean">
<property name="configuration">
<bean id="ignite.cfg"
class="org.apache.ignite.configuration.IgniteConfiguration">
+ <property name="localHost" value="127.0.0.1"/>
+
<property name="peerClassLoadingEnabled" value="true"/>
<property name="igniteInstanceName" value="testGrid"/>
diff --git a/modules/spring-data-ext/examples/pom.xml
b/modules/spring-data-ext/examples/pom.xml
index 27d3a452..8e126a19 100644
--- a/modules/spring-data-ext/examples/pom.xml
+++ b/modules/spring-data-ext/examples/pom.xml
@@ -33,7 +33,6 @@
</parent>
<artifactId>ignite-spring-data-ext-examples</artifactId>
- <version>${project.parent.version}</version>
<url>https://ignite.apache.org</url>
@@ -65,13 +64,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>${spring61.version}</version>
+ <version>${spring6.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring61.version}</version>
+ <version>${spring6.version}</version>
</dependency>
<dependency>
diff --git a/modules/spring-data-ext/spring-data/pom.xml
b/modules/spring-data-ext/spring-data/pom.xml
index 2ed39979..8c3c157c 100644
--- a/modules/spring-data-ext/spring-data/pom.xml
+++ b/modules/spring-data-ext/spring-data/pom.xml
@@ -33,7 +33,6 @@
</parent>
<artifactId>ignite-spring-data-ext</artifactId>
- <version>${project.parent.version}</version>
<url>https://ignite.apache.org</url>
@@ -59,14 +58,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring61.version}</version>
+ <version>${spring6.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>${spring61.version}</version>
+ <version>${spring6.version}</version>
<scope>provided</scope>
</dependency>
@@ -85,9 +84,9 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons.lang.version}</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons.lang3.version}</version>
</dependency>
<dependency>
diff --git
a/modules/spring-data-ext/spring-data/src/main/java/org/apache/ignite/springdata/repository/query/IgniteRepositoryQuery.java
b/modules/spring-data-ext/spring-data/src/main/java/org/apache/ignite/springdata/repository/query/IgniteRepositoryQuery.java
index ff2aaf6e..1fdf9438 100644
---
a/modules/spring-data-ext/spring-data/src/main/java/org/apache/ignite/springdata/repository/query/IgniteRepositoryQuery.java
+++
b/modules/spring-data-ext/spring-data/src/main/java/org/apache/ignite/springdata/repository/query/IgniteRepositoryQuery.java
@@ -38,8 +38,8 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.cache.Cache;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.reflect.FieldUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.ignite.IgniteException;
import org.apache.ignite.cache.query.FieldsQueryCursor;
import org.apache.ignite.cache.query.Query;
diff --git a/modules/spring-session-ext/pom.xml
b/modules/spring-session-ext/pom.xml
index b80fcd00..7c6d41db 100644
--- a/modules/spring-session-ext/pom.xml
+++ b/modules/spring-session-ext/pom.xml
@@ -37,8 +37,8 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
- <spring.session.version>3.2.2</spring.session.version>
- <spring.security.version>6.2.4</spring.security.version>
+ <spring.session.version>3.5.4</spring.session.version>
+ <spring.security.version>6.5.7</spring.security.version>
<jakarta.annotation.version>3.0.0</jakarta.annotation.version>
<assertj.version>3.20.0</assertj.version>
<junit.jupiter.version>5.10.2</junit.jupiter.version>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
- <version>${spring61.version}</version>
+ <version>${spring6.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/modules/spring-tx-ext/examples/pom.xml
b/modules/spring-tx-ext/examples/pom.xml
index b79e4d9b..4d057f7d 100644
--- a/modules/spring-tx-ext/examples/pom.xml
+++ b/modules/spring-tx-ext/examples/pom.xml
@@ -69,19 +69,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring61.version}</version>
+ <version>${spring6.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>${spring61.version}</version>
+ <version>${spring6.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>${spring61.version}</version>
+ <version>${spring6.version}</version>
</dependency>
<dependency>
diff --git a/modules/spring-tx-ext/spring-tx/pom.xml
b/modules/spring-tx-ext/spring-tx/pom.xml
index 6ee59489..c17c88fb 100644
--- a/modules/spring-tx-ext/spring-tx/pom.xml
+++ b/modules/spring-tx-ext/spring-tx/pom.xml
@@ -57,21 +57,21 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring61.version}</version>
+ <version>${spring6.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>${spring61.version}</version>
+ <version>${spring6.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>${spring61.version}</version>
+ <version>${spring6.version}</version>
<optional>true</optional>
</dependency>
diff --git
a/modules/spring-tx-ext/spring-tx/src/test/java/config/spring-transactions-ignite-spring-bean.xml
b/modules/spring-tx-ext/spring-tx/src/test/java/config/spring-transactions-ignite-spring-bean.xml
index 69918b10..bbf5ab15 100644
---
a/modules/spring-tx-ext/spring-tx/src/test/java/config/spring-transactions-ignite-spring-bean.xml
+++
b/modules/spring-tx-ext/spring-tx/src/test/java/config/spring-transactions-ignite-spring-bean.xml
@@ -41,6 +41,12 @@
</list>
</property>
+ <property name="transactionConfiguration">
+ <bean
class="org.apache.ignite.configuration.TransactionConfiguration">
+ <property name="txSerializableEnabled" value="false"/>
+ </bean>
+ </property>
+
<property name="localHost" value="127.0.0.1"/>
<property name="discoverySpi">
diff --git
a/modules/spring-tx-ext/spring-tx/src/test/java/org/apache/ignite/spring-injection-test.xml
b/modules/spring-tx-ext/spring-tx/src/test/java/org/apache/ignite/spring-injection-test.xml
index 14072ff0..b4cafdb6 100644
---
a/modules/spring-tx-ext/spring-tx/src/test/java/org/apache/ignite/spring-injection-test.xml
+++
b/modules/spring-tx-ext/spring-tx/src/test/java/org/apache/ignite/spring-injection-test.xml
@@ -38,6 +38,12 @@
<property name="localHost" value="127.0.0.1"/>
+ <property name="transactionConfiguration">
+ <bean
class="org.apache.ignite.configuration.TransactionConfiguration">
+ <property name="txSerializableEnabled" value="false"/>
+ </bean>
+ </property>
+
<property name="igniteInstanceName" value="springInjectionTest"/>
</bean>
</beans>
diff --git a/parent-internal/pom.xml b/parent-internal/pom.xml
index e6f5e701..869d2bea 100644
--- a/parent-internal/pom.xml
+++ b/parent-internal/pom.xml
@@ -35,13 +35,14 @@
<version>1</version>
<properties>
- <spring-boot.version>3.2.12</spring-boot.version>
- <spring.data.version>3.2.12</spring.data.version>
- <spring61.version>6.1.15</spring61.version>
+ <spring-boot.version>3.5.9</spring-boot.version>
+ <spring.data.version>3.5.7</spring.data.version>
+ <spring6.version>6.2.15</spring6.version>
<activemq.version>5.12.0</activemq.version>
<aspectj.version>1.8.13</aspectj.version>
<embedded.postgres.version>2.0.3</embedded.postgres.version>
<commons.dbcp2.version>2.13.0</commons.dbcp2.version>
+ <commons.lang3.version>3.20.0</commons.lang3.version>
<!--
NOTE: The dependency versions below must be changed in the release
branch up to
