Skip to content

Commit 6fa7341

Browse files
AB-xdevAB-xdev
committed
Cleanup dependencies
1 parent 7777fe6 commit 6fa7341

17 files changed

Lines changed: 72 additions & 98 deletions

File tree

‎spring-data-eclipse-store/pom.xml‎

Lines changed: 11 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,9 @@
4949
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5050
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5151

52-
<eclipse-store.version>1.1.0</eclipse-store.version>
53-
<junit-jupiter.version>5.10.1</junit-jupiter.version>
54-
<spring-bom.version>6.1.3</spring-bom.version>
55-
<spring-data-commons.version>3.2.2</spring-data-commons.version>
5652
<!-- Should be in sync with org.eclipse.store:integrations-spring-boot3 -->
57-
<spring-boot.version>3.2.2</spring-boot.version>
58-
<spring-test.version>6.1.3</spring-test.version>
59-
<slf4j.version>2.0.11</slf4j.version>
60-
<jakarta.enterprise.version>4.0.1</jakarta.enterprise.version>
61-
<jakarta.version>3.1.0</jakarta.version>
53+
<org.springframework.boot.version>3.2.2</org.springframework.boot.version>
54+
<org.eclipse.store.version>1.1.0</org.eclipse.store.version>
6255
</properties>
6356

6457
<repositories>
@@ -76,9 +69,9 @@
7669
<dependencyManagement>
7770
<dependencies>
7871
<dependency>
79-
<groupId>org.springframework</groupId>
80-
<artifactId>spring-framework-bom</artifactId>
81-
<version>${spring-bom.version}</version>
72+
<groupId>org.springframework.boot</groupId>
73+
<artifactId>spring-boot-dependencies</artifactId>
74+
<version>${org.springframework.boot.version}</version>
8275
<type>pom</type>
8376
<scope>import</scope>
8477
</dependency>
@@ -101,7 +94,6 @@
10194
<dependency>
10295
<groupId>org.springframework.data</groupId>
10396
<artifactId>spring-data-commons</artifactId>
104-
<version>${spring-data-commons.version}</version>
10597
</dependency>
10698
<dependency>
10799
<groupId>org.springframework</groupId>
@@ -117,89 +109,73 @@
117109
</dependency>
118110

119111
<dependency>
120-
<groupId>jakarta.enterprise</groupId>
121-
<artifactId>jakarta.enterprise.cdi-api</artifactId>
122-
<version>${jakarta.enterprise.version}</version>
112+
<groupId>jakarta.annotation</groupId>
113+
<artifactId>jakarta.annotation-api</artifactId>
123114
</dependency>
124115
<dependency>
125116
<groupId>jakarta.persistence</groupId>
126117
<artifactId>jakarta.persistence-api</artifactId>
127-
<version>${jakarta.version}</version>
128118
</dependency>
129119
<dependency>
130120
<groupId>org.slf4j</groupId>
131121
<artifactId>slf4j-api</artifactId>
132-
<version>${slf4j.version}</version>
133122
</dependency>
134123

135124

136125
<dependency>
137126
<groupId>org.eclipse.store</groupId>
138127
<artifactId>storage-embedded</artifactId>
139-
<version>${eclipse-store.version}</version>
128+
<version>${org.eclipse.store.version}</version>
140129
</dependency>
141130
<dependency>
142131
<groupId>org.eclipse.store</groupId>
143132
<artifactId>integrations-spring-boot3</artifactId>
144-
<version>${eclipse-store.version}</version>
133+
<version>${org.eclipse.store.version}</version>
145134
</dependency>
146135
<dependency>
147136
<groupId>org.eclipse.serializer</groupId>
148137
<artifactId>serializer</artifactId>
149-
<version>${eclipse-store.version}</version>
138+
<version>${org.eclipse.store.version}</version>
150139
</dependency>
151140
<dependency>
152141
<groupId>org.eclipse.serializer</groupId>
153142
<artifactId>persistence-binary-jdk17</artifactId>
154-
<version>${eclipse-store.version}</version>
143+
<version>${org.eclipse.store.version}</version>
155144
</dependency>
156145

