Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions DEVNOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -81,23 +80,23 @@ 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);
}

/** 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);
}

/** 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);
Expand All @@ -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,
Expand All @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>

Expand Down
5 changes: 2 additions & 3 deletions modules/spring-data-ext/examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
</parent>

<artifactId>ignite-spring-data-ext-examples</artifactId>
<version>${project.parent.version}</version>

<url>https://ignite.apache.org</url>

Expand Down Expand Up @@ -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>
Expand Down
11 changes: 5 additions & 6 deletions modules/spring-data-ext/spring-data/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
</parent>

<artifactId>ignite-spring-data-ext</artifactId>
<version>${project.parent.version}</version>

<url>https://ignite.apache.org</url>

Expand All @@ -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>

Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions modules/spring-session-ext/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions modules/spring-tx-ext/examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions modules/spring-tx-ext/spring-tx/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
7 changes: 4 additions & 3 deletions parent-internal/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down