Skip to content
Permalink
Browse files
IGNITE-16869 Remove outdated spring data extensions with upgrading sp…
…ring-core dependency (#120)
  • Loading branch information
rpuch committed Apr 20, 2022
1 parent 57e14df commit d7bfd01b6d51e4663decfd1f3a90980108a3e6db
Showing 190 changed files with 2,314 additions and 15,924 deletions.
@@ -33,7 +33,6 @@
<url>https://ignite.apache.org</url>

<properties>
<spring.version>5.3.8</spring.version>
<aws.sdk.version>1.11.75</aws.sdk.version>
<aws.encryption.sdk.version>1.3.2</aws.encryption.sdk.version>
<bouncycastle.version>1.69</bouncycastle.version>
@@ -172,7 +171,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
<version>${spring53.version}</version>
<scope>test</scope>
</dependency>

@@ -185,14 +184,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
<version>${spring53.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
<version>${spring53.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -32,7 +32,6 @@
<url>https://ignite.apache.org</url>

<properties>
<spring.version>5.3.8</spring.version>
<netty.version>4.1.66.Final</netty.version>
</properties>

@@ -359,21 +358,21 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
<version>${spring53.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
<version>${spring53.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
<version>${spring53.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -31,10 +31,6 @@
<version>1.0.0-SNAPSHOT</version>
<url>https://ignite.apache.org</url>

<properties>
<spring.version>5.3.8</spring.version>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.ignite</groupId>
@@ -91,21 +87,21 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
<version>${spring53.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
<version>${spring53.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
<version>${spring53.version}</version>
<scope>test</scope>
</dependency>

@@ -58,22 +58,22 @@

<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring-data-2.2-ext</artifactId>
<version>${ignite-spring-data-2.2-ext.version}</version>
<artifactId>ignite-spring-data-ext</artifactId>
<version>${ignite-spring-data-ext.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
<version>${spring.data-2.2.version}</version>
<version>${spring.data.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${spring-5.2.version}</version>
<version>${spring.version}</version>
<optional>true</optional>
</dependency>

@@ -18,10 +18,10 @@
package org.apache.ignite.springframework.boot.autoconfigure;

import org.apache.ignite.Ignite;
import org.apache.ignite.springdata22.repository.IgniteRepository;
import org.apache.ignite.springdata22.repository.config.EnableIgniteRepositories;
import org.apache.ignite.springdata22.repository.config.IgniteRepositoryConfigurationExtension;
import org.apache.ignite.springdata22.repository.support.IgniteRepositoryFactoryBean;
import org.apache.ignite.springdata.repository.IgniteRepository;
import org.apache.ignite.springdata.repository.config.EnableIgniteRepositories;
import org.apache.ignite.springdata.repository.config.IgniteRepositoryConfigurationExtension;
import org.apache.ignite.springdata.repository.support.IgniteRepositoryFactoryBean;
import org.apache.ignite.springframework.boot.autoconfigure.data.IgniteRepositoriesAutoConfigurationRegistrar;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -18,8 +18,8 @@
package org.apache.ignite.springframework.boot.autoconfigure.data;

import java.lang.annotation.Annotation;
import org.apache.ignite.springdata22.repository.config.EnableIgniteRepositories;
import org.apache.ignite.springdata22.repository.config.IgniteRepositoryConfigurationExtension;
import org.apache.ignite.springdata.repository.config.EnableIgniteRepositories;
import org.apache.ignite.springdata.repository.config.IgniteRepositoryConfigurationExtension;
import org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport;
import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
import org.springframework.data.repository.config.RepositoryConfigurationExtension;
@@ -17,7 +17,7 @@

package org.apache.ignite.springframework.boot.autoconfigure;

import org.apache.ignite.springdata22.repository.config.EnableIgniteRepositories;
import org.apache.ignite.springdata.repository.config.EnableIgniteRepositories;
import org.apache.ignite.springframework.boot.autoconfigure.misc.DefaultTestConfigutation;
import org.apache.ignite.springframework.boot.autoconfigure.misc.ObjectRepository;
import org.junit.jupiter.api.Test;
@@ -17,8 +17,8 @@

package org.apache.ignite.springframework.boot.autoconfigure.misc;

import org.apache.ignite.springdata22.repository.IgniteRepository;
import org.apache.ignite.springdata22.repository.config.RepositoryConfig;
import org.apache.ignite.springdata.repository.IgniteRepository;
import org.apache.ignite.springdata.repository.config.RepositoryConfig;

/**
* Test repository.
@@ -59,22 +59,22 @@

<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring-data-2.2-ext</artifactId>
<version>${ignite-spring-data-2.2-ext.version}</version>
<artifactId>ignite-spring-data-ext</artifactId>
<version>${ignite-spring-data-ext.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
<version>${spring.data-2.2.version}</version>
<version>${spring.data.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${spring-5.2.version}</version>
<version>${spring.version}</version>
<optional>true</optional>
</dependency>

@@ -18,10 +18,10 @@
package org.apache.ignite.springframework.boot.autoconfigure;

import org.apache.ignite.client.IgniteClient;
import org.apache.ignite.springdata22.repository.IgniteRepository;
import org.apache.ignite.springdata22.repository.config.EnableIgniteRepositories;
import org.apache.ignite.springdata22.repository.config.IgniteRepositoryConfigurationExtension;
import org.apache.ignite.springdata22.repository.support.IgniteRepositoryFactoryBean;
import org.apache.ignite.springdata.repository.IgniteRepository;
import org.apache.ignite.springdata.repository.config.EnableIgniteRepositories;
import org.apache.ignite.springdata.repository.config.IgniteRepositoryConfigurationExtension;
import org.apache.ignite.springdata.repository.support.IgniteRepositoryFactoryBean;
import org.apache.ignite.springframework.boot.autoconfigure.data.IgniteRepositoriesAutoConfigurationRegistrar;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -18,8 +18,8 @@
package org.apache.ignite.springframework.boot.autoconfigure.data;

import java.lang.annotation.Annotation;
import org.apache.ignite.springdata22.repository.config.EnableIgniteRepositories;
import org.apache.ignite.springdata22.repository.config.IgniteRepositoryConfigurationExtension;
import org.apache.ignite.springdata.repository.config.EnableIgniteRepositories;
import org.apache.ignite.springdata.repository.config.IgniteRepositoryConfigurationExtension;
import org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport;
import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
import org.springframework.data.repository.config.RepositoryConfigurationExtension;
@@ -21,7 +21,7 @@
import org.apache.ignite.Ignition;
import org.apache.ignite.configuration.ClientConnectorConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.springdata22.repository.config.EnableIgniteRepositories;
import org.apache.ignite.springdata.repository.config.EnableIgniteRepositories;
import org.apache.ignite.springframework.boot.autoconfigure.misc.ObjectRepository;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;