157146
<dependency>
158147
<groupId>org.junit.jupiter</groupId>
159148
<artifactId>junit-jupiter-engine</artifactId>
160-
<version>${junit-jupiter.version}</version>
161149
<scope>test</scope>
162150
</dependency>
163151
<dependency>
164152
<groupId>org.junit.jupiter</groupId>
165153
<artifactId>junit-jupiter-api</artifactId>
166-
<version>${junit-jupiter.version}</version>
167154
<scope>test</scope>
168155
</dependency>
169156
<dependency>
170157
<groupId>org.junit.jupiter</groupId>
171158
<artifactId>junit-jupiter-params</artifactId>
172-
<version>${junit-jupiter.version}</version>
173159
<scope>test</scope>
174160
</dependency>
175161
<dependency>
176162
<groupId>org.springframework</groupId>
177163
<artifactId>spring-test</artifactId>
178-
<version>${spring-test.version}</version>
179-
<scope>test</scope>
180-
</dependency>
181-
<dependency>
182-
<groupId>org.apache.logging.log4j</groupId>
183-
<artifactId>log4j-api</artifactId>
184-
<version>2.22.1</version>
185164
<scope>test</scope>
186165
</dependency>
187166
<dependency>
188167
<groupId>org.apache.logging.log4j</groupId>
189168
<artifactId>log4j-core</artifactId>
190-
<version>2.22.1</version>
191169
<scope>test</scope>
192170
</dependency>
193171
<dependency>
194172
<groupId>org.apache.logging.log4j</groupId>
195173
<artifactId>log4j-slf4j2-impl</artifactId>
196-
<version>2.22.1</version>
197174
<scope>test</scope>
198175
</dependency>
199176
<dependency>
200177
<groupId>org.springframework.boot</groupId>
201178
<artifactId>spring-boot-autoconfigure</artifactId>
202-
<version>${spring-boot.version}</version>
203179
<scope>test</scope>
204180
</dependency>
205181
</dependencies>

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/EclipseStoreStorage.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
import java.util.function.Consumer;
2424
import java.util.function.Supplier;
2525

26-
import jakarta.inject.Inject;
27-
import jakarta.inject.Named;
28-
2926
import org.eclipse.serializer.persistence.binary.jdk17.java.util.BinaryHandlerImmutableCollectionsList12;
3027
import org.eclipse.serializer.persistence.binary.jdk17.java.util.BinaryHandlerImmutableCollectionsSet12;
3128
import org.eclipse.serializer.persistence.types.Storer;
@@ -35,6 +32,7 @@
3532
import org.eclipse.store.storage.types.StorageManager;
3633
import org.slf4j.Logger;
3734
import org.slf4j.LoggerFactory;
35+
import org.springframework.beans.factory.annotation.Autowired;
3836
import org.springframework.stereotype.Component;
3937

4038
import software.xdev.spring.data.eclipse.store.core.IdentitySet;
@@ -62,9 +60,9 @@ public class EclipseStoreStorage
6260
private final WorkingCopyRegistry registry = new WorkingCopyRegistry();
6361
private RepositorySynchronizer repositorySynchronizer;
6462

