diff --git a/DEVNOTES.md b/DEVNOTES.md index 2bf1bca65..b3d47b498 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 [] - scripts/update-versions.sh [2.13.0] modules/asw-ext/ 1.0.0 + # Usage: scripts/vote_\[git\]_update_versions.sh [] + 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 642768b32..97d321121 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 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 void beforeTest() { /** 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 void testIgniteClientStarts() throws Exception { /** 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 void testIgniteClientUseProvidedConfiguration() throws Exception { /** 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 void testIgniteClientConfigurer() throws Exception { * 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 @@ private void checkContext(AssertableApplicationContext context) { 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 2671a5ddb..3331a89af 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 @@ + + diff --git a/modules/spring-data-ext/examples/pom.xml b/modules/spring-data-ext/examples/pom.xml index 27d3a452f..8e126a199 100644 --- a/modules/spring-data-ext/examples/pom.xml +++ b/modules/spring-data-ext/examples/pom.xml @@ -33,7 +33,6 @@ ignite-spring-data-ext-examples - ${project.parent.version} https://ignite.apache.org @@ -65,13 +64,13 @@ org.springframework spring-tx - ${spring61.version} + ${spring6.version} org.springframework spring-context - ${spring61.version} + ${spring6.version} diff --git a/modules/spring-data-ext/spring-data/pom.xml b/modules/spring-data-ext/spring-data/pom.xml index 2ed39979a..8c3c157c1 100644 --- a/modules/spring-data-ext/spring-data/pom.xml +++ b/modules/spring-data-ext/spring-data/pom.xml @@ -33,7 +33,6 @@ ignite-spring-data-ext - ${project.parent.version} https://ignite.apache.org @@ -59,14 +58,14 @@ org.springframework spring-context - ${spring61.version} + ${spring6.version} provided org.springframework spring-tx - ${spring61.version} + ${spring6.version} provided @@ -85,9 +84,9 @@ - commons-lang - commons-lang - ${commons.lang.version} + org.apache.commons + commons-lang3 + ${commons.lang3.version} 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 ff2aaf6ec..1fdf9438c 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.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 b80fcd00d..7c6d41db0 100644 --- a/modules/spring-session-ext/pom.xml +++ b/modules/spring-session-ext/pom.xml @@ -37,8 +37,8 @@ 17 17 - 3.2.2 - 6.2.4 + 3.5.4 + 6.5.7 3.0.0 3.20.0 5.10.2 @@ -51,7 +51,7 @@ org.springframework spring-framework-bom - ${spring61.version} + ${spring6.version} pom import diff --git a/modules/spring-tx-ext/examples/pom.xml b/modules/spring-tx-ext/examples/pom.xml index b79e4d9b7..4d057f7d2 100644 --- a/modules/spring-tx-ext/examples/pom.xml +++ b/modules/spring-tx-ext/examples/pom.xml @@ -69,19 +69,19 @@ org.springframework spring-context - ${spring61.version} + ${spring6.version} org.springframework spring-jdbc - ${spring61.version} + ${spring6.version} org.springframework spring-tx - ${spring61.version} + ${spring6.version} diff --git a/modules/spring-tx-ext/spring-tx/pom.xml b/modules/spring-tx-ext/spring-tx/pom.xml index 6ee594898..c17c88fb3 100644 --- a/modules/spring-tx-ext/spring-tx/pom.xml +++ b/modules/spring-tx-ext/spring-tx/pom.xml @@ -57,21 +57,21 @@ org.springframework spring-context - ${spring61.version} + ${spring6.version} provided org.springframework spring-tx - ${spring61.version} + ${spring6.version} provided org.springframework spring-jdbc - ${spring61.version} + ${spring6.version} true 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 69918b102..bbf5ab151 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 @@ + + + + + + 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 14072ff09..b4cafdb6a 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 @@ + + + + + + diff --git a/parent-internal/pom.xml b/parent-internal/pom.xml index e6f5e7012..869d2bea3 100644 --- a/parent-internal/pom.xml +++ b/parent-internal/pom.xml @@ -35,13 +35,14 @@ 1 - 3.2.12 - 3.2.12 - 6.1.15 + 3.5.9 + 3.5.7 + 6.2.15 5.12.0 1.8.13 2.0.3 2.13.0 + 3.20.0