65-
@Inject
63+
@Autowired
6664
public EclipseStoreStorage(
67-
@Named("eclipseStoreProperties") final EclipseStoreProperties storeConfiguration,
65+
final EclipseStoreProperties storeConfiguration,
6866
final EclipseStoreProvider storeProvider)
6967
{
7068
this.storeConfiguration = storeConfiguration;

‎spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/EclipseStoreRepositoryFactoryBean.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@
1717

1818
import java.io.Serializable;
1919

20+
import jakarta.annotation.Nonnull;
21+
22+
import org.springframework.beans.factory.annotation.Autowired;
2023
import org.springframework.context.annotation.ComponentScan;
2124
import org.springframework.data.repository.Repository;
2225
import org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport;
2326
import org.springframework.data.repository.core.support.RepositoryFactorySupport;
2427

25-
import jakarta.annotation.Nonnull;
26-
import jakarta.inject.Inject;
2728
import software.xdev.spring.data.eclipse.store.repository.EclipseStoreStorage;
2829

2930

@@ -35,7 +36,7 @@ public class EclipseStoreRepositoryFactoryBean<T extends Repository<S, ID>, S, I
3536
{
3637
private final EclipseStoreStorage storage;
3738

38-
@Inject
39+
@Autowired
3940
public EclipseStoreRepositoryFactoryBean(
4041
final Class<? extends T> repositoryInterface,
4142
final EclipseStoreStorage storage)

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/TestConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.springframework.context.event.EventListener;
2525
import org.springframework.util.FileSystemUtils;
2626

27-
import jakarta.inject.Inject;
27+
import org.springframework.beans.factory.annotation.Autowired;
2828
import software.xdev.spring.data.eclipse.store.repository.EclipseStoreStorage;
2929
import software.xdev.spring.data.eclipse.store.repository.config.EnableEclipseStoreRepositories;
3030

@@ -33,7 +33,7 @@
3333
@EnableEclipseStoreRepositories
3434
public class TestConfiguration implements DisposableBean
3535
{
36-
@Inject
36+
@Autowired
3737
EclipseStoreStorage storage;
3838

3939
@Value("${org.eclipse.store.storage-directory}")

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/tests/ChangeRootTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.junit.jupiter.api.Assertions;
2121
import org.junit.jupiter.api.Test;
2222

23-
import jakarta.inject.Inject;
23+
import org.springframework.beans.factory.annotation.Autowired;
2424
import software.xdev.spring.data.eclipse.store.helper.TestUtil;
2525
import software.xdev.spring.data.eclipse.store.integration.DefaultTestAnnotations;
2626
import software.xdev.spring.data.eclipse.store.integration.repositories.Node;
@@ -36,9 +36,9 @@ public class ChangeRootTests
3636
public static final String PARENT_1 = "parent1";
3737
public static final String PARENT_2 = "parent2";
3838

39-
@Inject
39+
@Autowired
4040
private NodeRepository repository;
41-
@Inject
41+
@Autowired
4242
private EclipseStoreStorage storage;
4343

4444
//@formatter:off

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/tests/ConcurrencyTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.apache.logging.log4j.util.Strings;
3131
import org.junit.jupiter.api.Test;
3232

33-
import jakarta.inject.Inject;
33+
import org.springframework.beans.factory.annotation.Autowired;
3434
import software.xdev.spring.data.eclipse.store.helper.TestUtil;
3535
import software.xdev.spring.data.eclipse.store.integration.DefaultTestAnnotations;
3636
import software.xdev.spring.data.eclipse.store.integration.repositories.Customer;
@@ -43,10 +43,10 @@
4343
class ConcurrencyTest
4444
{
4545
public static final String CUSTOMER_NO = "Customer No.";
46-
@Inject
46+
@Autowired
4747
private CustomerRepository repository;
4848

49-
@Inject
49+
@Autowired
5050
private EclipseStoreStorage storage;
5151

5252
private final List<Customer> testCustomers =

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/tests/FinalTest.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717

1818
import java.util.List;
1919

20-
import jakarta.inject.Inject;
21-
2220
import org.junit.jupiter.api.Assertions;
2321
import org.junit.jupiter.api.Test;
22+
import org.springframework.beans.factory.annotation.Autowired;
2423

2524
import software.xdev.spring.data.eclipse.store.exceptions.IdFieldFinalException;
2625
import software.xdev.spring.data.eclipse.store.helper.TestData;
@@ -38,15 +37,15 @@
3837
@DefaultTestAnnotations
3938
class FinalTest
4039
{
41-
@Inject
42-
private CustomerWithFinalRepository repository;
43-
@Inject
44-
private CustomerWithFinalChildRepository withChildRepository;
45-
@Inject
46-
private CustomerWithFinalIdRepository withFinalIdRepository;
40+
@Autowired
41+
CustomerWithFinalRepository repository;
42+
@Autowired
43+
CustomerWithFinalChildRepository withChildRepository;
44+
@Autowired
45+
CustomerWithFinalIdRepository withFinalIdRepository;
4746

48-
@Inject
49-
private EclipseStoreStorage storage;
47+
@Autowired
48+
EclipseStoreStorage storage;
5049

5150
@Test
5251
void testSaveAndFindSingle()

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/tests/HashSetTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import java.util.List;
1919
import java.util.Set;
2020

21-
import jakarta.inject.Inject;
21+
import org.springframework.beans.factory.annotation.Autowired;
2222

2323
import org.junit.jupiter.api.Assertions;
2424
import org.junit.jupiter.api.Disabled;
@@ -37,12 +37,12 @@
3737
@DefaultTestAnnotations
3838
class HashSetTest
3939
{
40-
@Inject
40+
@Autowired
4141
private CustomerRepositoryWithHashSet repository;
42-
@Inject
42+
@Autowired
4343
private CustomerRepositoryWithNonFinalHashSet nonFinalRepository;
4444

45-
@Inject
45+
@Autowired
4646
private EclipseStoreStorage storage;
4747

4848
@Test

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/tests/IdTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.junit.jupiter.api.Test;
2323
import org.springframework.beans.factory.annotation.Autowired;
2424

25-
import jakarta.inject.Inject;
25+
import org.springframework.beans.factory.annotation.Autowired;
2626
import software.xdev.spring.data.eclipse.store.helper.TestData;
2727
import software.xdev.spring.data.eclipse.store.helper.TestUtil;
2828
import software.xdev.spring.data.eclipse.store.integration.DefaultTestAnnotations;
@@ -46,7 +46,7 @@
4646
@DefaultTestAnnotations
4747
class IdTest
4848
{
49-
@Inject
49+
@Autowired
5050
private EclipseStoreStorage storage;
5151

5252
@Test

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/tests/InheritanceTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
import org.junit.jupiter.api.Assertions;
2121
import org.junit.jupiter.api.Test;
22+
import org.springframework.beans.factory.annotation.Autowired;
2223

23-
import jakarta.inject.Inject;
2424
import software.xdev.spring.data.eclipse.store.helper.TestData;
2525
import software.xdev.spring.data.eclipse.store.helper.TestUtil;
2626
import software.xdev.spring.data.eclipse.store.integration.DefaultTestAnnotations;
@@ -36,13 +36,13 @@
3636
@DefaultTestAnnotations
3737
class InheritanceTest
3838
{
39-
@Inject
39+
@Autowired
4040
private ParentCustomerRepository parentCustomerRepository;
41-
@Inject
41+
@Autowired
4242
private ChildCustomerRepository childCustomerRepository;
43-
@Inject
43+
@Autowired
4444
private SubCustomerRepository subCustomerRepository;
45-
@Inject
45+
@Autowired
4646
private EclipseStoreStorage storage;
4747

4848
@Test

0 commit comments

Comments
 (0)